[incubator-paimon] branch master updated: [hotfix] Fix merge conflits

[lzljs3620320]

This is an automated email from the ASF dual-hosted git repository.

lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-paimon.git


The following commit(s) were added to refs/heads/master by this push:
     new fb4a52ba2 [hotfix] Fix merge conflits
fb4a52ba2 is described below

commit fb4a52ba25511aa0df80a0c19e96810775cb2dc1
Author: JingsongLi <lzljs3620...@aliyun.com>
AuthorDate: Tue Jun 27 15:29:00 2023 +0800

    [hotfix] Fix merge conflits
---
 .../paimon/table/source/snapshot/IncrementalStartingScanner.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/paimon-core/src/main/java/org/apache/paimon/table/source/snapshot/IncrementalStartingScanner.java
 
b/paimon-core/src/main/java/org/apache/paimon/table/source/snapshot/IncrementalStartingScanner.java
index b1fc7ffba..74972f2ab 100644
--- 
a/paimon-core/src/main/java/org/apache/paimon/table/source/snapshot/IncrementalStartingScanner.java
+++ 
b/paimon-core/src/main/java/org/apache/paimon/table/source/snapshot/IncrementalStartingScanner.java
@@ -60,7 +60,8 @@ public class IncrementalStartingScanner implements 
StartingScanner {
         for (Map.Entry<Pair<BinaryRow, Integer>, List<DataFileMeta>> entry : 
grouped.entrySet()) {
             BinaryRow partition = entry.getKey().getLeft();
             int bucket = entry.getKey().getRight();
-            for (List<DataFileMeta> files : 
reader.splitGenerator().split(entry.getValue())) {
+            for (List<DataFileMeta> files :
+                    reader.splitGenerator().splitForBatch(entry.getValue())) {
                 result.add(new DataSplit(end, partition, bucket, files, 
false));
             }
         }