Repository: beam Updated Branches: refs/heads/master 6ca9508f8 -> 7c5768b6e
Updates bigtable.version to 1.0.0-pre3. Performs a slight update to BigtableServiceImpl to comply with the new version. Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/b88a44a6 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/b88a44a6 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/b88a44a6 Branch: refs/heads/master Commit: b88a44a69e17d4b4e35ca886e86afea2f655955a Parents: 6ca9508 Author: [email protected] <[email protected]> Authored: Fri Sep 8 00:11:11 2017 -0700 Committer: [email protected] <[email protected]> Committed: Fri Sep 8 10:15:10 2017 -0700 ---------------------------------------------------------------------- pom.xml | 2 +- .../sdk/io/gcp/bigtable/BigtableServiceImpl.java | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/b88a44a6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7ec25bf..84be2bb 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ <api-common.version>1.0.0-rc2</api-common.version> <avro.version>1.8.2</avro.version> <bigquery.version>v2-rev355-1.22.0</bigquery.version> - <bigtable.version>0.9.7.1</bigtable.version> + <bigtable.version>1.0.0-pre3</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/b88a44a6/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 07476e2..78f721f 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 @@ -180,7 +180,13 @@ class BigtableServiceImpl implements BigtableService { @Override public void flush() throws IOException { if (bulkMutation != null) { - bulkMutation.flush(); + try { + bulkMutation.flush(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + // We fail since flush() operation was interrupted. + throw new IOException(e); + } executor.flush(); } } @@ -189,7 +195,13 @@ class BigtableServiceImpl implements BigtableService { public void close() throws IOException { try { if (bulkMutation != null) { - bulkMutation.flush(); + try { + bulkMutation.flush(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + // We fail since flush() operation was interrupted. + throw new IOException(e); + } bulkMutation = null; executor.flush(); executor = null;
