Skip to content

fix(bigtable): avoid mutating Query in-place in createPointReadCallable #14797

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 2 commits into from
Oct 28, 2026
+17 −2
Merged

fix(bigtable): avoid mutating Query in-place in createPointReadCallable #14797

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
8fb2149
fix(bigtable): avoid mutating Query in-place in createPointReadCallable
igorbernstein2 Oct 27, 2026
ab5bb19
test(bigtable): update expected ReadRowsRequest in testCreateReadRows…
igorbernstein2 Oct 27, 2026
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 ...d-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ private <RowT> UnaryCallable<Query, RowT> createPointReadCallable(
ServerStreamingCallable<Query, RowT> readRowCallable =
new TransformingServerStreamingCallable<>(
readRowsCallable,
(query) -> query.limit(1).toProto(requestContext),
(query) -> query.toProto(requestContext).toBuilder().setRowsLimit(1).build(),
Functions.identity());

BigtableUnaryOperationCallable<Query, RowT> classic =
Expand Down
17 changes: 16 additions & 1 deletion ...gtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,9 @@ public void testCreateReadRowsCallable() throws InterruptedException {
Query request = Query.create(TableId.of("table-id")).rowKey("row-key");
streamingCallable.call(request).iterator().next();
ReadRowsRequest expected =
request.toProto(RequestContext.create(PROJECT_ID, INSTANCE_ID, APP_PROFILE_ID));
request.toProto(RequestContext.create(PROJECT_ID, INSTANCE_ID, APP_PROFILE_ID)).toBuilder()
.setRowsLimit(1)
.build();
assertThat(fakeDataService.popLastRequest()).isEqualTo(expected);
}

Expand Down Expand Up @@ -981,6 +983,19 @@ public void testExecuteQueryWaitTimeoutWorksWithMetadataFuture() throws IOExcept
}
}

@Test
public void testReadRowDoesNotMutateQuery() throws Exception {
Query query = Query.create(TABLE_ID).rowKey("row-key");
enhancedBigtableStub.readRowCallable().call(query);
assertThat(fakeDataService.popLastRequest().getRowsLimit()).isEqualTo(1L);
assertThat(query).isEqualTo(Query.create(TABLE_ID).rowKey("row-key"));

// Reusing the query for a multi-row scan should not inherit rows_limit = 1
query.rowKey("row-key-2");
enhancedBigtableStub.readRowsCallable().all().call(query);
assertThat(fakeDataService.popLastRequest().getRowsLimit()).isEqualTo(0L);
}

private static class MetadataInterceptor implements ServerInterceptor {
final BlockingQueue<Metadata> headers = Queues.newLinkedBlockingDeque();

Expand Down
Loading