feat(bigtable): route point read rows to shim #13542
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| /* | ||
| * Copyright 2026 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.google.cloud.bigtable.data.v2.stub.readrows; | ||
|
|
||
| import com.google.api.core.ApiFuture; | ||
| import com.google.api.core.ApiFutureCallback; | ||
| import com.google.api.core.ApiFutures; | ||
| import com.google.api.core.InternalApi; | ||
| import com.google.api.gax.rpc.ApiCallContext; | ||
| import com.google.api.gax.rpc.ResponseObserver; | ||
| import com.google.api.gax.rpc.ServerStreamingCallable; | ||
| import com.google.api.gax.rpc.StreamController; | ||
| import com.google.api.gax.rpc.UnaryCallable; | ||
| import com.google.cloud.bigtable.data.v2.models.Query; | ||
| import com.google.common.util.concurrent.MoreExecutors; | ||
| import java.util.concurrent.atomic.AtomicBoolean; | ||
| import java.util.concurrent.atomic.AtomicReference; | ||
|
|
||
| /** | ||
| * Routes ReadRows calls whose query identifies a single row through a unary point-read callable, | ||
| * letting them benefit from the same session-shim diversion as {@code ReadRow}. Queries that cannot | ||
| * be reduced to a point read fall through to the classic {@code ReadRows} callable. | ||
| */ | ||
| @InternalApi | ||
| public class MaybePointReadCallable<RowT> extends ServerStreamingCallable<Query, RowT> { | ||
|
mutianf marked this conversation as resolved.
|
||
| private final ServerStreamingCallable<Query, RowT> classic; | ||
| private final UnaryCallable<Query, RowT> pointReader; | ||
|
|
||
| public MaybePointReadCallable( | ||
| ServerStreamingCallable<Query, RowT> classic, UnaryCallable<Query, RowT> pointReader) { | ||
| this.classic = classic; | ||
| this.pointReader = pointReader; | ||
| } | ||
|
|
||
| @Override | ||
| public void call(Query request, ResponseObserver<RowT> responseObserver, ApiCallContext context) { | ||
| if (!request.isSinglePointQuery()) { | ||
| classic.call(request, responseObserver, context); | ||
| return; | ||
| } | ||
|
|
||
| AtomicBoolean cancelled = new AtomicBoolean(); | ||
| AtomicReference<ApiFuture<RowT>> futureRef = new AtomicReference<>(); | ||
|
|
||
| responseObserver.onStart( | ||
| new StreamController() { | ||
| @Override | ||
| public void cancel() { | ||
| cancelled.set(true); | ||
| ApiFuture<RowT> f = futureRef.get(); | ||
| if (f != null) { | ||
| f.cancel(false); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void disableAutoInboundFlowControl() {} | ||
|
|
||
| @Override | ||
| public void request(int count) {} | ||
| }); | ||
|
|
||
| ApiFuture<RowT> future; | ||
| try { | ||
| future = pointReader.futureCall(request, context); | ||
| } catch (Throwable t) { | ||
| if (!cancelled.get()) { | ||
| responseObserver.onError(t); | ||
| } | ||
| return; | ||
| } | ||
| futureRef.set(future); | ||
| if (cancelled.get()) { | ||
| future.cancel(false); | ||
| } | ||
|
|
||
| ApiFutures.addCallback( | ||
| future, | ||
| new ApiFutureCallback<RowT>() { | ||
| @Override | ||
| public void onSuccess(RowT row) { | ||
| if (cancelled.get()) { | ||
| return; | ||
| } | ||
| if (row != null) { | ||
| try { | ||
| responseObserver.onResponse(row); | ||
| } catch (Throwable t) { | ||
| responseObserver.onError(t); | ||
| return; | ||
| } | ||
| } | ||
| responseObserver.onComplete(); | ||
| } | ||
|
|
||
| @Override | ||
| public void onFailure(Throwable t) { | ||
| if (cancelled.get()) { | ||
| return; | ||
| } | ||
| responseObserver.onError(t); | ||
| } | ||
| }, | ||
| MoreExecutors.directExecutor()); | ||
| } | ||
| } | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,7 @@ | |
| import com.google.bigtable.v2.RowFilter; | ||
| import com.google.bigtable.v2.RowRange; | ||
| import com.google.bigtable.v2.RowSet; | ||
| import com.google.bigtable.v2.SessionReadRowRequest; | ||
| import com.google.cloud.bigtable.data.v2.internal.ByteStringComparator; | ||
| import com.google.cloud.bigtable.data.v2.internal.NameUtil; | ||
| import com.google.cloud.bigtable.data.v2.internal.RequestContext; | ||
|
|
@@ -966,4 +967,113 @@ public void testQueryReversed() { | |
| assertThat(query.toProto(requestContext)) | ||
| .isEqualTo(expectedReadFromTableProtoBuilder().setReversed(true).build()); | ||
| } | ||
|
|
||
| @Test | ||
| public void isSinglePointQuery_singleRowKey() { | ||
| assertThat(Query.create(TABLE_ID).rowKey("k").isSinglePointQuery()).isTrue(); | ||
| } | ||
|
|
||
| @Test | ||
| public void isSinglePointQuery_singleClosedRange() { | ||
| assertThat( | ||
| Query.create(TABLE_ID) | ||
| .range(ByteStringRange.unbounded().startClosed("k").endClosed("k")) | ||
| .isSinglePointQuery()) | ||
| .isTrue(); | ||
| } | ||
|
|
||
| @Test | ||
| public void isSinglePointQuery_emptyQuery() { | ||
| assertThat(Query.create(TABLE_ID).isSinglePointQuery()).isFalse(); | ||
| } | ||
|
|
||
| @Test | ||
| public void isSinglePointQuery_multipleRowKeys() { | ||
| assertThat(Query.create(TABLE_ID).rowKey("a").rowKey("b").isSinglePointQuery()).isFalse(); | ||
| } | ||
|
|
||
| @Test | ||
| public void isSinglePointQuery_rowKeyAndRange() { | ||
| assertThat( | ||
| Query.create(TABLE_ID) | ||
| .rowKey("a") | ||
| .range(ByteStringRange.unbounded().startClosed("a").endClosed("a")) | ||
| .isSinglePointQuery()) | ||
| .isFalse(); | ||
| } | ||
|
|
||
| @Test | ||
| public void isSinglePointQuery_multipleRanges() { | ||
| assertThat( | ||
| Query.create(TABLE_ID) | ||
| .range(ByteStringRange.unbounded().startClosed("a").endClosed("a")) | ||
| .range(ByteStringRange.unbounded().startClosed("b").endClosed("b")) | ||
| .isSinglePointQuery()) | ||
| .isFalse(); | ||
| } | ||
|
|
||
| @Test | ||
| public void isSinglePointQuery_closedOpenRange() { | ||
| assertThat( | ||
| Query.create(TABLE_ID) | ||
| .range(ByteStringRange.unbounded().startClosed("k").endOpen("k")) | ||
| .isSinglePointQuery()) | ||
| .isFalse(); | ||
| } | ||
|
|
||
| @Test | ||
| public void isSinglePointQuery_unequalClosedRange() { | ||
| assertThat( | ||
| Query.create(TABLE_ID) | ||
| .range(ByteStringRange.unbounded().startClosed("a").endClosed("b")) | ||
| .isSinglePointQuery()) | ||
| .isFalse(); | ||
| } | ||
|
|
||
| @Test | ||
| public void isSinglePointQuery_prefixRange() { | ||
| assertThat(Query.create(TABLE_ID).prefix("k").isSinglePointQuery()).isFalse(); | ||
| } | ||
|
|
||
| @Test | ||
| public void toSessionPointProto_fromRowKey() { | ||
| Query query = Query.create(TABLE_ID).rowKey("the-key"); | ||
| assertThat(query.toSessionPointProto()) | ||
| .isEqualTo( | ||
| SessionReadRowRequest.newBuilder() | ||
| .setKey(ByteString.copyFromUtf8("the-key")) | ||
| .setFilter(RowFilter.getDefaultInstance()) | ||
| .build()); | ||
| } | ||
|
|
||
| @Test | ||
| public void toSessionPointProto_fromClosedRange() { | ||
| Query query = | ||
| Query.create(TABLE_ID) | ||
| .range(ByteStringRange.unbounded().startClosed("the-key").endClosed("the-key")); | ||
| assertThat(query.toSessionPointProto()) | ||
| .isEqualTo( | ||
| SessionReadRowRequest.newBuilder() | ||
| .setKey(ByteString.copyFromUtf8("the-key")) | ||
| .setFilter(RowFilter.getDefaultInstance()) | ||
| .build()); | ||
| } | ||
|
|
||
| @Test | ||
| public void toSessionPointProto_preservesFilter() { | ||
| RowFilter filter = FILTERS.key().regex("regex").toProto(); | ||
| Query query = Query.create(TABLE_ID).rowKey("the-key").filter(FILTERS.key().regex("regex")); | ||
| assertThat(query.toSessionPointProto()) | ||
| .isEqualTo( | ||
| SessionReadRowRequest.newBuilder() | ||
| .setKey(ByteString.copyFromUtf8("the-key")) | ||
| .setFilter(filter) | ||
| .build()); | ||
| } | ||
|
|
||
| @Test | ||
| public void toSessionPointProto_rejectsNonSinglePointQuery() { | ||
| Query query = Query.create(TABLE_ID).rowKey("a").rowKey("b"); | ||
| assertThrows(IllegalStateException.class, query::toSessionPointProto); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.