reuvenlax commented on code in PR #38058: URL: https://github.com/apache/beam/pull/38058#discussion_r3135109687
########## sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiDataTriggeredSchemaUpdateIT.java: ########## @@ -0,0 +1,329 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 org.apache.beam.sdk.io.gcp.bigquery; + +import static org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.MoreObjects.firstNonNull; +import static org.junit.Assert.assertEquals; + +import com.google.api.services.bigquery.model.Table; +import com.google.api.services.bigquery.model.TableFieldSchema; +import com.google.api.services.bigquery.model.TableReference; +import com.google.api.services.bigquery.model.TableRow; +import com.google.api.services.bigquery.model.TableSchema; +import com.google.auto.value.AutoValue; +import java.io.IOException; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import org.apache.beam.sdk.Pipeline; +import org.apache.beam.sdk.extensions.gcp.options.GcpOptions; +import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO.Write; +import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO.Write.CreateDisposition; +import org.apache.beam.sdk.io.gcp.bigquery.BigQueryIO.Write.WriteDisposition; +import org.apache.beam.sdk.io.gcp.testing.BigqueryClient; +import org.apache.beam.sdk.state.StateSpec; +import org.apache.beam.sdk.state.StateSpecs; +import org.apache.beam.sdk.state.ValueState; +import org.apache.beam.sdk.testing.TestPipeline; +import org.apache.beam.sdk.transforms.Create; +import org.apache.beam.sdk.transforms.DoFn; +import org.apache.beam.sdk.transforms.ParDo; +import org.apache.beam.sdk.transforms.WithKeys; +import org.apache.beam.sdk.values.KV; +import org.apache.beam.sdk.values.PCollection; +import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList; +import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableSet; +import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Iterables; +import org.joda.time.Duration; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestName; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Integration test for BigQueryIO Storage Write API auto schema upgrade triggered by data. + * + * <p>Uses a Stateful DoFn to sequence elements ensuring base schema elements are written before + * evolved schema elements, avoiding race conditions in distributed execution. + */ +@RunWith(JUnit4.class) +public class StorageApiDataTriggeredSchemaUpdateIT { + private static final Logger LOG = + LoggerFactory.getLogger(StorageApiDataTriggeredSchemaUpdateIT.class); + + private static final BigqueryClient BQ_CLIENT = + new BigqueryClient("StorageApiDataTriggeredSchemaUpdateIT"); + private static final String PROJECT = + TestPipeline.testingPipelineOptions().as(GcpOptions.class).getProject(); + private static final String BIG_QUERY_DATASET_ID = + "storage_api_data_triggered_schema_update_" + System.nanoTime(); + + private static String bigQueryLocation; + + @Rule public TestName testName = new TestName(); + + @BeforeClass + public static void setUpTestEnvironment() throws IOException, InterruptedException { + bigQueryLocation = + TestPipeline.testingPipelineOptions().as(TestBigQueryOptions.class).getBigQueryLocation(); + BQ_CLIENT.createNewDataset(PROJECT, BIG_QUERY_DATASET_ID, null, bigQueryLocation); + } + + @AfterClass + public static void cleanUp() { + LOG.info("Cleaning up dataset {} and tables.", BIG_QUERY_DATASET_ID); + BQ_CLIENT.deleteDataset(PROJECT, BIG_QUERY_DATASET_ID); + } + + private String createTable(TableSchema tableSchema) throws IOException, InterruptedException { + String tableId = testName.getMethodName().replace("[", "_").replace("]", "_"); + BQ_CLIENT.deleteTable(PROJECT, BIG_QUERY_DATASET_ID, tableId); + BQ_CLIENT.createNewTable( + PROJECT, + BIG_QUERY_DATASET_ID, + new Table() + .setSchema(tableSchema) + .setTableReference( + new TableReference() + .setTableId(tableId) + .setDatasetId(BIG_QUERY_DATASET_ID) + .setProjectId(PROJECT))); + return tableId; + } + + static class SequenceRowsDoFn extends DoFn<KV<Integer, Integer>, TableRow> { + private static final String COUNTER = "counter"; + + @StateId(COUNTER) + @SuppressWarnings("unused") + private final StateSpec<ValueState<Integer>> counterSpec = StateSpecs.value(); + + private final int stride; + + public SequenceRowsDoFn(int stride) { + this.stride = stride; + } + + @ProcessElement + public void processElement(ProcessContext c, @StateId(COUNTER) ValueState<Integer> counter) { + int current = firstNonNull(counter.read(), 0); + c.output(getRow(current)); + counter.write(++current); + } + + TableRow getRow(int i) { + TableRow row = new TableRow().set("name", "name" + i).set("number", Long.toString(i)); + if (i < stride) { + row = row.set("req", "foo"); + } else { + row = row.set("new1", "blah" + i); + row = row.set("new2", "baz" + i); + Review Comment: done ########## sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOWriteTest.java: ########## @@ -2513,6 +2515,180 @@ public void updateTableSchemaTest(boolean useSet) throws Exception { Iterables.concat(expectedDroppedValues, expectedFullValues), TableRow.class))); } + @Test + public void testAutoPatchTableSchemaTest() throws Exception { + assumeTrue(useStreaming); + assumeTrue(useStorageApi); + + // Make sure that GroupIntoBatches does not buffer data. + p.getOptions().as(BigQueryOptions.class).setStorageApiAppendThresholdBytes(1); + p.getOptions().as(BigQueryOptions.class).setNumStorageWriteApiStreams(1); + p.getOptions().as(BigQueryOptions.class).setSchemaUpgradeBufferingShards(2); + + BigQueryIO.Write.Method method = + useStorageApiApproximate ? Method.STORAGE_API_AT_LEAST_ONCE : Method.STORAGE_WRITE_API; + p.enableAbandonedNodeEnforcement(false); + + TableReference tableRef = BigQueryHelpers.parseTableSpec("project-id:dataset-id.table"); + TableSchema tableSchema = + new TableSchema() + .setFields( + ImmutableList.of( + new TableFieldSchema().setName("number").setType("INT64"), + new TableFieldSchema().setName("name").setType("STRING"), + new TableFieldSchema().setName("req").setType("STRING").setMode("REQUIRED"))); + fakeDatasetService.createTable(new Table().setTableReference(tableRef).setSchema(tableSchema)); + + final int stride = 5; + Function<Integer, TableSchema> getUpdatedSchema = + currentStride -> { + TableSchema tableSchemaUpdated = new TableSchema(); + tableSchemaUpdated.setFields( + Lists.newArrayList( + new TableFieldSchema().setName("number").setType("INT64").setMode("NULLABLE"), + new TableFieldSchema().setName("name").setType("STRING").setMode("NULLABLE"), + new TableFieldSchema().setName("req").setType("STRING").setMode("NULLABLE"), + new TableFieldSchema().setName("new1").setType("STRING").setMode("NULLABLE"), + new TableFieldSchema().setName("new2").setType("STRING").setMode("NULLABLE"))); + + if (currentStride >= 2) { + List<TableFieldSchema> nestedFields = + Lists.newArrayList( + new TableFieldSchema() + .setName("nested_field1") + .setType("STRING") + .setMode("NULLABLE"), + new TableFieldSchema() + .setName("nested_field2") + .setType("STRING") + .setMode("NULLABLE")); + if (currentStride >= 3) { + List<TableFieldSchema> doubleNestedFields = + Lists.newArrayList( + new TableFieldSchema() + .setName("double_nested_field1") + .setType("STRING") + .setMode("NULLABLE")); + nestedFields.add( + new TableFieldSchema() + .setName("double_nested") + .setType("STRUCT") + .setMode("NULLABLE") + .setFields(doubleNestedFields)); + + List<TableFieldSchema> repeatedNestedFields = + Lists.newArrayList( + new TableFieldSchema() + .setName("repeated_nested_field1") + .setType("STRING") + .setMode("NULLABLE"), + new TableFieldSchema() + .setName("repeated_nested_field2") + .setType("STRING") + .setMode("NULLABLE")); + + nestedFields.add( + new TableFieldSchema() + .setName("repeated_nested") + .setType("STRUCT") + .setMode("REPEATED") + .setFields(repeatedNestedFields)); + } + tableSchemaUpdated + .getFields() + .add( + new TableFieldSchema() + .setName("nested") + .setType("STRUCT") + .setMode("NULLABLE") + .setFields(nestedFields)); + } + return tableSchemaUpdated; + }; + + IntFunction<TableRow> getRow = + (IntFunction<TableRow> & Serializable) + (int i) -> { + TableRow row = new TableRow().set("name", "name" + i).set("number", Long.toString(i)); + if (i < stride) { + row = row.set("req", "foo"); + } else { + row = row.set("new1", "blah" + i); + row = row.set("new2", "baz" + i); Review Comment: good idea. new required column isn't possible to express (any new fields in the json are assumed to be nullable). What I can test is changing mode to repeated or changing type from string to struct. (once we support user-determined types, we can test more). One wrinkle: pretty much any type in the object will successfully validate as a String type (the logic is to call object.toString()), so this only really works with more restricted types such as INT64. Basically anything can match to. string field. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
