Repository: beam Updated Branches: refs/heads/release-2.0.0 56262d8f3 -> b9c8cfe22
This cherry-picks #2926 Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/1a77e208 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/1a77e208 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/1a77e208 Branch: refs/heads/release-2.0.0 Commit: 1a77e208e440ef34b7d0f7e1104d5c8c5ee04474 Parents: 56262d8 Author: Dan Halperin <[email protected]> Authored: Fri May 5 16:32:54 2017 -0700 Committer: Dan Halperin <[email protected]> Committed: Fri May 5 17:24:02 2017 -0700 ---------------------------------------------------------------------- pom.xml | 2 +- .../org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java | 2 +- .../beam/sdk/io/gcp/bigtable/BigtableServiceImpl.java | 9 --------- 3 files changed, 2 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/1a77e208/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5d7c865..83eafc6 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ <apex.kryo.version>2.24.0</apex.kryo.version> <avro.version>1.8.1</avro.version> <bigquery.version>v2-rev295-1.22.0</bigquery.version> - <bigtable.version>0.9.6</bigtable.version> + <bigtable.version>0.9.6.2</bigtable.version> <cloudresourcemanager.version>v1-rev6-1.22.0</cloudresourcemanager.version> <pubsubgrpc.version>0.1.0</pubsubgrpc.version> <clouddebugger.version>v2-rev8-1.22.0</clouddebugger.version> http://git-wip-us.apache.org/repos/asf/beam/blob/1a77e208/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java index 846d07b..bde7ea5 100644 --- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java +++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIO.java @@ -67,7 +67,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * A bounded source and sink for Google Cloud Bigtable. + * {@link PTransform Transforms} for reading from and writing to Google Cloud Bigtable. * * <p>For more information about Cloud Bigtable, see the online documentation at * <a href="https://cloud.google.com/bigtable/";>Google Cloud Bigtable</a>. http://git-wip-us.apache.org/repos/asf/beam/blob/1a77e208/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableServiceImpl.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableServiceImpl.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableServiceImpl.java index 90102c8..d1a17fe 100644 --- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableServiceImpl.java +++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableServiceImpl.java @@ -74,15 +74,6 @@ class BigtableServiceImpl implements BigtableService { @Override public boolean tableExists(String tableId) throws IOException { - if (!BigtableSession.isAlpnProviderEnabled()) { - LOG.info( - "Skipping existence check for table {} (BigtableOptions {}) because ALPN is not" - + " configured.", - tableId, - options); - return true; - } - try (BigtableSession session = new BigtableSession(options)) { GetTableRequest getTable = GetTableRequest.newBuilder()
