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 81515200C5E for ; Fri, 17 Mar 2017 22:46:37 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 802F0160B8F; Fri, 17 Mar 2017 21:46:37 +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 1720A160B9D for ; Fri, 17 Mar 2017 22:46:35 +0100 (CET) Received: (qmail 24809 invoked by uid 500); 17 Mar 2017 21:46:34 -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 24096 invoked by uid 99); 17 Mar 2017 21:46:34 -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; Fri, 17 Mar 2017 21:46:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 65FC7F4B57; Fri, 17 Mar 2017 21:46:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kenn@apache.org To: commits@beam.apache.org Date: Fri, 17 Mar 2017 21:47:16 -0000 Message-Id: <6f88f26f24ac4659a0c8555dfa07fe00@git.apache.org> In-Reply-To: <7d5726b420a54a668c2192f9d38f9f27@git.apache.org> References: <7d5726b420a54a668c2192f9d38f9f27@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [45/50] [abbrv] beam git commit: Revert BigQueryIO bit of 'Make all uses of CountingOutputStream close their resources' archived-at: Fri, 17 Mar 2017 21:46:37 -0000 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/gearpump-runner Commit: 839c906a583bef6ef7c0739479231f096df58bef Parents: b6ca062 Author: Kenneth Knowles Authored: Fri Mar 10 19:01:23 2017 -0800 Committer: Amit Sela 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 close() throws IOException { channel.close(); - KV record = KV.of(fileName, out.getCount()); - out.close(); - return record; + return KV.of(fileName, out.getCount()); } }