Skip to content

fix(bigtable): respect query limit smaller than pageSize and avoid mutating Query in QueryPaginator #14821

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
igorbernstein2 merged 1 commit into from
Oct 28, 2026
Merged

fix(bigtable): respect query limit smaller than pageSize and avoid mutating Query in QueryPaginator #14821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion ...e/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Query.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,9 +421,12 @@ public static class QueryPaginator {
QueryPaginator(@Nonnull Query query, int pageSize) {
this.hasOverallLimit = query.builder.getRowsLimit() > 0;
this.remainingRows = query.builder.getRowsLimit();
this.query = query.limit(pageSize);
this.query = query.clone();
if (hasOverallLimit) {
this.query.limit(Math.min(pageSize, remainingRows));
remainingRows -= pageSize;
} else {
this.query.limit(pageSize);
}
Comment thread
igorbernstein2 marked this conversation as resolved.
Resolved
this.pageSize = pageSize;
this.prevSplitPoint = ByteString.EMPTY;
Expand Down
27 changes: 27 additions & 0 deletions ...ogle-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/QueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,7 @@ public void testQueryPaginatorRangeLimitReached() {
// Table query test.
int chunkSize = 10, limit = 15;
Query query = Query.create(TABLE_ID).range("a", "z").limit(limit);
Query originalCopy = query.clone();
Query.QueryPaginator paginator = query.createPaginator(chunkSize);

Query nextQuery = paginator.getNextQuery();
Expand Down Expand Up @@ -667,6 +668,7 @@ public void testQueryPaginatorRangeLimitReached() {
assertThat(nextQuery.toProto(requestContext)).isEqualTo(expectedProto.build());

assertThat(paginator.advance(ByteString.copyFromUtf8("d"))).isFalse();
assertThat(query).isEqualTo(originalCopy);

// AuthorizedView query test.
query = Query.create(AUTHORIZED_VIEW_ID).range("a", "z").limit(limit);
Expand Down Expand Up @@ -967,6 +969,31 @@ public void testQueryPaginatorEmptyTable() {
assertThat(queryPaginator.advance(ByteString.EMPTY)).isFalse();
}

@Test
public void testQueryPaginatorLimitSmallerThanChunkSize() {
int chunkSize = 100, limit = 5;
Query query = Query.create(TABLE_ID).range("a", "z").limit(limit);
Query originalCopy = query.clone();

Query.QueryPaginator paginator = query.createPaginator(chunkSize);
Query nextQuery = paginator.getNextQuery();

ReadRowsRequest expectedProto =
expectedReadFromTableProtoBuilder()
.setRows(
RowSet.newBuilder()
.addRowRanges(
RowRange.newBuilder()
.setStartKeyClosed(ByteString.copyFromUtf8("a"))
.setEndKeyOpen(ByteString.copyFromUtf8("z"))
.build()))
.setRowsLimit(limit)
.build();
assertThat(nextQuery.toProto(requestContext)).isEqualTo(expectedProto);
assertThat(paginator.advance(ByteString.copyFromUtf8("c"))).isFalse();
assertThat(query).isEqualTo(originalCopy);
}

@Test
public void testQueryReversed() {
Query query = Query.create(TABLE_ID).reversed(true);
Expand Down
Loading