From 0e31c5aa70cdbda92641ddbc0647e821a95a2ecc Mon Sep 17 00:00:00 2001 From: Luke Cwik Date: Thu, 30 Sep 2021 17:10:37 -0700 Subject: [PATCH 1/2] [BEAM-12482] Ensure that we ignore schema update options when loading temporary tables that don't exist. --- .../java/org/apache/beam/sdk/io/gcp/bigquery/BatchLoads.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BatchLoads.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BatchLoads.java index 16b96bf870c7..196a1a3e0bd5 100644 --- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BatchLoads.java +++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BatchLoads.java @@ -696,7 +696,7 @@ private PCollection> writeTempTables( kmsKey, rowWriterFactory.getSourceFormat(), useAvroLogicalTypes, - schemaUpdateOptions)) + Collections.emptySet())) .setCoder(KvCoder.of(tableDestinationCoder, WriteTables.ResultCoder.INSTANCE)); } From 3d9d0029c53f4125d6f02afb9ac48b1fc0971240 Mon Sep 17 00:00:00 2001 From: Luke Cwik Date: Fri, 1 Oct 2021 09:23:34 -0700 Subject: [PATCH 2/2] fixup! Add comment. --- .../java/org/apache/beam/sdk/io/gcp/bigquery/BatchLoads.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BatchLoads.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BatchLoads.java index 196a1a3e0bd5..aca0c69a2524 100644 --- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BatchLoads.java +++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BatchLoads.java @@ -696,6 +696,8 @@ private PCollection> writeTempTables( kmsKey, rowWriterFactory.getSourceFormat(), useAvroLogicalTypes, + // Note that we can't pass through the schema update options when creating temporary + // tables. They also shouldn't be needed. See BEAM-12482 for additional details. Collections.emptySet())) .setCoder(KvCoder.of(tableDestinationCoder, WriteTables.ResultCoder.INSTANCE)); }