reuvenlax commented on code in PR #38058: URL: https://github.com/apache/beam/pull/38058#discussion_r3127024068
########## sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/UpgradeTableSchemaTest.java: ########## @@ -0,0 +1,327 @@ +/* + * 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.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThrows; + +import com.google.cloud.bigquery.storage.v1.TableFieldSchema; +import com.google.cloud.bigquery.storage.v1.TableSchema; +import com.google.protobuf.DescriptorProtos; +import com.google.protobuf.Descriptors; +import java.nio.charset.StandardCharsets; +import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Sets; +import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.hash.Hashing; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +@RunWith(JUnit4.class) +public class UpgradeTableSchemaTest { + + @Test + public void testNewErrorCollector() throws Exception { + TableRowToStorageApiProto.ErrorCollector collector = UpgradeTableSchema.newErrorCollector(); + + // Test exceptions that should be collected + TableRowToStorageApiProto.SchemaTooNarrowException tooNarrow = + new TableRowToStorageApiProto.SchemaTooNarrowException("field", "error", false, false); + TableRowToStorageApiProto.SchemaMissingRequiredFieldException missingRequired = + new TableRowToStorageApiProto.SchemaMissingRequiredFieldException(Sets.newHashSet("field")); + + collector.collect(tooNarrow); + collector.collect(missingRequired); + + assertEquals(2, collector.getExceptions().size()); + + // Test exception that should not be collected + TableRowToStorageApiProto.SchemaConversionException randomException = + new TableRowToStorageApiProto.SchemaConversionException("generic error") {}; + assertThrows( + TableRowToStorageApiProto.SchemaConversionException.class, + () -> { + collector.collect(randomException); + }); + } + + @Test + public void testGetIncrementalSchema_SchemaTooNarrow() throws Exception { + TableRowToStorageApiProto.ErrorCollector collector = UpgradeTableSchema.newErrorCollector(); + TableRowToStorageApiProto.SchemaTooNarrowException tooNarrow = + new TableRowToStorageApiProto.SchemaTooNarrowException("new_field", "error", false, false); + collector.collect(tooNarrow); + + TableSchema oldSchema = + TableSchema.newBuilder() + .addFields( + TableFieldSchema.newBuilder() + .setName("old_field") + .setType(TableFieldSchema.Type.STRING)) + .build(); + + TableSchema incrementalSchema = UpgradeTableSchema.getIncrementalSchema(collector, oldSchema); + assertEquals(1, incrementalSchema.getFieldsCount()); + assertEquals("new_field", incrementalSchema.getFields(0).getName()); + assertEquals(TableFieldSchema.Mode.NULLABLE, incrementalSchema.getFields(0).getMode()); + assertEquals(TableFieldSchema.Type.STRING, incrementalSchema.getFields(0).getType()); + } + + @Test + public void testGetIncrementalSchema_SchemaMissingRequiredField() throws Exception { + TableRowToStorageApiProto.ErrorCollector collector = UpgradeTableSchema.newErrorCollector(); + TableRowToStorageApiProto.SchemaMissingRequiredFieldException missingRequired = + new TableRowToStorageApiProto.SchemaMissingRequiredFieldException( + Sets.newHashSet("required_field")); + collector.collect(missingRequired); + + TableSchema oldSchema = + TableSchema.newBuilder() + .addFields( + TableFieldSchema.newBuilder() + .setName("required_field") + .setType(TableFieldSchema.Type.STRING) + .setMode(TableFieldSchema.Mode.REQUIRED)) + .build(); + + TableSchema incrementalSchema = UpgradeTableSchema.getIncrementalSchema(collector, oldSchema); + assertEquals(1, incrementalSchema.getFieldsCount()); + assertEquals("required_field", incrementalSchema.getFields(0).getName()); + assertEquals(TableFieldSchema.Mode.NULLABLE, incrementalSchema.getFields(0).getMode()); + } + + @Test + public void testGetIncrementalSchema_NestedFields() throws Exception { + TableRowToStorageApiProto.ErrorCollector collector = UpgradeTableSchema.newErrorCollector(); + + // 1. Add a nested field + TableRowToStorageApiProto.SchemaTooNarrowException tooNarrow = + new TableRowToStorageApiProto.SchemaTooNarrowException( + "nested.new_field", "error", false, false); + collector.collect(tooNarrow); + + // 2. Relax a nested field + TableRowToStorageApiProto.SchemaMissingRequiredFieldException missingRequired = + new TableRowToStorageApiProto.SchemaMissingRequiredFieldException( + Sets.newHashSet("nested.required_field")); + collector.collect(missingRequired); + + TableSchema oldSchema = + TableSchema.newBuilder() + .addFields( + TableFieldSchema.newBuilder() + .setName("top") + .setType(TableFieldSchema.Type.STRING) + .setMode(TableFieldSchema.Mode.REQUIRED)) + .addFields( + TableFieldSchema.newBuilder() + .setName("nested") + .setType(TableFieldSchema.Type.STRUCT) + .addFields( + TableFieldSchema.newBuilder() + .setName("required_field") + .setType(TableFieldSchema.Type.STRING) + .setMode(TableFieldSchema.Mode.REQUIRED))) + .build(); + + TableSchema incrementalSchema = UpgradeTableSchema.getIncrementalSchema(collector, oldSchema); + + TableSchema expected = + TableSchema.newBuilder() + .addFields( + TableFieldSchema.newBuilder() + .setName("nested") + .setType(TableFieldSchema.Type.STRUCT) + .addFields( + TableFieldSchema.newBuilder() + .setName("required_field") + .setType(TableFieldSchema.Type.STRING) + .setMode(TableFieldSchema.Mode.NULLABLE)) + .addFields( + TableFieldSchema.newBuilder() + .setName("new_field") + .setType(TableFieldSchema.Type.STRING) + .setMode(TableFieldSchema.Mode.NULLABLE))) + .build(); + assertEquals(expected, incrementalSchema); + } + + @Test + public void testMergeSchemas() { + TableSchema schema1 = + TableSchema.newBuilder() + .addFields( + TableFieldSchema.newBuilder() + .setName("f1") + .setType(TableFieldSchema.Type.STRING) + .setMode(TableFieldSchema.Mode.REQUIRED)) + .addFields( + TableFieldSchema.newBuilder() + .setName("f3") + .setType(TableFieldSchema.Type.STRING) + .setMode(TableFieldSchema.Mode.NULLABLE)) + .build(); + TableSchema schema2 = + TableSchema.newBuilder() + .addFields( + TableFieldSchema.newBuilder() + .setName("f1") + .setType(TableFieldSchema.Type.STRING) + .setMode(TableFieldSchema.Mode.NULLABLE)) + .addFields( + TableFieldSchema.newBuilder() + .setName("f2") + .setType(TableFieldSchema.Type.INT64) + .setMode(TableFieldSchema.Mode.REQUIRED)) + .build(); + + TableSchema merged = UpgradeTableSchema.mergeSchemas(schema1, schema2); + + TableSchema expectedSchema = + TableSchema.newBuilder() + .addFields( + TableFieldSchema.newBuilder() + .setName("f1") + .setType(TableFieldSchema.Type.STRING) + .setMode(TableFieldSchema.Mode.NULLABLE)) + .addFields( + TableFieldSchema.newBuilder() + .setName("f3") + .setType(TableFieldSchema.Type.STRING) + .setMode(TableFieldSchema.Mode.NULLABLE)) + .addFields( + TableFieldSchema.newBuilder() + .setName("f2") + .setType(TableFieldSchema.Type.INT64) + .setMode(TableFieldSchema.Mode.REQUIRED)) + .build(); + assertEquals(expectedSchema, merged); + assertEquals(3, merged.getFieldsCount()); + } + + @Test + public void testMergeSchemasConflict() { + TableSchema schema1 = + TableSchema.newBuilder() + .addFields( + TableFieldSchema.newBuilder().setName("f1").setType(TableFieldSchema.Type.STRING)) + .build(); + TableSchema schema2 = + TableSchema.newBuilder() + .addFields( + TableFieldSchema.newBuilder().setName("f1").setType(TableFieldSchema.Type.INT64)) + .build(); + + assertThrows( + IllegalArgumentException.class, + () -> { + UpgradeTableSchema.mergeSchemas(schema1, schema2); + }); + } + + @Test + public void testMergeSchemasNested() { + TableSchema schema1 = + TableSchema.newBuilder() + .addFields( + TableFieldSchema.newBuilder() + .setName("nested") + .setType(TableFieldSchema.Type.STRUCT) + .addFields( + TableFieldSchema.newBuilder() + .setName("n1") + .setType(TableFieldSchema.Type.STRING) + .setMode(TableFieldSchema.Mode.REQUIRED))) + .build(); + + TableSchema schema2 = + TableSchema.newBuilder() + .addFields( + TableFieldSchema.newBuilder() + .setName("nested") + .setType(TableFieldSchema.Type.STRUCT) + .addFields( + TableFieldSchema.newBuilder() + .setName("n1") + .setType(TableFieldSchema.Type.STRING) + .setMode(TableFieldSchema.Mode.NULLABLE)) + .addFields( + TableFieldSchema.newBuilder() + .setName("n2") + .setType(TableFieldSchema.Type.INT64))) + .build(); + + TableSchema merged = UpgradeTableSchema.mergeSchemas(schema1, schema2); + + TableSchema expected = + TableSchema.newBuilder() + .addFields( + TableFieldSchema.newBuilder() + .setName("nested") + .setType(TableFieldSchema.Type.STRUCT) + .setMode(TableFieldSchema.Mode.NULLABLE) + .addFields( + TableFieldSchema.newBuilder() + .setName("n1") + .setType(TableFieldSchema.Type.STRING) + .setMode(TableFieldSchema.Mode.NULLABLE)) + .addFields( + TableFieldSchema.newBuilder() + .setName("n2") + .setType(TableFieldSchema.Type.INT64))) + .build(); + assertEquals(expected, merged); + assertEquals(1, merged.getFieldsCount()); + } + + @Test + public void testIsPayloadSchemaOutOfDate() throws Exception { + byte[] hash1 = + Hashing.goodFastHash(32).hashBytes("schema1".getBytes(StandardCharsets.UTF_8)).asBytes(); Review Comment: done -- 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]
