diff --git a/paimon-core/src/main/java/org/apache/paimon/append/AppendOnlyCompactionTask.java b/paimon-core/src/main/java/org/apache/paimon/append/AppendOnlyCompactionTask.java index 3ef3da40e6c3..721d93eb3fd9 100644 --- a/paimon-core/src/main/java/org/apache/paimon/append/AppendOnlyCompactionTask.java +++ b/paimon-core/src/main/java/org/apache/paimon/append/AppendOnlyCompactionTask.java @@ -21,7 +21,7 @@ import org.apache.paimon.data.BinaryRow; import org.apache.paimon.io.CompactIncrement; import org.apache.paimon.io.DataFileMeta; -import org.apache.paimon.io.NewFilesIncrement; +import org.apache.paimon.io.DataIncrement; import org.apache.paimon.operation.AppendOnlyFileStoreWrite; import org.apache.paimon.table.sink.CommitMessage; import org.apache.paimon.table.sink.CommitMessageImpl; @@ -68,7 +68,7 @@ public CommitMessage doCompact(AppendOnlyFileStoreWrite write) throws Exception partition, 0, // bucket 0 is bucket for unaware-bucket table for compatibility with the old // design - NewFilesIncrement.emptyIncrement(), + DataIncrement.emptyIncrement(), compactIncrement); } diff --git a/paimon-core/src/main/java/org/apache/paimon/append/AppendOnlyWriter.java b/paimon-core/src/main/java/org/apache/paimon/append/AppendOnlyWriter.java index 544e766ae0d7..71c863fcb016 100644 --- a/paimon-core/src/main/java/org/apache/paimon/append/AppendOnlyWriter.java +++ b/paimon-core/src/main/java/org/apache/paimon/append/AppendOnlyWriter.java @@ -29,7 +29,7 @@ import org.apache.paimon.io.CompactIncrement; import org.apache.paimon.io.DataFileMeta; import org.apache.paimon.io.DataFilePathFactory; -import org.apache.paimon.io.NewFilesIncrement; +import org.apache.paimon.io.DataIncrement; import org.apache.paimon.io.RowDataRollingFileWriter; import org.apache.paimon.memory.MemoryOwner; import org.apache.paimon.memory.MemorySegmentPool; @@ -235,8 +235,8 @@ private void trySyncLatestCompaction(boolean blocking) } private CommitIncrement drainIncrement() { - NewFilesIncrement newFilesIncrement = - new NewFilesIncrement( + DataIncrement dataIncrement = + new DataIncrement( new ArrayList<>(newFiles), new ArrayList<>(deletedFiles), Collections.emptyList()); @@ -251,7 +251,7 @@ private CommitIncrement drainIncrement() { compactBefore.clear(); compactAfter.clear(); - return new CommitIncrement(newFilesIncrement, compactIncrement); + return new CommitIncrement(dataIncrement, compactIncrement); } @Override diff --git a/paimon-core/src/main/java/org/apache/paimon/io/DataFileMeta.java b/paimon-core/src/main/java/org/apache/paimon/io/DataFileMeta.java index 3712411947f6..30dacd130155 100644 --- a/paimon-core/src/main/java/org/apache/paimon/io/DataFileMeta.java +++ b/paimon-core/src/main/java/org/apache/paimon/io/DataFileMeta.java @@ -230,7 +230,7 @@ public int level() { *
  • Paimon 0.2 * * */ diff --git a/paimon-core/src/main/java/org/apache/paimon/io/NewFilesIncrement.java b/paimon-core/src/main/java/org/apache/paimon/io/DataIncrement.java similarity index 92% rename from paimon-core/src/main/java/org/apache/paimon/io/NewFilesIncrement.java rename to paimon-core/src/main/java/org/apache/paimon/io/DataIncrement.java index b2f63070d131..f343940dfe0c 100644 --- a/paimon-core/src/main/java/org/apache/paimon/io/NewFilesIncrement.java +++ b/paimon-core/src/main/java/org/apache/paimon/io/DataIncrement.java @@ -24,13 +24,13 @@ import java.util.stream.Collectors; /** Newly created data files and changelog files. */ -public class NewFilesIncrement { +public class DataIncrement { private final List newFiles; private final List deletedFiles; private final List changelogFiles; - public NewFilesIncrement( + public DataIncrement( List newFiles, List deletedFiles, List changelogFiles) { @@ -39,8 +39,8 @@ public NewFilesIncrement( this.changelogFiles = changelogFiles; } - public static NewFilesIncrement emptyIncrement() { - return new NewFilesIncrement( + public static DataIncrement emptyIncrement() { + return new DataIncrement( Collections.emptyList(), Collections.emptyList(), Collections.emptyList()); } @@ -69,7 +69,7 @@ public boolean equals(Object o) { return false; } - NewFilesIncrement that = (NewFilesIncrement) o; + DataIncrement that = (DataIncrement) o; return Objects.equals(newFiles, that.newFiles) && Objects.equals(changelogFiles, that.changelogFiles); } diff --git a/paimon-core/src/main/java/org/apache/paimon/mergetree/MergeTreeWriter.java b/paimon-core/src/main/java/org/apache/paimon/mergetree/MergeTreeWriter.java index 1c94a2108561..7425792870bd 100644 --- a/paimon-core/src/main/java/org/apache/paimon/mergetree/MergeTreeWriter.java +++ b/paimon-core/src/main/java/org/apache/paimon/mergetree/MergeTreeWriter.java @@ -27,8 +27,8 @@ import org.apache.paimon.disk.IOManager; import org.apache.paimon.io.CompactIncrement; import org.apache.paimon.io.DataFileMeta; +import org.apache.paimon.io.DataIncrement; import org.apache.paimon.io.KeyValueFileWriterFactory; -import org.apache.paimon.io.NewFilesIncrement; import org.apache.paimon.io.RollingFileWriter; import org.apache.paimon.memory.MemoryOwner; import org.apache.paimon.memory.MemorySegmentPool; @@ -254,8 +254,8 @@ public void sync() throws Exception { } private CommitIncrement drainIncrement() { - NewFilesIncrement newFilesIncrement = - new NewFilesIncrement( + DataIncrement dataIncrement = + new DataIncrement( new ArrayList<>(newFiles), new ArrayList<>(deletedFiles), new ArrayList<>(newFilesChangelog)); @@ -272,7 +272,7 @@ private CommitIncrement drainIncrement() { compactAfter.clear(); compactChangelog.clear(); - return new CommitIncrement(newFilesIncrement, compactIncrement); + return new CommitIncrement(dataIncrement, compactIncrement); } private void updateCompactResult(CompactResult result) { diff --git a/paimon-core/src/main/java/org/apache/paimon/migrate/FileMetaUtils.java b/paimon-core/src/main/java/org/apache/paimon/migrate/FileMetaUtils.java index ddb11a658786..2a0ec86f4a08 100644 --- a/paimon-core/src/main/java/org/apache/paimon/migrate/FileMetaUtils.java +++ b/paimon-core/src/main/java/org/apache/paimon/migrate/FileMetaUtils.java @@ -29,7 +29,7 @@ import org.apache.paimon.fs.Path; import org.apache.paimon.io.CompactIncrement; import org.apache.paimon.io.DataFileMeta; -import org.apache.paimon.io.NewFilesIncrement; +import org.apache.paimon.io.DataIncrement; import org.apache.paimon.statistics.FieldStatsCollector; import org.apache.paimon.stats.BinaryTableStats; import org.apache.paimon.stats.FieldStatsArraySerializer; @@ -86,8 +86,7 @@ public static CommitMessage commitFile(BinaryRow partition, List d return new CommitMessageImpl( partition, 0, - new NewFilesIncrement( - dataFileMetas, Collections.emptyList(), Collections.emptyList()), + new DataIncrement(dataFileMetas, Collections.emptyList(), Collections.emptyList()), new CompactIncrement( Collections.emptyList(), Collections.emptyList(), Collections.emptyList())); } diff --git a/paimon-core/src/main/java/org/apache/paimon/table/sink/CommitMessageImpl.java b/paimon-core/src/main/java/org/apache/paimon/table/sink/CommitMessageImpl.java index 1730fd7e67ea..b95e96ac1fc8 100644 --- a/paimon-core/src/main/java/org/apache/paimon/table/sink/CommitMessageImpl.java +++ b/paimon-core/src/main/java/org/apache/paimon/table/sink/CommitMessageImpl.java @@ -21,10 +21,10 @@ import org.apache.paimon.annotation.VisibleForTesting; import org.apache.paimon.data.BinaryRow; import org.apache.paimon.io.CompactIncrement; +import org.apache.paimon.io.DataIncrement; import org.apache.paimon.io.DataInputViewStreamWrapper; import org.apache.paimon.io.DataOutputViewStreamWrapper; import org.apache.paimon.io.IndexIncrement; -import org.apache.paimon.io.NewFilesIncrement; import java.io.IOException; import java.io.ObjectInputStream; @@ -45,7 +45,7 @@ public class CommitMessageImpl implements CommitMessage { private transient BinaryRow partition; private transient int bucket; - private transient NewFilesIncrement newFilesIncrement; + private transient DataIncrement dataIncrement; private transient CompactIncrement compactIncrement; private transient IndexIncrement indexIncrement; @@ -53,12 +53,12 @@ public class CommitMessageImpl implements CommitMessage { public CommitMessageImpl( BinaryRow partition, int bucket, - NewFilesIncrement newFilesIncrement, + DataIncrement dataIncrement, CompactIncrement compactIncrement) { this( partition, bucket, - newFilesIncrement, + dataIncrement, compactIncrement, new IndexIncrement(Collections.emptyList())); } @@ -66,12 +66,12 @@ public CommitMessageImpl( public CommitMessageImpl( BinaryRow partition, int bucket, - NewFilesIncrement newFilesIncrement, + DataIncrement dataIncrement, CompactIncrement compactIncrement, IndexIncrement indexIncrement) { this.partition = partition; this.bucket = bucket; - this.newFilesIncrement = newFilesIncrement; + this.dataIncrement = dataIncrement; this.compactIncrement = compactIncrement; this.indexIncrement = indexIncrement; } @@ -86,8 +86,8 @@ public int bucket() { return bucket; } - public NewFilesIncrement newFilesIncrement() { - return newFilesIncrement; + public DataIncrement newFilesIncrement() { + return dataIncrement; } public CompactIncrement compactIncrement() { @@ -99,9 +99,7 @@ public IndexIncrement indexIncrement() { } public boolean isEmpty() { - return newFilesIncrement.isEmpty() - && compactIncrement.isEmpty() - && indexIncrement.isEmpty(); + return dataIncrement.isEmpty() && compactIncrement.isEmpty() && indexIncrement.isEmpty(); } private void writeObject(ObjectOutputStream out) throws IOException { @@ -118,7 +116,7 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE CommitMessageImpl message = (CommitMessageImpl) CACHE.get().deserialize(version, bytes); this.partition = message.partition; this.bucket = message.bucket; - this.newFilesIncrement = message.newFilesIncrement; + this.dataIncrement = message.dataIncrement; this.compactIncrement = message.compactIncrement; this.indexIncrement = message.indexIncrement; } @@ -135,14 +133,14 @@ public boolean equals(Object o) { CommitMessageImpl that = (CommitMessageImpl) o; return bucket == that.bucket && Objects.equals(partition, that.partition) - && Objects.equals(newFilesIncrement, that.newFilesIncrement) + && Objects.equals(dataIncrement, that.dataIncrement) && Objects.equals(compactIncrement, that.compactIncrement) && Objects.equals(indexIncrement, that.indexIncrement); } @Override public int hashCode() { - return Objects.hash(partition, bucket, newFilesIncrement, compactIncrement, indexIncrement); + return Objects.hash(partition, bucket, dataIncrement, compactIncrement, indexIncrement); } @Override @@ -154,6 +152,6 @@ public String toString() { + "newFilesIncrement = %s, " + "compactIncrement = %s, " + "indexIncrement = %s}", - partition, bucket, newFilesIncrement, compactIncrement, indexIncrement); + partition, bucket, dataIncrement, compactIncrement, indexIncrement); } } diff --git a/paimon-core/src/main/java/org/apache/paimon/table/sink/CommitMessageSerializer.java b/paimon-core/src/main/java/org/apache/paimon/table/sink/CommitMessageSerializer.java index 65a647edb9ee..24c9fc8924b2 100644 --- a/paimon-core/src/main/java/org/apache/paimon/table/sink/CommitMessageSerializer.java +++ b/paimon-core/src/main/java/org/apache/paimon/table/sink/CommitMessageSerializer.java @@ -22,12 +22,12 @@ import org.apache.paimon.index.IndexFileMetaSerializer; import org.apache.paimon.io.CompactIncrement; import org.apache.paimon.io.DataFileMetaSerializer; +import org.apache.paimon.io.DataIncrement; import org.apache.paimon.io.DataInputDeserializer; import org.apache.paimon.io.DataInputView; import org.apache.paimon.io.DataOutputView; import org.apache.paimon.io.DataOutputViewStreamWrapper; import org.apache.paimon.io.IndexIncrement; -import org.apache.paimon.io.NewFilesIncrement; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -116,7 +116,7 @@ private CommitMessage deserialize(DataInputView view) throws IOException { return new CommitMessageImpl( deserializeBinaryRow(view), view.readInt(), - new NewFilesIncrement( + new DataIncrement( dataFileSerializer.deserializeList(view), dataFileSerializer.deserializeList(view), dataFileSerializer.deserializeList(view)), diff --git a/paimon-core/src/main/java/org/apache/paimon/utils/CommitIncrement.java b/paimon-core/src/main/java/org/apache/paimon/utils/CommitIncrement.java index da94eec1708e..a51f87f75e7e 100644 --- a/paimon-core/src/main/java/org/apache/paimon/utils/CommitIncrement.java +++ b/paimon-core/src/main/java/org/apache/paimon/utils/CommitIncrement.java @@ -19,21 +19,21 @@ package org.apache.paimon.utils; import org.apache.paimon.io.CompactIncrement; -import org.apache.paimon.io.NewFilesIncrement; +import org.apache.paimon.io.DataIncrement; /** Changes to commit. */ public class CommitIncrement { - private final NewFilesIncrement newFilesIncrement; + private final DataIncrement dataIncrement; private final CompactIncrement compactIncrement; - public CommitIncrement(NewFilesIncrement newFilesIncrement, CompactIncrement compactIncrement) { - this.newFilesIncrement = newFilesIncrement; + public CommitIncrement(DataIncrement dataIncrement, CompactIncrement compactIncrement) { + this.dataIncrement = dataIncrement; this.compactIncrement = compactIncrement; } - public NewFilesIncrement newFilesIncrement() { - return newFilesIncrement; + public DataIncrement newFilesIncrement() { + return dataIncrement; } public CompactIncrement compactIncrement() { @@ -42,6 +42,6 @@ public CompactIncrement compactIncrement() { @Override public String toString() { - return newFilesIncrement.toString() + "\n" + compactIncrement; + return dataIncrement.toString() + "\n" + compactIncrement; } } diff --git a/paimon-core/src/test/java/org/apache/paimon/index/HashBucketAssignerTest.java b/paimon-core/src/test/java/org/apache/paimon/index/HashBucketAssignerTest.java index 0ed83d3e0200..1b4a7b1be5d4 100644 --- a/paimon-core/src/test/java/org/apache/paimon/index/HashBucketAssignerTest.java +++ b/paimon-core/src/test/java/org/apache/paimon/index/HashBucketAssignerTest.java @@ -21,8 +21,8 @@ import org.apache.paimon.catalog.PrimaryKeyTableTestBase; import org.apache.paimon.data.BinaryRow; import org.apache.paimon.io.CompactIncrement; +import org.apache.paimon.io.DataIncrement; import org.apache.paimon.io.IndexIncrement; -import org.apache.paimon.io.NewFilesIncrement; import org.apache.paimon.table.sink.CommitMessage; import org.apache.paimon.table.sink.CommitMessageImpl; import org.apache.paimon.table.sink.StreamTableCommit; @@ -111,7 +111,7 @@ private CommitMessage createCommitMessage(BinaryRow partition, int bucket, Index return new CommitMessageImpl( partition, bucket, - new NewFilesIncrement( + new DataIncrement( Collections.emptyList(), Collections.emptyList(), Collections.emptyList()), new CompactIncrement( Collections.emptyList(), Collections.emptyList(), Collections.emptyList()), diff --git a/paimon-core/src/test/java/org/apache/paimon/manifest/ManifestCommittableSerializerTest.java b/paimon-core/src/test/java/org/apache/paimon/manifest/ManifestCommittableSerializerTest.java index ae01b58323e7..ad5fe2f800fd 100644 --- a/paimon-core/src/test/java/org/apache/paimon/manifest/ManifestCommittableSerializerTest.java +++ b/paimon-core/src/test/java/org/apache/paimon/manifest/ManifestCommittableSerializerTest.java @@ -21,7 +21,7 @@ import org.apache.paimon.data.BinaryRow; import org.apache.paimon.io.CompactIncrement; import org.apache.paimon.io.DataFileMeta; -import org.apache.paimon.io.NewFilesIncrement; +import org.apache.paimon.io.DataIncrement; import org.apache.paimon.table.sink.CommitMessage; import org.apache.paimon.table.sink.CommitMessageImpl; @@ -73,10 +73,10 @@ private static void addFileCommittables( List commitMessages = new ArrayList<>(); int length = ThreadLocalRandom.current().nextInt(10) + 1; for (int i = 0; i < length; i++) { - NewFilesIncrement newFilesIncrement = randomNewFilesIncrement(); + DataIncrement dataIncrement = randomNewFilesIncrement(); CompactIncrement compactIncrement = randomCompactIncrement(); CommitMessage commitMessage = - new CommitMessageImpl(partition, bucket, newFilesIncrement, compactIncrement); + new CommitMessageImpl(partition, bucket, dataIncrement, compactIncrement); commitMessages.add(commitMessage); committable.addFileCommittable(commitMessage); } @@ -88,8 +88,8 @@ private static void addFileCommittables( } } - public static NewFilesIncrement randomNewFilesIncrement() { - return new NewFilesIncrement( + public static DataIncrement randomNewFilesIncrement() { + return new DataIncrement( Arrays.asList(newFile(ID.incrementAndGet(), 0), newFile(ID.incrementAndGet(), 0)), Arrays.asList(newFile(ID.incrementAndGet(), 0), newFile(ID.incrementAndGet(), 0)), Arrays.asList(newFile(ID.incrementAndGet(), 0), newFile(ID.incrementAndGet(), 0))); diff --git a/paimon-core/src/test/java/org/apache/paimon/table/sink/CommitMessageSerializerTest.java b/paimon-core/src/test/java/org/apache/paimon/table/sink/CommitMessageSerializerTest.java index a6cf04b0e40d..190027d361d3 100644 --- a/paimon-core/src/test/java/org/apache/paimon/table/sink/CommitMessageSerializerTest.java +++ b/paimon-core/src/test/java/org/apache/paimon/table/sink/CommitMessageSerializerTest.java @@ -19,8 +19,8 @@ package org.apache.paimon.table.sink; import org.apache.paimon.io.CompactIncrement; +import org.apache.paimon.io.DataIncrement; import org.apache.paimon.io.IndexIncrement; -import org.apache.paimon.io.NewFilesIncrement; import org.junit.jupiter.api.Test; @@ -39,13 +39,12 @@ public class CommitMessageSerializerTest { @Test public void test() throws IOException { CommitMessageSerializer serializer = new CommitMessageSerializer(); - NewFilesIncrement newFilesIncrement = randomNewFilesIncrement(); + DataIncrement dataIncrement = randomNewFilesIncrement(); CompactIncrement compactIncrement = randomCompactIncrement(); IndexIncrement indexIncrement = new IndexIncrement(Arrays.asList(randomIndexFile(), randomIndexFile())); CommitMessageImpl committable = - new CommitMessageImpl( - row(0), 1, newFilesIncrement, compactIncrement, indexIncrement); + new CommitMessageImpl(row(0), 1, dataIncrement, compactIncrement, indexIncrement); CommitMessageImpl newCommittable = (CommitMessageImpl) serializer.deserialize(2, serializer.serialize(committable)); assertThat(newCommittable.compactIncrement()).isEqualTo(committable.compactIncrement()); diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/CommittableSerializerTest.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/CommittableSerializerTest.java index b5b18043c602..47f9ce570ebe 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/CommittableSerializerTest.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/CommittableSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.paimon.flink.sink; import org.apache.paimon.io.CompactIncrement; -import org.apache.paimon.io.NewFilesIncrement; +import org.apache.paimon.io.DataIncrement; import org.apache.paimon.table.sink.CommitMessage; import org.apache.paimon.table.sink.CommitMessageImpl; import org.apache.paimon.table.sink.CommitMessageSerializer; @@ -42,10 +42,10 @@ public class CommittableSerializerTest { @Test public void testFile() throws IOException { - NewFilesIncrement newFilesIncrement = randomNewFilesIncrement(); + DataIncrement dataIncrement = randomNewFilesIncrement(); CompactIncrement compactIncrement = randomCompactIncrement(); CommitMessage committable = - new CommitMessageImpl(row(0), 1, newFilesIncrement, compactIncrement); + new CommitMessageImpl(row(0), 1, dataIncrement, compactIncrement); CommitMessage newCommittable = (CommitMessage) serializer diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/CommitterOperatorTest.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/CommitterOperatorTest.java index 26a7717325a3..6cbb151e777d 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/CommitterOperatorTest.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/CommitterOperatorTest.java @@ -26,7 +26,7 @@ import org.apache.paimon.flink.utils.TestingMetricUtils; import org.apache.paimon.fs.local.LocalFileIO; import org.apache.paimon.io.CompactIncrement; -import org.apache.paimon.io.NewFilesIncrement; +import org.apache.paimon.io.DataIncrement; import org.apache.paimon.manifest.ManifestCommittable; import org.apache.paimon.manifest.ManifestCommittableSerializer; import org.apache.paimon.table.FileStoreTable; @@ -301,7 +301,7 @@ public void testCommitInputEnd() throws Exception { new CommitMessageImpl( BinaryRow.EMPTY_ROW, 0, - new NewFilesIncrement( + new DataIncrement( Collections.emptyList(), Collections.emptyList(), Collections.emptyList()), @@ -318,7 +318,7 @@ public void testCommitInputEnd() throws Exception { new CommitMessageImpl( BinaryRow.EMPTY_ROW, 0, - new NewFilesIncrement( + new DataIncrement( Collections.emptyList(), Collections.emptyList(), Collections.emptyList()), @@ -334,7 +334,7 @@ public void testCommitInputEnd() throws Exception { new CommitMessageImpl( BinaryRow.EMPTY_ROW, 0, - new NewFilesIncrement( + new DataIncrement( Collections.emptyList(), Collections.emptyList(), Collections.emptyList()), @@ -369,7 +369,7 @@ public void testCommitInputEnd() throws Exception { new CommitMessageImpl( BinaryRow.EMPTY_ROW, 0, - new NewFilesIncrement( + new DataIncrement( Collections.emptyList(), Collections.emptyList(), Collections.emptyList()), @@ -386,7 +386,7 @@ public void testCommitInputEnd() throws Exception { new CommitMessageImpl( BinaryRow.EMPTY_ROW, 0, - new NewFilesIncrement( + new DataIncrement( Collections.emptyList(), Collections.emptyList(), Collections.emptyList()), @@ -402,7 +402,7 @@ public void testCommitInputEnd() throws Exception { new CommitMessageImpl( BinaryRow.EMPTY_ROW, 0, - new NewFilesIncrement( + new DataIncrement( Collections.emptyList(), Collections.emptyList(), Collections.emptyList()), diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/MultiTableCommittableSerializerTest.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/MultiTableCommittableSerializerTest.java index 37fcd465a547..2fa8768fcda4 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/MultiTableCommittableSerializerTest.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/MultiTableCommittableSerializerTest.java @@ -20,7 +20,7 @@ import org.apache.paimon.catalog.Identifier; import org.apache.paimon.io.CompactIncrement; -import org.apache.paimon.io.NewFilesIncrement; +import org.apache.paimon.io.DataIncrement; import org.apache.paimon.table.sink.CommitMessage; import org.apache.paimon.table.sink.CommitMessageImpl; import org.apache.paimon.table.sink.CommitMessageSerializer; @@ -42,10 +42,10 @@ class MultiTableCommittableSerializerTest { @Test public void testFileMetadata() throws IOException { - NewFilesIncrement newFilesIncrement = randomNewFilesIncrement(); + DataIncrement dataIncrement = randomNewFilesIncrement(); CompactIncrement compactIncrement = randomCompactIncrement(); CommitMessage commitMessage = - new CommitMessageImpl(row(0), 1, newFilesIncrement, compactIncrement); + new CommitMessageImpl(row(0), 1, dataIncrement, compactIncrement); Committable committable = new Committable(9, Committable.Kind.FILE, commitMessage); String database = "database"; String table = "table"; diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/WrappedManifestCommittableSerializerTest.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/WrappedManifestCommittableSerializerTest.java index 7c63dc56c585..298f3155ba34 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/WrappedManifestCommittableSerializerTest.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/sink/WrappedManifestCommittableSerializerTest.java @@ -21,7 +21,7 @@ import org.apache.paimon.catalog.Identifier; import org.apache.paimon.data.BinaryRow; import org.apache.paimon.io.CompactIncrement; -import org.apache.paimon.io.NewFilesIncrement; +import org.apache.paimon.io.DataIncrement; import org.apache.paimon.manifest.ManifestCommittable; import org.apache.paimon.manifest.WrappedManifestCommittable; import org.apache.paimon.table.sink.CommitMessage; @@ -88,10 +88,10 @@ public static void addFileCommittables( List commitMessages = new ArrayList<>(); int length = ThreadLocalRandom.current().nextInt(10) + 1; for (int i = 0; i < length; i++) { - NewFilesIncrement newFilesIncrement = randomNewFilesIncrement(); + DataIncrement dataIncrement = randomNewFilesIncrement(); CompactIncrement compactIncrement = randomCompactIncrement(); CommitMessage commitMessage = - new CommitMessageImpl(partition, bucket, newFilesIncrement, compactIncrement); + new CommitMessageImpl(partition, bucket, dataIncrement, compactIncrement); commitMessages.add(commitMessage); committable.addFileCommittable(commitMessage); }