ahmedabu98 commented on code in PR #40031: URL: https://github.com/apache/beam/pull/40031#discussion_r4027064847
########## sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/cdc/sink/WriteDeltas.java: ########## @@ -0,0 +1,243 @@ +/* + * 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.iceberg.cdc.sink; + +import static org.apache.beam.sdk.io.iceberg.IcebergUtils.beamRowToIcebergRecord; +import static org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions.checkArgument; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.coders.IterableCoder; +import org.apache.beam.sdk.coders.KvCoder; +import org.apache.beam.sdk.io.iceberg.DynamicDestinations; +import org.apache.beam.sdk.io.iceberg.IcebergCatalogConfig; +import org.apache.beam.sdk.io.iceberg.SerializableDataFile; +import org.apache.beam.sdk.io.iceberg.SerializableDeleteFile; +import org.apache.beam.sdk.schemas.NoSuchSchemaException; +import org.apache.beam.sdk.schemas.Schema; +import org.apache.beam.sdk.schemas.SchemaRegistry; +import org.apache.beam.sdk.transforms.DoFn; +import org.apache.beam.sdk.transforms.PTransform; +import org.apache.beam.sdk.transforms.ParDo; +import org.apache.beam.sdk.transforms.windowing.BoundedWindow; +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.annotations.VisibleForTesting; +import org.apache.iceberg.DataFile; +import org.apache.iceberg.DeleteFile; +import org.apache.iceberg.FileFormat; +import org.apache.iceberg.PartitionSpec; +import org.apache.iceberg.Table; +import org.apache.iceberg.TableProperties; +import org.apache.iceberg.io.OutputFileFactory; +import org.apache.iceberg.io.WriteResult; +import org.apache.iceberg.util.PropertyUtil; + +/** + * Stage 3 of the CDC sink: consumes each complete sorted {@code (destination, shard, window)} group + * from {@link CommitWindows}, collapses each primary key to its final state through a {@link + * RecordDeltaTaskWriter}, and emits one {@link ShardDeltaFiles} with the serialized file metadata. + */ +final class WriteDeltas + extends PTransform< + PCollection<KV<DestinationShard, Iterable<KV<byte[], CdcRecord>>>>, + PCollection<ShardDeltaFiles>> { + + private final IcebergCatalogConfig catalogConfig; + private final CdcWriteConfig config; + private final DynamicDestinations destinations; + private final String filePrefix; + + WriteDeltas( + IcebergCatalogConfig catalogConfig, + CdcWriteConfig config, + DynamicDestinations destinations, + String filePrefix) { + this.catalogConfig = catalogConfig; + this.config = config; + this.destinations = destinations; + this.filePrefix = filePrefix; + } + + @Override + public PCollection<ShardDeltaFiles> expand( + PCollection<KV<DestinationShard, Iterable<KV<byte[], CdcRecord>>>> input) { + Schema dataSchema = dataSchemaOf(input.getCoder()); + return input + .apply( + "WriteDeltas", + ParDo.of( + new WriteDeltasFn( + new TableSetup(catalogConfig, config, destinations, filePrefix), Review Comment: Maybe `filePrefix` isn't the best naming. It's just an ID that is generated once per pipeline launch. I'll rename it to `runId` if that helps ########## sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/cdc/sink/WriteDeltas.java: ########## @@ -0,0 +1,243 @@ +/* + * 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.iceberg.cdc.sink; + +import static org.apache.beam.sdk.io.iceberg.IcebergUtils.beamRowToIcebergRecord; +import static org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions.checkArgument; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.coders.IterableCoder; +import org.apache.beam.sdk.coders.KvCoder; +import org.apache.beam.sdk.io.iceberg.DynamicDestinations; +import org.apache.beam.sdk.io.iceberg.IcebergCatalogConfig; +import org.apache.beam.sdk.io.iceberg.SerializableDataFile; +import org.apache.beam.sdk.io.iceberg.SerializableDeleteFile; +import org.apache.beam.sdk.schemas.NoSuchSchemaException; +import org.apache.beam.sdk.schemas.Schema; +import org.apache.beam.sdk.schemas.SchemaRegistry; +import org.apache.beam.sdk.transforms.DoFn; +import org.apache.beam.sdk.transforms.PTransform; +import org.apache.beam.sdk.transforms.ParDo; +import org.apache.beam.sdk.transforms.windowing.BoundedWindow; +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.annotations.VisibleForTesting; +import org.apache.iceberg.DataFile; +import org.apache.iceberg.DeleteFile; +import org.apache.iceberg.FileFormat; +import org.apache.iceberg.PartitionSpec; +import org.apache.iceberg.Table; +import org.apache.iceberg.TableProperties; +import org.apache.iceberg.io.OutputFileFactory; +import org.apache.iceberg.io.WriteResult; +import org.apache.iceberg.util.PropertyUtil; + +/** + * Stage 3 of the CDC sink: consumes each complete sorted {@code (destination, shard, window)} group + * from {@link CommitWindows}, collapses each primary key to its final state through a {@link + * RecordDeltaTaskWriter}, and emits one {@link ShardDeltaFiles} with the serialized file metadata. + */ +final class WriteDeltas + extends PTransform< + PCollection<KV<DestinationShard, Iterable<KV<byte[], CdcRecord>>>>, + PCollection<ShardDeltaFiles>> { + + private final IcebergCatalogConfig catalogConfig; + private final CdcWriteConfig config; + private final DynamicDestinations destinations; + private final String filePrefix; + + WriteDeltas( + IcebergCatalogConfig catalogConfig, + CdcWriteConfig config, + DynamicDestinations destinations, + String filePrefix) { + this.catalogConfig = catalogConfig; + this.config = config; + this.destinations = destinations; + this.filePrefix = filePrefix; + } + + @Override + public PCollection<ShardDeltaFiles> expand( + PCollection<KV<DestinationShard, Iterable<KV<byte[], CdcRecord>>>> input) { + Schema dataSchema = dataSchemaOf(input.getCoder()); Review Comment: Yep nice catch ########## sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/cdc/sink/WriteDeltas.java: ########## @@ -0,0 +1,243 @@ +/* + * 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.iceberg.cdc.sink; + +import static org.apache.beam.sdk.io.iceberg.IcebergUtils.beamRowToIcebergRecord; +import static org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions.checkArgument; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.coders.IterableCoder; +import org.apache.beam.sdk.coders.KvCoder; +import org.apache.beam.sdk.io.iceberg.DynamicDestinations; +import org.apache.beam.sdk.io.iceberg.IcebergCatalogConfig; +import org.apache.beam.sdk.io.iceberg.SerializableDataFile; +import org.apache.beam.sdk.io.iceberg.SerializableDeleteFile; +import org.apache.beam.sdk.schemas.NoSuchSchemaException; +import org.apache.beam.sdk.schemas.Schema; +import org.apache.beam.sdk.schemas.SchemaRegistry; +import org.apache.beam.sdk.transforms.DoFn; +import org.apache.beam.sdk.transforms.PTransform; +import org.apache.beam.sdk.transforms.ParDo; +import org.apache.beam.sdk.transforms.windowing.BoundedWindow; +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.annotations.VisibleForTesting; +import org.apache.iceberg.DataFile; +import org.apache.iceberg.DeleteFile; +import org.apache.iceberg.FileFormat; +import org.apache.iceberg.PartitionSpec; +import org.apache.iceberg.Table; +import org.apache.iceberg.TableProperties; +import org.apache.iceberg.io.OutputFileFactory; +import org.apache.iceberg.io.WriteResult; +import org.apache.iceberg.util.PropertyUtil; + +/** + * Stage 3 of the CDC sink: consumes each complete sorted {@code (destination, shard, window)} group + * from {@link CommitWindows}, collapses each primary key to its final state through a {@link + * RecordDeltaTaskWriter}, and emits one {@link ShardDeltaFiles} with the serialized file metadata. + */ +final class WriteDeltas + extends PTransform< + PCollection<KV<DestinationShard, Iterable<KV<byte[], CdcRecord>>>>, + PCollection<ShardDeltaFiles>> { + + private final IcebergCatalogConfig catalogConfig; + private final CdcWriteConfig config; + private final DynamicDestinations destinations; + private final String filePrefix; + + WriteDeltas( + IcebergCatalogConfig catalogConfig, + CdcWriteConfig config, + DynamicDestinations destinations, + String filePrefix) { + this.catalogConfig = catalogConfig; + this.config = config; + this.destinations = destinations; + this.filePrefix = filePrefix; + } + + @Override + public PCollection<ShardDeltaFiles> expand( + PCollection<KV<DestinationShard, Iterable<KV<byte[], CdcRecord>>>> input) { + Schema dataSchema = dataSchemaOf(input.getCoder()); + return input + .apply( + "WriteDeltas", + ParDo.of( + new WriteDeltasFn( + new TableSetup(catalogConfig, config, destinations, filePrefix), + config, + filePrefix, + dataSchema))) + .setCoder(shardDeltaFilesCoder()); + } + + static Coder<ShardDeltaFiles> shardDeltaFilesCoder() { Review Comment: Done ########## sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/cdc/sink/WriteDeltas.java: ########## @@ -0,0 +1,243 @@ +/* + * 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.iceberg.cdc.sink; + +import static org.apache.beam.sdk.io.iceberg.IcebergUtils.beamRowToIcebergRecord; +import static org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions.checkArgument; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import org.apache.beam.sdk.coders.Coder; +import org.apache.beam.sdk.coders.IterableCoder; +import org.apache.beam.sdk.coders.KvCoder; +import org.apache.beam.sdk.io.iceberg.DynamicDestinations; +import org.apache.beam.sdk.io.iceberg.IcebergCatalogConfig; +import org.apache.beam.sdk.io.iceberg.SerializableDataFile; +import org.apache.beam.sdk.io.iceberg.SerializableDeleteFile; +import org.apache.beam.sdk.schemas.NoSuchSchemaException; +import org.apache.beam.sdk.schemas.Schema; +import org.apache.beam.sdk.schemas.SchemaRegistry; +import org.apache.beam.sdk.transforms.DoFn; +import org.apache.beam.sdk.transforms.PTransform; +import org.apache.beam.sdk.transforms.ParDo; +import org.apache.beam.sdk.transforms.windowing.BoundedWindow; +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.annotations.VisibleForTesting; +import org.apache.iceberg.DataFile; +import org.apache.iceberg.DeleteFile; +import org.apache.iceberg.FileFormat; +import org.apache.iceberg.PartitionSpec; +import org.apache.iceberg.Table; +import org.apache.iceberg.TableProperties; +import org.apache.iceberg.io.OutputFileFactory; +import org.apache.iceberg.io.WriteResult; +import org.apache.iceberg.util.PropertyUtil; + +/** + * Stage 3 of the CDC sink: consumes each complete sorted {@code (destination, shard, window)} group + * from {@link CommitWindows}, collapses each primary key to its final state through a {@link + * RecordDeltaTaskWriter}, and emits one {@link ShardDeltaFiles} with the serialized file metadata. + */ +final class WriteDeltas + extends PTransform< + PCollection<KV<DestinationShard, Iterable<KV<byte[], CdcRecord>>>>, + PCollection<ShardDeltaFiles>> { + + private final IcebergCatalogConfig catalogConfig; + private final CdcWriteConfig config; + private final DynamicDestinations destinations; + private final String filePrefix; + + WriteDeltas( + IcebergCatalogConfig catalogConfig, + CdcWriteConfig config, + DynamicDestinations destinations, + String filePrefix) { + this.catalogConfig = catalogConfig; + this.config = config; + this.destinations = destinations; + this.filePrefix = filePrefix; + } + + @Override + public PCollection<ShardDeltaFiles> expand( + PCollection<KV<DestinationShard, Iterable<KV<byte[], CdcRecord>>>> input) { + Schema dataSchema = dataSchemaOf(input.getCoder()); + return input + .apply( + "WriteDeltas", + ParDo.of( + new WriteDeltasFn( + new TableSetup(catalogConfig, config, destinations, filePrefix), + config, + filePrefix, + dataSchema))) + .setCoder(shardDeltaFilesCoder()); + } + + static Coder<ShardDeltaFiles> shardDeltaFilesCoder() { + try { + return SchemaRegistry.createDefault().getSchemaCoder(ShardDeltaFiles.class); + } catch (NoSuchSchemaException e) { + throw new RuntimeException("Could not build a coder for ShardDeltaFiles.", e); + } + } + + /** Extracts the CDC data schema carried by the input's nested {@link CdcRecordCoder}. */ + private static Schema dataSchemaOf(Coder<?> inputCoder) { + checkArgument( + inputCoder instanceof KvCoder, + "expected a KvCoder input element coder, got %s", + inputCoder); + Coder<?> groupCoder = ((KvCoder<?, ?>) inputCoder).getValueCoder(); + checkArgument( + groupCoder instanceof IterableCoder, + "expected an IterableCoder input value coder, got %s", + groupCoder); + Coder<?> elementCoder = ((IterableCoder<?>) groupCoder).getElemCoder(); + checkArgument( + elementCoder instanceof KvCoder, + "expected a KvCoder group element coder, got %s", + elementCoder); + Coder<?> recordCoder = ((KvCoder<?, ?>) elementCoder).getValueCoder(); + checkArgument( + recordCoder instanceof CdcRecordCoder, + "expected a CdcRecordCoder input record coder, got %s", + recordCoder); + return ((CdcRecordCoder) recordCoder).getDataSchema(); + } + + /** + * Writes one {@link RecordDeltaTaskWriter} per input group and emits the serialized {@link + * ShardDeltaFiles}. On any failure {@link RecordDeltaTaskWriter#abort()} deletes the group's + * written files. + */ + @VisibleForTesting + static final class WriteDeltasFn + extends DoFn<KV<DestinationShard, Iterable<KV<byte[], CdcRecord>>>, ShardDeltaFiles> { + + private final TableSetup tableSetup; + private final CdcWriteConfig config; + private final String filePrefix; + private final Schema dataSchema; + + WriteDeltasFn( + TableSetup tableSetup, CdcWriteConfig config, String filePrefix, Schema dataSchema) { + this.tableSetup = tableSetup; + this.config = config; + this.filePrefix = filePrefix; + this.dataSchema = dataSchema; + } + + @ProcessElement + public void process( + @Element KV<DestinationShard, Iterable<KV<byte[], CdcRecord>>> group, + BoundedWindow window, + OutputReceiver<ShardDeltaFiles> out) + throws IOException { + String destString = group.getKey().getDestination(); + int shardId = group.getKey().getShard(); + TableSetup.Dest dest = tableSetup.get(destString, dataSchema); + Table table = dest.table(); + PartitionSpec spec = dest.spec(); + + FileFormat dataFormat = RecordDeltaTaskWriter.dataFileFormat(table); + FileFormat deleteFormat = RecordDeltaTaskWriter.deleteFileFormat(table, dataFormat); + long targetFileSize = + PropertyUtil.propertyAsLong( + table.properties(), + TableProperties.WRITE_TARGET_FILE_SIZE_BYTES, + TableProperties.WRITE_TARGET_FILE_SIZE_BYTES_DEFAULT); + + OutputFileFactory fileFactory = + OutputFileFactory.builderFor(table, shardId, /* taskId= */ 0) + .format(dataFormat) + .defaultSpec(spec) + .operationId( + filePrefix + "-" + window.maxTimestamp().getMillis() + "-" + UUID.randomUUID()) + .build(); + RecordDeltaTaskWriter writer = + RecordDeltaTaskWriter.create( + table, + spec, + dest.equalityFieldIds(), + config.getUpsert(), + targetFileSize, + fileFactory, + dataFormat, + deleteFormat); + + org.apache.iceberg.Schema tableSchema = table.schema(); Review Comment: We're using the same `table` instance for these calls so it should be consistent throughout? Not sure if I'm understanding the comment correctly -- 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]
