[hotfix] Minor refactor for datafile filter in KeyValueFileStoreScan

hang8929201 · Nov 7, 2024 · b2e4fe5 · b2e4fe5
1 parent 5841756
commit b2e4fe5
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/paimon-core/src/main/java/org/apache/paimon/operation/KeyValueFileStoreScan.java b/paimon-core/src/main/java/org/apache/paimon/operation/KeyValueFileStoreScan.java
@@ -62,8 +62,7 @@ public class KeyValueFileStoreScan extends AbstractFileStoreScan {
     private final ChangelogProducer changelogProducer;
 
     private final boolean fileIndexReadEnabled;
-    // just cache.
-    private final Map<Long, Predicate> dataFilterMapping = new HashMap<>();
+    private final Map<Long, Predicate> schemaId2DataFilter = new HashMap<>();
 
     public KeyValueFileStoreScan(
             ManifestsReader manifestsReader,
@@ -137,19 +136,17 @@ private boolean filterByFileIndex(@Nullable byte[] embeddedIndexBytes, ManifestE
         }
 
         RowType dataRowType = scanTableSchema(entry.file().schemaId()).logicalRowType();
-
-        Predicate dataPredicate =
-                dataFilterMapping.computeIfAbsent(
-                        entry.file().schemaId(),
-                        id ->
-                                fieldValueStatsConverters.convertFilter(
-                                        entry.file().schemaId(), valueFilter));
-
         try (FileIndexPredicate predicate =
                 new FileIndexPredicate(embeddedIndexBytes, dataRowType)) {
+            Predicate dataPredicate =
+                    schemaId2DataFilter.computeIfAbsent(
+                            entry.file().schemaId(),
+                            id ->
+                                    fieldValueStatsConverters.convertFilter(
+                                            entry.file().schemaId(), valueFilter));
             return predicate.testPredicate(dataPredicate);
         } catch (IOException e) {
-            throw new RuntimeException("Exception happens while checking predicate.", e);
+            throw new RuntimeException("Exception happens while checking fileIndex predicate.", e);
         }
     }