From e4a34399143d8f094e9f274f832f73555ad18467 Mon Sep 17 00:00:00 2001 From: stephwang Date: Fri, 3 Jan 2020 16:47:17 -0500 Subject: [PATCH 1/5] feat: new sample - Tables: Copy multiple tables b/147141782 --- .../example/bigquery/CopyMultipleTables.java | 74 +++++++++++++++++++ .../bigquery/CopyMultipleTablesIT.java | 70 ++++++++++++++++++ .../bigquery/ExtractTableToJsonIT.java | 1 - 3 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 samples/src/main/java/com/example/bigquery/CopyMultipleTables.java create mode 100644 samples/src/test/java/com/example/bigquery/CopyMultipleTablesIT.java diff --git a/samples/src/main/java/com/example/bigquery/CopyMultipleTables.java b/samples/src/main/java/com/example/bigquery/CopyMultipleTables.java new file mode 100644 index 000000000..70dabaadb --- /dev/null +++ b/samples/src/main/java/com/example/bigquery/CopyMultipleTables.java @@ -0,0 +1,74 @@ +/* + * Copyright 2019 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.bigquery; + +// [START bigquery_copy_table_multiple_source] +import com.google.cloud.bigquery.BigQuery; +import com.google.cloud.bigquery.BigQueryException; +import com.google.cloud.bigquery.BigQueryOptions; +import com.google.cloud.bigquery.CopyJobConfiguration; +import com.google.cloud.bigquery.Job; +import com.google.cloud.bigquery.JobInfo; +import com.google.cloud.bigquery.TableId; +import java.util.Arrays; + +public class CopyMultipleTables { + + public static void runCopyMultipleTables() { + // TODO(developer): Replace these variables before running the sample. + String destinationDatasetName = "MY_DATASET_NAME"; + String destinationTableId = "MY_TABLE_NAME"; + copyMultipleTables(destinationDatasetName, destinationTableId); + } + + public static void copyMultipleTables(String destinationDatasetName, String destinationTableId) { + try { + // Initialize client that will be used to send requests. This client only needs to be created + // once, and can be reused for multiple requests. + BigQuery bigquery = BigQueryOptions.getDefaultInstance().getService(); + + TableId destinationTable = TableId.of(destinationDatasetName, destinationTableId); + + // For more information on CopyJobConfiguration see: + // https://googleapis.dev/java/google-cloud-clients/latest/com/google/cloud/bigquery/JobConfiguration.html + CopyJobConfiguration configuration = + CopyJobConfiguration.newBuilder( + destinationTable, + Arrays.asList(TableId.of(destinationDatasetName, "table1"), TableId.of(destinationDatasetName, "table2"))) + .build(); + + // For more information on Job see: + // https://googleapis.dev/java/google-cloud-clients/latest/index.html?com/google/cloud/bigquery/package-summary.html + Job job = bigquery.create(JobInfo.of(configuration)); + + // Blocks until this job completes its execution, either failing or succeeding. + Job completedJob = job.waitFor(); + if (completedJob == null) { + System.out.println("Job not executed since it no longer exists."); + return; + } else if (completedJob.getStatus().getError() != null) { + System.out.println( + "BigQuery was unable to copy tables due to an error: \n" + job.getStatus().getError()); + return; + } + System.out.println("Table copied successfully."); + } catch (BigQueryException | InterruptedException e) { + System.out.println("Table copying job was interrupted. \n" + e.toString()); + } + } +} +// [END bigquery_copy_table_multiple_source] \ No newline at end of file diff --git a/samples/src/test/java/com/example/bigquery/CopyMultipleTablesIT.java b/samples/src/test/java/com/example/bigquery/CopyMultipleTablesIT.java new file mode 100644 index 000000000..27b4f0fbb --- /dev/null +++ b/samples/src/test/java/com/example/bigquery/CopyMultipleTablesIT.java @@ -0,0 +1,70 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.bigquery; + +import static com.google.common.truth.Truth.assertThat; +import static junit.framework.TestCase.assertNotNull; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import org.junit.After; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +public class CopyMultipleTablesIT { + private ByteArrayOutputStream bout; + private PrintStream out; + + private static final String MY_DATASET_NAME = System.getenv("MY_DATASET_NAME"); + private static final String MY_TABLE_NAME = System.getenv("MY_TABLE_NAME"); + private static final String TABLE1 = System.getenv("TABLE1"); + private static final String TABLE2 = System.getenv("TABLE2"); + + private static void requireEnvVar(String varName) { + assertNotNull( + "Environment variable " + varName + " is required to perform these tests.", + System.getenv(varName)); + } + + @BeforeClass + public static void checkRequirements() { + requireEnvVar("MY_DATASET_NAME"); + requireEnvVar("MY_TABLE_NAME"); + requireEnvVar("TABLE1"); + requireEnvVar("TABLE2"); + } + + @Before + public void setUp() throws Exception { + bout = new ByteArrayOutputStream(); + out = new PrintStream(bout); + System.setOut(out); + } + + @After + public void tearDown() { + System.setOut(null); + } + + @Test + public void testCopyMultipleTables() { + CopyMultipleTables.copyMultipleTables(MY_DATASET_NAME, MY_TABLE_NAME); + assertThat(bout.toString()) + .contains("Table copied successfully."); + } +} \ No newline at end of file diff --git a/samples/src/test/java/com/example/bigquery/ExtractTableToJsonIT.java b/samples/src/test/java/com/example/bigquery/ExtractTableToJsonIT.java index 6d776c64e..e018384ed 100644 --- a/samples/src/test/java/com/example/bigquery/ExtractTableToJsonIT.java +++ b/samples/src/test/java/com/example/bigquery/ExtractTableToJsonIT.java @@ -61,7 +61,6 @@ public void testExtractTableToJson() { String datasetName = "samples"; String tableName = "shakespeare"; String destinationUri = "gs://" + GCS_BUCKET + "/extractTest.csv"; - System.out.println(destinationUri); // Extract table content to GCS in CSV format ExtractTableToJson.extractTableToJson(projectId, datasetName, tableName, destinationUri); From 83d29087313d71c829a824cd78ab54158171d5a6 Mon Sep 17 00:00:00 2001 From: stephwang Date: Fri, 3 Jan 2020 17:16:56 -0500 Subject: [PATCH 2/5] update test to create new destination table for each test since existing table cannot be overwritten and would throw bigquery error --- .../bigquery/CopyMultipleTablesIT.java | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/samples/src/test/java/com/example/bigquery/CopyMultipleTablesIT.java b/samples/src/test/java/com/example/bigquery/CopyMultipleTablesIT.java index 27b4f0fbb..f99d7e8ae 100644 --- a/samples/src/test/java/com/example/bigquery/CopyMultipleTablesIT.java +++ b/samples/src/test/java/com/example/bigquery/CopyMultipleTablesIT.java @@ -19,8 +19,12 @@ import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; +import com.google.cloud.bigquery.Field; +import com.google.cloud.bigquery.LegacySQLTypeName; +import com.google.cloud.bigquery.Schema; import java.io.ByteArrayOutputStream; import java.io.PrintStream; +import java.util.UUID; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -30,10 +34,9 @@ public class CopyMultipleTablesIT { private ByteArrayOutputStream bout; private PrintStream out; - private static final String MY_DATASET_NAME = System.getenv("MY_DATASET_NAME"); - private static final String MY_TABLE_NAME = System.getenv("MY_TABLE_NAME"); - private static final String TABLE1 = System.getenv("TABLE1"); - private static final String TABLE2 = System.getenv("TABLE2"); + private static final String MY_DATASET_NAME = System.getenv("BIGQUERY_DATASET_NAME"); + private static final String TABLE1 = System.getenv("BIGQUERY_TABLE1"); + private static final String TABLE2 = System.getenv("BIGQUERY_TABLE2"); private static void requireEnvVar(String varName) { assertNotNull( @@ -43,10 +46,9 @@ private static void requireEnvVar(String varName) { @BeforeClass public static void checkRequirements() { - requireEnvVar("MY_DATASET_NAME"); - requireEnvVar("MY_TABLE_NAME"); - requireEnvVar("TABLE1"); - requireEnvVar("TABLE2"); + requireEnvVar("BIGQUERY_DATASET_NAME"); + requireEnvVar("BIGQUERY_TABLE1"); + requireEnvVar("BIGQUERY_TABLE2"); } @Before @@ -63,7 +65,11 @@ public void tearDown() { @Test public void testCopyMultipleTables() { - CopyMultipleTables.copyMultipleTables(MY_DATASET_NAME, MY_TABLE_NAME); + // Create a new destination table for each test since existing table cannot be overwritten + String generatedTableName = "gcloud_test_table_temp_"+ UUID.randomUUID().toString().replace('-', '_'); + CreateTable.createTable(MY_DATASET_NAME, generatedTableName, null); + + CopyMultipleTables.copyMultipleTables(MY_DATASET_NAME, generatedTableName); assertThat(bout.toString()) .contains("Table copied successfully."); } From 19682b7529814078e4cb3124786c774a038b0d37 Mon Sep 17 00:00:00 2001 From: stephwang Date: Fri, 3 Jan 2020 17:29:39 -0500 Subject: [PATCH 3/5] add env vars for sample test builds --- .kokoro/run_samples_tests.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.kokoro/run_samples_tests.sh b/.kokoro/run_samples_tests.sh index dc6929f00..ff25061b1 100755 --- a/.kokoro/run_samples_tests.sh +++ b/.kokoro/run_samples_tests.sh @@ -30,7 +30,10 @@ mvn -v # Setup required env variables export GOOGLE_CLOUD_PROJECT=java-docs-samples-testing export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-acct.json +export BIGQUERY_DATASET_NAME=bigquery_test_dataset export GCS_BUCKET=java-docs-samples-testing +export BIGQUERY_TABLE1=table1 +export BIGQUERY_TABLE2=table2 # Activate service account gcloud auth activate-service-account \ From c7f5d0ac96fd5f767f0748002999d53073c46fa0 Mon Sep 17 00:00:00 2001 From: stephwang Date: Fri, 3 Jan 2020 17:31:19 -0500 Subject: [PATCH 4/5] update testing var names --- .../com/example/bigquery/CopyMultipleTablesIT.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/src/test/java/com/example/bigquery/CopyMultipleTablesIT.java b/samples/src/test/java/com/example/bigquery/CopyMultipleTablesIT.java index f99d7e8ae..b7d4d20d3 100644 --- a/samples/src/test/java/com/example/bigquery/CopyMultipleTablesIT.java +++ b/samples/src/test/java/com/example/bigquery/CopyMultipleTablesIT.java @@ -34,9 +34,9 @@ public class CopyMultipleTablesIT { private ByteArrayOutputStream bout; private PrintStream out; - private static final String MY_DATASET_NAME = System.getenv("BIGQUERY_DATASET_NAME"); - private static final String TABLE1 = System.getenv("BIGQUERY_TABLE1"); - private static final String TABLE2 = System.getenv("BIGQUERY_TABLE2"); + private static final String BIGQUERY_DATASET_NAME = System.getenv("BIGQUERY_DATASET_NAME"); + private static final String BIGQUERY_TABLE1 = System.getenv("BIGQUERY_TABLE1"); + private static final String BIGQUERY_TABLE2 = System.getenv("BIGQUERY_TABLE2"); private static void requireEnvVar(String varName) { assertNotNull( @@ -67,9 +67,9 @@ public void tearDown() { public void testCopyMultipleTables() { // Create a new destination table for each test since existing table cannot be overwritten String generatedTableName = "gcloud_test_table_temp_"+ UUID.randomUUID().toString().replace('-', '_'); - CreateTable.createTable(MY_DATASET_NAME, generatedTableName, null); + CreateTable.createTable(BIGQUERY_DATASET_NAME, generatedTableName, null); - CopyMultipleTables.copyMultipleTables(MY_DATASET_NAME, generatedTableName); + CopyMultipleTables.copyMultipleTables(BIGQUERY_DATASET_NAME, generatedTableName); assertThat(bout.toString()) .contains("Table copied successfully."); } From 2a465d5a36b4b5b74cba5b9e6b89568dd5e8d8b4 Mon Sep 17 00:00:00 2001 From: stephwang Date: Fri, 3 Jan 2020 17:41:03 -0500 Subject: [PATCH 5/5] format code --- .../java/com/example/bigquery/CopyMultipleTables.java | 8 +++++--- .../com/example/bigquery/CopyMultipleTablesIT.java | 11 ++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/samples/src/main/java/com/example/bigquery/CopyMultipleTables.java b/samples/src/main/java/com/example/bigquery/CopyMultipleTables.java index 70dabaadb..ff139a2a5 100644 --- a/samples/src/main/java/com/example/bigquery/CopyMultipleTables.java +++ b/samples/src/main/java/com/example/bigquery/CopyMultipleTables.java @@ -47,8 +47,10 @@ public static void copyMultipleTables(String destinationDatasetName, String dest // https://googleapis.dev/java/google-cloud-clients/latest/com/google/cloud/bigquery/JobConfiguration.html CopyJobConfiguration configuration = CopyJobConfiguration.newBuilder( - destinationTable, - Arrays.asList(TableId.of(destinationDatasetName, "table1"), TableId.of(destinationDatasetName, "table2"))) + destinationTable, + Arrays.asList( + TableId.of(destinationDatasetName, "table1"), + TableId.of(destinationDatasetName, "table2"))) .build(); // For more information on Job see: @@ -71,4 +73,4 @@ public static void copyMultipleTables(String destinationDatasetName, String dest } } } -// [END bigquery_copy_table_multiple_source] \ No newline at end of file +// [END bigquery_copy_table_multiple_source] diff --git a/samples/src/test/java/com/example/bigquery/CopyMultipleTablesIT.java b/samples/src/test/java/com/example/bigquery/CopyMultipleTablesIT.java index b7d4d20d3..b4d6e4be1 100644 --- a/samples/src/test/java/com/example/bigquery/CopyMultipleTablesIT.java +++ b/samples/src/test/java/com/example/bigquery/CopyMultipleTablesIT.java @@ -19,9 +19,6 @@ import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; -import com.google.cloud.bigquery.Field; -import com.google.cloud.bigquery.LegacySQLTypeName; -import com.google.cloud.bigquery.Schema; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.UUID; @@ -66,11 +63,11 @@ public void tearDown() { @Test public void testCopyMultipleTables() { // Create a new destination table for each test since existing table cannot be overwritten - String generatedTableName = "gcloud_test_table_temp_"+ UUID.randomUUID().toString().replace('-', '_'); + String generatedTableName = + "gcloud_test_table_temp_" + UUID.randomUUID().toString().replace('-', '_'); CreateTable.createTable(BIGQUERY_DATASET_NAME, generatedTableName, null); CopyMultipleTables.copyMultipleTables(BIGQUERY_DATASET_NAME, generatedTableName); - assertThat(bout.toString()) - .contains("Table copied successfully."); + assertThat(bout.toString()).contains("Table copied successfully."); } -} \ No newline at end of file +}