change the version judge

apache · Dec 22, 2024 · 4f1993f · 4f1993f
1 parent 1c74139
commit 4f1993f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
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
@@ -370,18 +370,10 @@ public String fileFormat() {
     }
 
     @Nullable
-    public String getDataRootLocationString() {
+    public String getExternalPath() {
         return externalPath;
     }
 
-    @Nullable
-    public Path getExternalPath() {
-        if (externalPath == null) {
-            return null;
-        }
-        return new Path(externalPath);
-    }
-
     public Optional<FileSource> fileSource() {
         return Optional.ofNullable(fileSource);
     }
@@ -568,7 +560,7 @@ public String toString() {
                         + "minKey: %s, maxKey: %s, keyStats: %s, valueStats: %s, "
                         + "minSequenceNumber: %d, maxSequenceNumber: %d, "
                         + "schemaId: %d, level: %d, extraFiles: %s, creationTime: %s, "
-                        + "deleteRowCount: %d, fileSource: %s, valueStatsCols: %s, dataRootLocation: %s}",
+                        + "deleteRowCount: %d, fileSource: %s, valueStatsCols: %s, externalPath: %s}",
                 fileName,
                 fileSize,
                 rowCount,

diff --git a/paimon-core/src/main/java/org/apache/paimon/io/DataFileMetaSerializer.java b/paimon-core/src/main/java/org/apache/paimon/io/DataFileMetaSerializer.java
@@ -59,7 +59,7 @@ public InternalRow toRow(DataFileMeta meta) {
                 meta.embeddedIndex(),
                 meta.fileSource().map(FileSource::toByteValue).orElse(null),
                 toStringArrayData(meta.valueStatsCols()),
-                BinaryString.fromString(meta.getDataRootLocationString()));
+                BinaryString.fromString(meta.getExternalPath()));
     }
 
     @Override

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
@@ -131,9 +131,9 @@ private CommitMessage deserialize(int version, DataInputView view) throws IOExce
 
     private IOExceptionSupplier<List<DataFileMeta>> fileDeserializer(
             int version, DataInputView view) {
-        if (version >= 6) {
+        if (version >= 5) {
             return () -> dataFileSerializer.deserializeList(view);
-        } else if (version >= 4) {
+        } else if (version == 4) {
             if (dataFileMeta10LegacySerializer == null) {
                 dataFileMeta10LegacySerializer = new DataFileMeta10LegacySerializer();
             }

diff --git a/paimon-core/src/main/java/org/apache/paimon/table/source/DataSplit.java b/paimon-core/src/main/java/org/apache/paimon/table/source/DataSplit.java
@@ -363,10 +363,10 @@ private static FunctionWithIOException<DataInputView, DataFileMeta> getFileMetaS
         } else if (version == 2) {
             DataFileMeta09Serializer serializer = new DataFileMeta09Serializer();
             return serializer::deserialize;
-        } else if (version >= 3 && version <= 4) {
+        } else if (version == 3) {
             DataFileMeta10LegacySerializer serializer = new DataFileMeta10LegacySerializer();
             return serializer::deserialize;
-        } else if (version >= 5) {
+        } else if (version >= 4) {
             DataFileMetaSerializer serializer = new DataFileMetaSerializer();
             return serializer::deserialize;
         } else {