Rename variable equalityFieldIds to identifierFieldIds

memiiso · Sep 8, 2024 · e3859c9 · e3859c9
1 parent 8269d89
commit e3859c9
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/...berg-sink/src/main/java/io/debezium/server/iceberg/tableoperator/BaseDeltaTaskWriter.java b/...berg-sink/src/main/java/io/debezium/server/iceberg/tableoperator/BaseDeltaTaskWriter.java
@@ -33,12 +33,12 @@ abstract class BaseDeltaTaskWriter extends BaseTaskWriter<Record> {
                       FileIO io,
                       long targetFileSize,
                       Schema schema,
-                      Set<Integer> equalityFieldIds,
+                      Set<Integer> identifierFieldIds,
                       boolean upsert,
                       boolean upsertKeepDeletes) {
     super(spec, format, appenderFactory, fileFactory, io, targetFileSize);
     this.schema = schema;
-    this.deleteSchema = TypeUtil.select(schema, Sets.newHashSet(equalityFieldIds));
+    this.deleteSchema = TypeUtil.select(schema, Sets.newHashSet(identifierFieldIds));
     this.wrapper = new InternalRecordWrapper(schema.asStruct());
     this.keyWrapper = new InternalRecordWrapper(deleteSchema.asStruct());
     this.keyProjection = RecordProjection.create(schema, deleteSchema);

diff --git a/...ink/src/main/java/io/debezium/server/iceberg/tableoperator/IcebergTableWriterFactory.java b/...ink/src/main/java/io/debezium/server/iceberg/tableoperator/IcebergTableWriterFactory.java
@@ -40,7 +40,7 @@ public BaseTaskWriter<Record> create(Table icebergTable) {
     GenericAppenderFactory appenderFactory = IcebergUtil.getTableAppender(icebergTable);
     OutputFileFactory fileFactory = IcebergUtil.getTableOutputFileFactory(icebergTable, format);
     // equality Field Ids
-    Set<Integer> equalityFieldIds = icebergTable.schema().identifierFieldIds();
+    Set<Integer> identifierFieldIds = icebergTable.schema().identifierFieldIds();
     long targetFileSize =
         PropertyUtil.propertyAsLong(
             icebergTable.properties(), WRITE_TARGET_FILE_SIZE_BYTES, WRITE_TARGET_FILE_SIZE_BYTES_DEFAULT);
@@ -76,12 +76,12 @@ else if (icebergTable.spec().isUnpartitioned()) {
       // running with upsert mode + un partitioned table
       writer = new UnpartitionedDeltaWriter(icebergTable.spec(), format, appenderFactory, fileFactory,
           icebergTable.io(),
-          targetFileSize, icebergTable.schema(), equalityFieldIds, true, upsertKeepDeletes);
+          targetFileSize, icebergTable.schema(), identifierFieldIds, true, upsertKeepDeletes);
     } else {
       // running with upsert mode + partitioned table
       writer = new PartitionedDeltaWriter(icebergTable.spec(), format, appenderFactory, fileFactory,
           icebergTable.io(),
-          targetFileSize, icebergTable.schema(), equalityFieldIds, true, upsertKeepDeletes);
+          targetFileSize, icebergTable.schema(), identifierFieldIds, true, upsertKeepDeletes);
     }
 
     return writer;

diff --git a/...g-sink/src/main/java/io/debezium/server/iceberg/tableoperator/PartitionedDeltaWriter.java b/...g-sink/src/main/java/io/debezium/server/iceberg/tableoperator/PartitionedDeltaWriter.java
@@ -29,10 +29,10 @@ class PartitionedDeltaWriter extends BaseDeltaTaskWriter {
                          FileIO io,
                          long targetFileSize,
                          Schema schema,
-                         Set<Integer> equalityFieldIds,
+                         Set<Integer> identifierFieldIds,
                          boolean upsert,
                          boolean upsertKeepDeletes) {
-    super(spec, format, appenderFactory, fileFactory, io, targetFileSize, schema, equalityFieldIds, upsert, upsertKeepDeletes);
+    super(spec, format, appenderFactory, fileFactory, io, targetFileSize, schema, identifierFieldIds, upsert, upsertKeepDeletes);
     this.partitionKey = new PartitionKey(spec, schema);
   }
 

diff --git a/...sink/src/main/java/io/debezium/server/iceberg/tableoperator/UnpartitionedDeltaWriter.java b/...sink/src/main/java/io/debezium/server/iceberg/tableoperator/UnpartitionedDeltaWriter.java
@@ -21,10 +21,10 @@ class UnpartitionedDeltaWriter extends BaseDeltaTaskWriter {
                            FileIO io,
                            long targetFileSize,
                            Schema schema,
-                           Set<Integer> equalityFieldIds,
+                           Set<Integer> identifierFieldIds,
                            boolean upsert,
                            boolean upsertKeepDeletes) {
-    super(spec, format, appenderFactory, fileFactory, io, targetFileSize, schema, equalityFieldIds, upsert, upsertKeepDeletes);
+    super(spec, format, appenderFactory, fileFactory, io, targetFileSize, schema, identifierFieldIds, upsert, upsertKeepDeletes);
     this.writer = new RowDataDeltaWriter(null);
   }
 

diff --git a/...r-iceberg-sink/src/test/java/io/debezium/server/iceberg/tableoperator/BaseWriterTest.java b/...r-iceberg-sink/src/test/java/io/debezium/server/iceberg/tableoperator/BaseWriterTest.java
@@ -24,7 +24,7 @@ public class BaseWriterTest {
   FileFormat format;
   GenericAppenderFactory appenderFactory;
   OutputFileFactory fileFactory;
-  Set<Integer> equalityFieldIds;
+  Set<Integer> identifierFieldIds;
 
   protected static final Schema SCHEMA =
       new Schema(
@@ -55,7 +55,7 @@ public void before() {
     format = IcebergUtil.getTableFileFormat(table);
     appenderFactory = IcebergUtil.getTableAppender(table);
     fileFactory = IcebergUtil.getTableOutputFileFactory(table, format);
-    equalityFieldIds = table.schema().identifierFieldIds();
+    identifierFieldIds = table.schema().identifierFieldIds();
   }
 
 }
diff --git a/.../src/test/java/io/debezium/server/iceberg/tableoperator/UnpartitionedDeltaWriterTest.java b/.../src/test/java/io/debezium/server/iceberg/tableoperator/UnpartitionedDeltaWriterTest.java
@@ -14,7 +14,7 @@ class UnpartitionedDeltaWriterTest extends BaseWriterTest {
   public void testUnpartitionedDeltaWriter() throws IOException {
     UnpartitionedDeltaWriter writer = new UnpartitionedDeltaWriter(table.spec(), format, appenderFactory, fileFactory,
         table.io(),
-        Long.MAX_VALUE, table.schema(), equalityFieldIds, true, true);
+        Long.MAX_VALUE, table.schema(), identifierFieldIds, true, true);
 
     Record row = GenericRecord.create(SCHEMA);
     row.setField("id", "123");