[core] Refactory ColumnarRowIterator using LongIterator. #4992
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JingsongLi
reviewed
Jan 24, 2025
| @@ -89,9 +95,11 @@ public Path filePath() { | |||
| } | |||
|
|
|||
| protected ColumnarRowIterator copy(ColumnVector[] vectors) { | |||
| // We should call copy only when the iterator is at the beginning of the file. | |||
| assert nextPos == 0; | |||
JingsongLi
reviewed
Jan 24, 2025
| @@ -77,10 +78,15 @@ public InternalRow next() { | |||
|
|
|||
| @Override | |||
| public long returnedPosition() { | |||
| if (nextPos == 0) { | |||
| return positions[0] - 1; | |||
| for (int i = 0; i < nextPos - callReturnedPositionTimes; i++) { | |||
There was a problem hiding this comment.
Please add tests for this.
JingsongLi
reviewed
Jan 24, 2025
| @@ -52,16 +54,15 @@ public ColumnarRowIterator(Path filePath, ColumnarRow row, @Nullable Runnable re | |||
| } | |||
|
|
|||
| public void reset(long nextFilePos) { | |||
| reset(LongIterator.fromRange(nextFilePos, nextFilePos + positions.length)); | |||
| reset(LongIterator.fromRange(nextFilePos, nextFilePos + row.batch().getNumRows())); | |||
There was a problem hiding this comment.
You can rebase the master
JingsongLi
reviewed
Jan 24, 2025
| @@ -38,9 +37,10 @@ public VectorizedColumnBatch batch() { | |||
|
|
|||
| @Override | |||
| protected VectorizedRowIterator copy(ColumnVector[] vectors) { | |||
| assert nextPos == 0; | |||
JingsongLi
reviewed
Jan 24, 2025
| this.nextPos = 0; | ||
| this.callReturnedPositionTimes = 0; |
JingsongLi
reviewed
Jan 24, 2025
| @@ -42,7 +42,9 @@ public class ColumnarRowIterator extends RecyclableIterator<InternalRow> | |||
|
|
|||
| protected int num; | |||
| protected int nextPos; | |||
There was a problem hiding this comment.
It is OK to rename this to index.
leaves12138
force-pushed
the
fixReturn
branch
from
93ec025 to
365c8ee
Compare
|
Looks good to me! |
JingsongLi
pushed a commit
that referenced
this pull request
Jan 24, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
Using LongIterator instead of long[].
Tests
API and Format
Documentation