Skip to content

Fix bug in PaginationController #578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 31, 2025
Merged

Fix bug in PaginationController #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
605542e
fix bug in PaginationController
shuwenwei Aug 29, 2025
d18ea93
rename methods
shuwenwei Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion java/tsfile/src/main/java/org/apache/tsfile/read/reader/page/AbstractAlignedPageReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ public boolean isModified() {

@Override
public void initTsBlockBuilder(List<TSDataType> dataTypes) {
if (paginationController.hasLimit()) {
if (paginationController.hasSetLimit()) {
builder =
new TsBlockBuilder(
(int)
Expand Down
2 changes: 1 addition & 1 deletion java/tsfile/src/main/java/org/apache/tsfile/read/reader/page/PageReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ public TsBlock getAllSatisfiedData() throws IOException {
uncompressDataIfNecessary();
TsBlockBuilder builder;
int initialExpectedEntries = (int) pageHeader.getStatistics().getCount();
if (paginationController.hasLimit()) {
if (paginationController.hasSetLimit()) {
initialExpectedEntries =
(int) Math.min(initialExpectedEntries, paginationController.getCurLimit());
}
Expand Down
8 changes: 5 additions & 3 deletions java/tsfile/src/main/java/org/apache/tsfile/read/reader/series/PaginationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ public void consumeLimit(long rowCount) {
}
}

public boolean hasLimit() {
return hasLimit && curLimit > 0;
public boolean hasSetLimit() {
return hasLimit;
}

public TsBlock applyTsBlock(TsBlock resultTsBlock) {
Expand All @@ -92,7 +92,9 @@ public TsBlock applyTsBlock(TsBlock resultTsBlock) {
length -= fromIndex;
consumeOffset(fromIndex);
}
if (hasLimit && curLimit > 0) {
if (hasSetLimit()) {
// When hasLimit is true and methods are called correctly, curLimit must be greater than or
// equal to 0.
length = (int) Math.min(curLimit, length);
consumeLimit(length);
}
Expand Down
Loading