Repository: beam Updated Branches: refs/heads/master b6ca062fc -> 781e4172c
Revert BigQueryIO bit of 'Make all uses of CountingOutputStream close their resources' This reverts the portion of commit 3115dbdca1858511e98476b5c79e6cca98782b0b that touches BigQueryIO, which caused a double close bug. Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/839c906a Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/839c906a Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/839c906a Branch: refs/heads/master Commit: 839c906a583bef6ef7c0739479231f096df58bef Parents: b6ca062 Author: Kenneth Knowles <k...@google.com> Authored: Fri Mar 10 19:01:23 2017 -0800 Committer: Amit Sela <amitsel...@gmail.com> Committed: Sun Mar 12 11:58:43 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIO.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/839c906a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIO.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIO.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIO.java index 81aa50b..0e1c6fc 100644 --- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIO.java +++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIO.java @@ -2272,9 +2272,7 @@ public class BigQueryIO { public final KV<String, Long> close() throws IOException { channel.close(); - KV<String, Long> record = KV.of(fileName, out.getCount()); - out.close(); - return record; + return KV.of(fileName, out.getCount()); } }
