pvary commented on code in PR #16450: URL: https://github.com/apache/iceberg/pull/16450#discussion_r3340741020
########## flink/v2.1/flink/src/test/java/org/apache/iceberg/flink/sink/dynamic/TestVariantAvroDynamicTableRecordGenerator.java: ########## @@ -0,0 +1,451 @@ +/* + * 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.iceberg.flink.sink.dynamic; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.util.Collections; +import java.util.List; +import java.util.Map; +import org.apache.avro.Schema; +import org.apache.flink.api.common.functions.DefaultOpenContext; +import org.apache.flink.api.common.functions.util.ListCollector; +import org.apache.flink.configuration.Configuration; +import org.apache.flink.table.data.GenericRowData; +import org.apache.flink.table.data.RowData; +import org.apache.flink.table.data.StringData; +import org.apache.flink.table.types.logical.LogicalType; +import org.apache.flink.table.types.logical.RowType; +import org.apache.flink.table.types.logical.VarCharType; +import org.apache.flink.table.types.logical.VariantType; +import org.apache.flink.types.variant.Variant; +import org.apache.iceberg.PartitionSpec; +import org.apache.iceberg.avro.AvroSchemaUtil; +import org.apache.iceberg.catalog.TableIdentifier; +import org.apache.iceberg.flink.DataGenerator; +import org.apache.iceberg.flink.DataGenerators; +import org.apache.iceberg.flink.FlinkCreateTableOptions; +import org.apache.iceberg.flink.FlinkWriteOptions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.junit.jupiter.api.Test; + +public class TestVariantAvroDynamicTableRecordGenerator { + + public static final String TEST_DB = "test_db"; + public static final String TEST_TABLE = "test_table"; + public static final String BRANCH = "main"; + private static final Configuration FLINK_CONFIG = new Configuration(); + + @Test + public void testMissingRequiredFields() { + List<LogicalType> types = Lists.newArrayList(); + List<String> names = Lists.newArrayList(); + + types.add(new VarCharType(false, 255)); + names.add(FlinkCreateTableOptions.CATALOG_DATABASE.key()); + types.add(new VarCharType(false, 255)); + names.add(FlinkCreateTableOptions.CATALOG_TABLE.key()); + + RowType rowType = RowType.of(types.toArray(new LogicalType[0]), names.toArray(new String[0])); + + assertThatThrownBy( + () -> + new VariantAvroDynamicTableRecordGenerator( + rowType, Collections.emptyMap(), FLINK_CONFIG)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessageContaining( + "Missing column data. Expected column data of type VARIANT NOT NULL."); + } + + @Test + public void testWithWritePropertiesOverride() throws Exception { + DataGenerator dataGenerator = new DataGenerators.Primitives(); + Variant variantData = dataGenerator.generateFlinkVariantData(); + Schema schema = dataGenerator.avroSchema(); + String schemaVersion = "v1"; + + Map<String, String> writeProperties = Maps.newHashMap(); + writeProperties.put(FlinkCreateTableOptions.CATALOG_DATABASE.key(), "test_db_override"); + writeProperties.put(FlinkCreateTableOptions.CATALOG_TABLE.key(), "test_table_override"); + + RowType rowType = createRowTypeWithRequiredFields(); + VariantAvroDynamicTableRecordGenerator generator = + new VariantAvroDynamicTableRecordGenerator(rowType, writeProperties, FLINK_CONFIG); + generator.open(new DefaultOpenContext()); + + RowData inputRecord = + GenericRowData.of( + variantData, + StringData.fromString(schema.toString()), + StringData.fromString(schema.getName() + schemaVersion)); + + List<DynamicRecord> records = Lists.newArrayList(); + ListCollector<DynamicRecord> collector = new ListCollector<>(records); + generator.generate(inputRecord, collector); + + assertThat(records).hasSize(1); + DynamicRecord record = records.get(0); + assertThat(record.tableIdentifier()) + .isEqualTo(TableIdentifier.of("test_db_override", "test_table_override")); + assertThat(record.branch()).isNull(); + assertThat(record.spec()).isEqualTo(PartitionSpec.unpartitioned()); + assertThat(record.writeParallelism()).isEqualTo(0); + } + + @Test + public void testWithPartitionedTable() throws Exception { + DataGenerator dataGenerator = new DataGenerators.Primitives(); + Variant variantData = dataGenerator.generateFlinkVariantData(); + Schema schema = dataGenerator.avroSchema(); + String schemaVersion = "v1"; + + RowType rowType = createRowTypeWithAllColumns(); + VariantAvroDynamicTableRecordGenerator generator = + new VariantAvroDynamicTableRecordGenerator(rowType, Collections.emptyMap(), FLINK_CONFIG); + generator.open(new DefaultOpenContext()); + + RowData inputRecord = + GenericRowData.of( + variantData, + StringData.fromString(schema.toString()), + StringData.fromString(schema.getName() + schemaVersion), + StringData.fromString(TEST_DB), + StringData.fromString(TEST_TABLE), + StringData.fromString(BRANCH), + StringData.fromString("row_id,string_field"), + 1); + + List<DynamicRecord> records = Lists.newArrayList(); + ListCollector<DynamicRecord> collector = new ListCollector<>(records); + generator.generate(inputRecord, collector); + + assertThat(records).hasSize(1); + DynamicRecord record = records.get(0); + assertThat(record.tableIdentifier()).isEqualTo(TableIdentifier.of(TEST_DB, TEST_TABLE)); + assertThat(record.branch()).isEqualTo(BRANCH); + assertThat(record.writeParallelism()).isEqualTo(1); + + PartitionSpec expectedPartitionSpec = + PartitionSpec.builderFor(AvroSchemaUtil.toIceberg(schema)) + .identity("row_id") + .identity("string_field") + .build(); + assertThat(record.spec()).isEqualTo(expectedPartitionSpec); + } + + @Test + public void testSchemaCaching() throws Exception { + DataGenerator dataGenerator1 = new DataGenerators.Primitives(); + DataGenerator dataGenerator2 = new DataGenerators.StructOfPrimitive(); + + Schema schema1 = AvroSchemaUtil.convert(dataGenerator1.icebergSchema(), "TestSchema1"); + Schema schema2 = AvroSchemaUtil.convert(dataGenerator2.icebergSchema(), "TestSchema2"); + String schemaId1 = schema1.getName() + ":1"; + String schemaId2 = schema2.getName() + ":1"; + + RowType rowType = createRowTypeWithDbAndTable(); + VariantAvroDynamicTableRecordGenerator generator = + new VariantAvroDynamicTableRecordGenerator(rowType, Collections.emptyMap(), FLINK_CONFIG); + generator.open(new DefaultOpenContext()); + + List<DynamicRecord> records = Lists.newArrayList(); + ListCollector<DynamicRecord> collector = new ListCollector<>(records); + + // Generate first record with schema1 + RowData inputRecord1 = + GenericRowData.of( + dataGenerator1.generateFlinkVariantData(), + StringData.fromString(schema1.toString()), + StringData.fromString(schemaId1), + StringData.fromString(TEST_DB), + StringData.fromString(TEST_TABLE)); + generator.generate(inputRecord1, collector); + + // Verify cache has been populated with first table and schema + VariantAvroDynamicTableRecordGenerator.SchemaAndPartitionSpecCacheItem cacheItem = + generator.tableCache().get(TableIdentifier.of(TEST_DB, TEST_TABLE)); + assertThat(cacheItem).isNotNull(); + VariantAvroDynamicTableRecordGenerator.SchemaCacheItem schemaCacheItem = + cacheItem.schemaCacheItem(schemaId1); + assertThat(schemaCacheItem).isNotNull(); + assertThat(schemaCacheItem.tableSchema().sameSchema(dataGenerator1.icebergSchema())).isTrue(); + + // Generate second record with same schema1 (should use cached schema) + RowData inputRecord1Repeat = + GenericRowData.of( + dataGenerator1.generateFlinkVariantData(), + StringData.fromString(schema1.toString()), + StringData.fromString(schemaId1), + StringData.fromString(TEST_DB), + StringData.fromString(TEST_TABLE)); + generator.generate(inputRecord1Repeat, collector); + + // Generate third record with different schema2 and different table + RowData inputRecord2 = + GenericRowData.of( + dataGenerator2.generateFlinkVariantData(), + StringData.fromString(schema2.toString()), + StringData.fromString(schemaId2), + StringData.fromString(TEST_DB), + StringData.fromString("test_table2")); + generator.generate(inputRecord2, collector); + + // Verify we now have two table cache items + assertThat(generator.tableCache()).hasSize(2); + assertThat(generator.tableCache()).containsKey(TableIdentifier.of(TEST_DB, TEST_TABLE)); + assertThat(generator.tableCache()).containsKey(TableIdentifier.of(TEST_DB, "test_table2")); + + // Verify second table cache item has different schema + VariantAvroDynamicTableRecordGenerator.SchemaAndPartitionSpecCacheItem cacheItem2 = + generator.tableCache().get(TableIdentifier.of(TEST_DB, "test_table2")); + assertThat(cacheItem2).isNotNull(); + assertThat( + cacheItem2 + .schemaCacheItem(schemaId2) + .tableSchema() + .sameSchema(dataGenerator2.icebergSchema())) + .isTrue(); + + assertThat(records).hasSize(3); + // Should emit DynamicRecord with same tableSchema instance. + assertThat(records.get(1).schema() == schemaCacheItem.tableSchema()).isTrue(); Review Comment: nit: `isSameAs`? And in the other places as well -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
