fix

Author: JingsongLi

paimon-core/src/main/java/org/apache/paimon/deletionvectors/append/BaseAppendDeleteFileMaintainer.java

@@ -22,18 +22,22 @@
 import org.apache.paimon.data.BinaryRow;
 import org.apache.paimon.deletionvectors.BucketedDvMaintainer;
 import org.apache.paimon.deletionvectors.DeletionVector;
+import org.apache.paimon.index.DeletionVectorMeta;
 import org.apache.paimon.index.IndexFileHandler;
 import org.apache.paimon.index.IndexFileMeta;
 import org.apache.paimon.manifest.IndexManifestEntry;
 import org.apache.paimon.table.source.DeletionFile;
 
 import javax.annotation.Nullable;
 
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
 import static org.apache.paimon.deletionvectors.DeletionVectorsIndexFile.DELETION_VECTORS_INDEX;
+import static org.apache.paimon.utils.Preconditions.checkNotNull;
 
 /**
  * A maintainer to maintain deletion files for append table, the core methods:
@@ -74,7 +78,21 @@ static AppendDeleteFileMaintainer forUnawareAppend(
                 indexFileHandler.scan(snapshot, DELETION_VECTORS_INDEX).stream()
                         .filter(e -> e.partition().equals(partition))
                         .collect(Collectors.toList());
-        Map<String, DeletionFile> deletionFiles = indexFileHandler.scanDVIndex(manifestEntries);
+        Map<String, DeletionFile> deletionFiles = new HashMap<>();
+        for (IndexManifestEntry file : manifestEntries) {
+            IndexFileMeta meta = file.indexFile();
+            LinkedHashMap<String, DeletionVectorMeta> dvMetas = meta.deletionVectorMetas();
+            checkNotNull(dvMetas);
+            for (DeletionVectorMeta dvMeta : dvMetas.values()) {
+                deletionFiles.put(
+                        dvMeta.dataFileName(),
+                        new DeletionFile(
+                                indexFileHandler.filePath(meta).toString(),
+                                dvMeta.offset(),
+                                dvMeta.length(),
+                                dvMeta.cardinality()));
+            }
+        }
         return new AppendDeleteFileMaintainer(
                 indexFileHandler.deletionVectorsIndex(), partition, manifestEntries, deletionFiles);
     }

paimon-core/src/main/java/org/apache/paimon/index/IndexFileHandler.java

@@ -25,20 +25,16 @@
 import org.apache.paimon.fs.Path;
 import org.apache.paimon.manifest.IndexManifestEntry;
 import org.apache.paimon.manifest.IndexManifestFile;
-import org.apache.paimon.table.source.DeletionFile;
 import org.apache.paimon.utils.IntIterator;
 import org.apache.paimon.utils.Pair;
 import org.apache.paimon.utils.PathFactory;
 import org.apache.paimon.utils.SnapshotManager;
 
-import javax.annotation.Nullable;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -47,7 +43,6 @@
 import static org.apache.paimon.deletionvectors.DeletionVectorsIndexFile.DELETION_VECTORS_INDEX;
 import static org.apache.paimon.index.HashIndexFile.HASH_INDEX;
 import static org.apache.paimon.utils.Preconditions.checkArgument;
-import static org.apache.paimon.utils.Preconditions.checkNotNull;
 
 /** Handle index files. */
 public class IndexFileHandler {
@@ -85,46 +80,6 @@ public Optional<IndexFileMeta> scanHashIndex(
         return result.isEmpty() ? Optional.empty() : Optional.of(result.get(0));
     }
 
-    public Map<String, DeletionFile> scanDVIndex(
-            @Nullable Snapshot snapshot, BinaryRow partition, int bucket) {
-        if (snapshot == null) {
-            return Collections.emptyMap();
-        }
-        String indexManifest = snapshot.indexManifest();
-        if (indexManifest == null) {
-            return Collections.emptyMap();
-        }
-        List<IndexManifestEntry> manifests = new ArrayList<>();
-        for (IndexManifestEntry file : indexManifestFile.read(indexManifest)) {
-            IndexFileMeta meta = file.indexFile();
-            if (meta.indexType().equals(DELETION_VECTORS_INDEX)
-                    && file.partition().equals(partition)
-                    && file.bucket() == bucket) {
-                manifests.add(file);
-            }
-        }
-        return scanDVIndex(manifests);
-    }
-
-    public Map<String, DeletionFile> scanDVIndex(List<IndexManifestEntry> manifests) {
-        Map<String, DeletionFile> result = new HashMap<>();
-        for (IndexManifestEntry file : manifests) {
-            IndexFileMeta meta = file.indexFile();
-            LinkedHashMap<String, DeletionVectorMeta> dvMetas = meta.deletionVectorMetas();
-            checkNotNull(dvMetas);
-            for (DeletionVectorMeta dvMeta : dvMetas.values()) {
-                result.put(
-                        dvMeta.dataFileName(),
-                        new DeletionFile(
-                                filePath(meta).toString(),
-                                dvMeta.offset(),
-                                dvMeta.length(),
-                                dvMeta.cardinality()));
-            }
-        }
-        return result;
-    }
-
     public List<IndexManifestEntry> scan(String indexType) {
         return scan(snapshotManager.latestSnapshot(), indexType);
     }