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/gearpump-runner Commit: 80c9263617eb453a3595735147f328a8ee6d783e Parents: 0b19fb4 Author: Mairbek Khadikov <[email protected]> Authored: Mon Jun 19 12:23:52 2017 -0700 Committer: Eugene Kirpichov <[email protected]> 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 @@ <protobuf.version>3.2.0</protobuf.version> <pubsub.version>v1-rev10-1.22.0</pubsub.version> <slf4j.version>1.7.14</slf4j.version> - <spanner.version>0.16.0-beta</spanner.version> + <spanner.version>0.20.0-beta</spanner.version> <spark.version>1.6.2</spark.version> <spring.version>4.3.5.RELEASE</spring.version> <stax2.version>3.1.4</stax2.version> 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<Long, Mutation> {
