Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 154E5200CD8 for ; Wed, 28 Jun 2017 05:16:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 13DB0160BDC; Wed, 28 Jun 2017 03:16:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5B2C1160BF9 for ; Wed, 28 Jun 2017 05:16:54 +0200 (CEST) Received: (qmail 8519 invoked by uid 500); 28 Jun 2017 03:16:53 -0000 Mailing-List: contact commits-help@beam.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.apache.org Delivered-To: mailing list commits@beam.apache.org Received: (qmail 8489 invoked by uid 99); 28 Jun 2017 03:16:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Jun 2017 03:16:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C75B7DFA3E; Wed, 28 Jun 2017 03:16:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jkff@apache.org To: commits@beam.apache.org Date: Wed, 28 Jun 2017 03:16:51 -0000 Message-Id: In-Reply-To: <14e30faabee842149057756518b046eb@git.apache.org> References: <14e30faabee842149057756518b046eb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] beam git commit: Bump spanner version archived-at: Wed, 28 Jun 2017 03:16:55 -0000 Bump spanner version Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/80c92636 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/80c92636 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/80c92636 Branch: refs/heads/master Commit: 80c9263617eb453a3595735147f328a8ee6d783e Parents: 0b19fb4 Author: Mairbek Khadikov Authored: Mon Jun 19 12:23:52 2017 -0700 Committer: Eugene Kirpichov Committed: Tue Jun 27 18:36:01 2017 -0700 ---------------------------------------------------------------------- pom.xml | 2 +- .../main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIO.java | 2 +- .../java/org/apache/beam/sdk/io/gcp/spanner/SpannerIOTest.java | 3 --- .../java/org/apache/beam/sdk/io/gcp/spanner/SpannerWriteIT.java | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/80c92636/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 29bb4eb..f06568b 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,7 @@ 3.2.0 v1-rev10-1.22.0 1.7.14 - 0.16.0-beta + 0.20.0-beta 1.6.2 4.3.5.RELEASE 3.1.4 http://git-wip-us.apache.org/repos/asf/beam/blob/80c92636/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIO.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIO.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIO.java index 8bfc247..32bf1d0 100644 --- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIO.java +++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIO.java @@ -337,7 +337,7 @@ public class SpannerIO { if (spanner == null) { return; } - spanner.closeAsync().get(); + spanner.close(); spanner = null; } http://git-wip-us.apache.org/repos/asf/beam/blob/80c92636/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIOTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIOTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIOTest.java index 1e19a59..0cc08bf 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIOTest.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerIOTest.java @@ -27,7 +27,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.mockito.Mockito.withSettings; -import com.google.api.core.ApiFuture; import com.google.cloud.ServiceFactory; import com.google.cloud.spanner.DatabaseClient; import com.google.cloud.spanner.DatabaseId; @@ -274,10 +273,8 @@ public class SpannerIOTest implements Serializable { mockSpanners.add(mock(Spanner.class, withSettings().serializable())); mockDatabaseClients.add(mock(DatabaseClient.class, withSettings().serializable())); } - ApiFuture voidFuture = mock(ApiFuture.class, withSettings().serializable()); when(mockSpanner().getDatabaseClient(Matchers.any(DatabaseId.class))) .thenReturn(mockDatabaseClient()); - when(mockSpanner().closeAsync()).thenReturn(voidFuture); } DatabaseClient mockDatabaseClient() { http://git-wip-us.apache.org/repos/asf/beam/blob/80c92636/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerWriteIT.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerWriteIT.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerWriteIT.java index e1f6582..33532c9 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerWriteIT.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerWriteIT.java @@ -150,7 +150,7 @@ public class SpannerWriteIT { @After public void tearDown() throws Exception { databaseAdminClient.dropDatabase(options.getInstanceId(), databaseName); - spanner.closeAsync().get(); + spanner.close(); } private static class GenerateMutations extends DoFn {