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 C9398200C15 for ; Tue, 24 Jan 2017 21:27:43 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C7E95160B3E; Tue, 24 Jan 2017 20:27:43 +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 07ED1160B5B for ; Tue, 24 Jan 2017 21:27:42 +0100 (CET) Received: (qmail 43647 invoked by uid 500); 24 Jan 2017 20:27:42 -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 43600 invoked by uid 99); 24 Jan 2017 20:27:41 -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; Tue, 24 Jan 2017 20:27:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B9B74DFC68; Tue, 24 Jan 2017 20:27:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dhalperi@apache.org To: commits@beam.apache.org Date: Tue, 24 Jan 2017 20:27:43 -0000 Message-Id: <8bea738c2bcd48f1a93ac4b24b272a6c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/4] beam git commit: [BEAM-1258] Improve logging in BigQueryIO.verifyTableEmpty(). archived-at: Tue, 24 Jan 2017 20:27:43 -0000 [BEAM-1258] Improve logging in BigQueryIO.verifyTableEmpty(). Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/5b6dd91d Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/5b6dd91d Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/5b6dd91d Branch: refs/heads/master Commit: 5b6dd91d27ce73fa66db4d445b0ceb88f09971d8 Parents: cb6e0a8 Author: Pei He Authored: Mon Jan 23 14:52:30 2017 -0800 Committer: Dan Halperin Committed: Tue Jan 24 12:25:22 2017 -0800 ---------------------------------------------------------------------- .../beam/sdk/io/gcp/bigquery/BigQueryIO.java | 32 +++++++++++--------- .../sdk/io/gcp/bigquery/BigQueryServices.java | 2 ++ 2 files changed, 19 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/5b6dd91d/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 701374d..aff199a 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 @@ -1863,25 +1863,27 @@ public class BigQueryIO { writeDisposition, validate, testServices); } - private static void verifyTableEmpty( + private static void verifyTableNotExistOrEmpty( DatasetService datasetService, - TableReference table) { + TableReference tableRef) { try { - boolean isEmpty = datasetService.isTableEmpty( - table.getProjectId(), table.getDatasetId(), table.getTableId()); - if (!isEmpty) { - throw new IllegalArgumentException( - "BigQuery table is not empty: " + BigQueryIO.toTableSpec(table)); + if (datasetService.getTable( + tableRef.getProjectId(), + tableRef.getDatasetId(), + tableRef.getTableId()) != null) { + checkState( + datasetService.isTableEmpty( + tableRef.getProjectId(), tableRef.getDatasetId(), tableRef.getTableId()), + "BigQuery table is not empty: %s.", + BigQueryIO.toTableSpec(tableRef)); } } catch (IOException | InterruptedException e) { - ApiErrorExtractor errorExtractor = new ApiErrorExtractor(); - if (e instanceof IOException && errorExtractor.itemNotFound((IOException) e)) { - // Nothing to do. If the table does not exist, it is considered empty. - } else { - throw new RuntimeException( - "unable to confirm BigQuery table emptiness for table " - + BigQueryIO.toTableSpec(table), e); + if (e instanceof InterruptedException) { + Thread.currentThread().interrupt(); } + throw new RuntimeException( + "unable to confirm BigQuery table emptiness for table " + + BigQueryIO.toTableSpec(tableRef), e); } } @@ -1917,7 +1919,7 @@ public class BigQueryIO { verifyTablePresence(datasetService, table); } if (getWriteDisposition() == BigQueryIO.Write.WriteDisposition.WRITE_EMPTY) { - verifyTableEmpty(datasetService, table); + verifyTableNotExistOrEmpty(datasetService, table); } } http://git-wip-us.apache.org/repos/asf/beam/blob/5b6dd91d/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryServices.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryServices.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryServices.java index 7173996..32cf46d 100644 --- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryServices.java +++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryServices.java @@ -136,6 +136,8 @@ interface BigQueryServices extends Serializable { /** * Returns true if the table is empty. + * + * @throws IOException if the table is not found. */ boolean isTableEmpty(String projectId, String datasetId, String tableId) throws IOException, InterruptedException;