diff --git a/paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnarRowIterator.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnarRowIterator.java index 0187b63c7c2c..f5b08c1f872e 100644 --- a/paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnarRowIterator.java +++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnarRowIterator.java @@ -46,6 +46,10 @@ public class ColumnarRowIterator extends RecyclableIterator private final boolean vectorizedAndCompactly; + public ColumnarRowIterator(Path filePath, ColumnarRow row, @Nullable Runnable recycler) { + this(filePath, row, recycler, true); + } + public ColumnarRowIterator( Path filePath, ColumnarRow row, diff --git a/paimon-common/src/main/java/org/apache/paimon/utils/IteratorResultIterator.java b/paimon-common/src/main/java/org/apache/paimon/utils/IteratorResultIterator.java index 71475fb291a8..51a5107c095c 100644 --- a/paimon-common/src/main/java/org/apache/paimon/utils/IteratorResultIterator.java +++ b/paimon-common/src/main/java/org/apache/paimon/utils/IteratorResultIterator.java @@ -35,19 +35,15 @@ public final class IteratorResultIterator extends RecyclableIterator records, final @Nullable Runnable recycler, final Path filePath, - long pos, - boolean vectorizedAndCompactly) { + long pos) { super(recycler); this.records = records; this.filePath = filePath; this.nextFilePos = pos; - this.vectorizedAndCompactly = vectorizedAndCompactly; } @Nullable @@ -73,6 +69,6 @@ public Path filePath() { @Override public boolean vectorizedAndCompactly() { - return vectorizedAndCompactly; + return false; } } diff --git a/paimon-format/src/main/java/org/apache/paimon/format/avro/AvroBulkFormat.java b/paimon-format/src/main/java/org/apache/paimon/format/avro/AvroBulkFormat.java index a48a30a953b0..a06ca9948c44 100644 --- a/paimon-format/src/main/java/org/apache/paimon/format/avro/AvroBulkFormat.java +++ b/paimon-format/src/main/java/org/apache/paimon/format/avro/AvroBulkFormat.java @@ -110,7 +110,7 @@ public IteratorResultIterator readBatch() throws IOException { IteratorWithException iterator = new AvroBlockIterator(reader.getBlockCount(), reader); return new IteratorResultIterator( - iterator, () -> pool.recycler().recycle(ticket), filePath, rowPosition, false); + iterator, () -> pool.recycler().recycle(ticket), filePath, rowPosition); } private boolean readNextBlock() throws IOException { diff --git a/paimon-format/src/main/java/org/apache/paimon/format/orc/OrcReaderFactory.java b/paimon-format/src/main/java/org/apache/paimon/format/orc/OrcReaderFactory.java index effe813882ac..db17357bfd70 100644 --- a/paimon-format/src/main/java/org/apache/paimon/format/orc/OrcReaderFactory.java +++ b/paimon-format/src/main/java/org/apache/paimon/format/orc/OrcReaderFactory.java @@ -170,7 +170,7 @@ protected OrcReaderBatch( this.paimonColumnBatch = paimonColumnBatch; this.result = new ColumnarRowIterator( - filePath, new ColumnarRow(paimonColumnBatch), this::recycle, true); + filePath, new ColumnarRow(paimonColumnBatch), this::recycle); } /**