From e6fd09eb9f2a8c9636f261454e3596cbe6b0cb1f Mon Sep 17 00:00:00 2001
From: Jingsong <jingsonglee0@gmail.com>
Date: Mon, 11 Mar 2024 17:10:09 +0800
Subject: [PATCH] fix

---
 .../operation/KeyValueFileStoreRead.java      | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/paimon-core/src/main/java/org/apache/paimon/operation/KeyValueFileStoreRead.java b/paimon-core/src/main/java/org/apache/paimon/operation/KeyValueFileStoreRead.java
index c959c293114d2..2fadaa1e0afa0 100644
--- a/paimon-core/src/main/java/org/apache/paimon/operation/KeyValueFileStoreRead.java
+++ b/paimon-core/src/main/java/org/apache/paimon/operation/KeyValueFileStoreRead.java
@@ -78,9 +78,9 @@ public class KeyValueFileStoreRead implements FileStoreRead<KeyValue> {
 
     @Nullable private int[][] keyProjectedFields;
 
-    @Nullable private List<Predicate> filtersForMerge;
+    @Nullable private List<Predicate> filtersForKeys;
 
-    @Nullable private List<Predicate> filtersForNonMerge;
+    @Nullable private List<Predicate> filtersForAll;
 
     @Nullable private int[][] pushdownProjection;
     @Nullable private int[][] outerProjection;
@@ -164,8 +164,8 @@ public FileStoreRead<KeyValue> withFilter(Predicate predicate) {
         // So for sections with overlapping runs, we only push down key filters.
         // For sections with only one run, as each key only appears once, it is OK to push down
         // value filters.
-        filtersForNonMerge = allFilters;
-        filtersForMerge = pkFilters;
+        filtersForAll = allFilters;
+        filtersForKeys = pkFilters;
         return this;
     }
 
@@ -191,7 +191,8 @@ private RecordReader<KeyValue> createReaderWithoutOuterProjection(DataSplit spli
                                                 split.partition(),
                                                 split.bucket(),
                                                 split.beforeFiles(),
-                                                split.beforeDeletionFiles().orElse(null)));
+                                                split.beforeDeletionFiles().orElse(null),
+                                                split.isStreaming()));
             } else {
                 beforeSupplier =
                         () ->
@@ -211,7 +212,8 @@ private RecordReader<KeyValue> createReaderWithoutOuterProjection(DataSplit spli
                                     split.partition(),
                                     split.bucket(),
                                     split.dataFiles(),
-                                    split.deletionFiles().orElse(null));
+                                    split.deletionFiles().orElse(null),
+                                    split.isStreaming());
         } else {
             dataSupplier =
                     () ->
@@ -245,9 +247,9 @@ private RecordReader<KeyValue> mergeRead(
         // Sections are read by SortMergeReader, which sorts and merges records by keys.
         // So we cannot project keys or else the sorting will be incorrect.
         KeyValueFileReaderFactory overlappedSectionFactory =
-                readerFactoryBuilder.build(partition, bucket, false, filtersForMerge);
+                readerFactoryBuilder.build(partition, bucket, false, filtersForKeys);
         KeyValueFileReaderFactory nonOverlappedSectionFactory =
-                readerFactoryBuilder.build(partition, bucket, false, filtersForNonMerge);
+                readerFactoryBuilder.build(partition, bucket, false, filtersForAll);
 
         List<ReaderSupplier<KeyValue>> sectionReaders = new ArrayList<>();
         MergeFunctionWrapper<KeyValue> mergeFuncWrapper =
@@ -279,10 +281,12 @@ private RecordReader<KeyValue> noMergeRead(
             BinaryRow partition,
             int bucket,
             List<DataFileMeta> files,
-            @Nullable List<DeletionFile> deletionFiles)
+            @Nullable List<DeletionFile> deletionFiles,
+            boolean onlyFilterKey)
             throws IOException {
         KeyValueFileReaderFactory readerFactory =
-                readerFactoryBuilder.build(partition, bucket, true, filtersForNonMerge);
+                readerFactoryBuilder.build(
+                        partition, bucket, true, onlyFilterKey ? filtersForKeys : filtersForAll);
         List<ReaderSupplier<KeyValue>> suppliers = new ArrayList<>();
         for (int i = 0; i < files.size(); i++) {
             DataFileMeta file = files.get(i);