Skip to content

test: correctly return tx id for update counts #4045

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 1 commit into from
Sep 15, 2025
Merged

test: correctly return tx id for update counts #4045

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
37 changes: 21 additions & 16 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockSpannerServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,7 +1245,13 @@ public void executeStreamingSql(
throw firstRes.getException();
case UPDATE_COUNT:
returnPartialResultSet(
session, 0L, !isPartitioned, responseObserver, request.getTransaction(), false);
session,
0L,
!isPartitioned,
responseObserver,
request.getTransaction(),
transactionId,
false);
break;
case RESULT_SET:
default:
Expand Down Expand Up @@ -1290,7 +1296,8 @@ public void executeStreamingSql(
res.getUpdateCount(),
!isPartitioned,
responseObserver,
request.getTransaction());
request.getTransaction(),
transactionId);
break;
default:
throw new IllegalStateException("Unknown result type: " + res.getType());
Expand Down Expand Up @@ -1798,32 +1805,30 @@ private void returnPartialResultSet(
Long updateCount,
boolean exact,
StreamObserver<PartialResultSet> responseObserver,
TransactionSelector transaction) {
returnPartialResultSet(session, updateCount, exact, responseObserver, transaction, true);
TransactionSelector transactionSelector,
ByteString transactionId) {
returnPartialResultSet(
session, updateCount, exact, responseObserver, transactionSelector, transactionId, true);
}

private void returnPartialResultSet(
Session session,
Long updateCount,
boolean exact,
StreamObserver<PartialResultSet> responseObserver,
TransactionSelector transaction,
TransactionSelector transactionSelector,
ByteString transactionId,
boolean complete) {
Field field =
Field.newBuilder()
.setName("UPDATE_COUNT")
.setType(Type.newBuilder().setCode(TypeCode.INT64).build())
.build();
if (exact) {
responseObserver.onNext(
PartialResultSet.newBuilder()
.setMetadata(
ResultSetMetadata.newBuilder()
.setRowType(StructType.newBuilder().addFields(field).build())
.setRowType(StructType.newBuilder().build())
.setTransaction(
ignoreInlineBeginRequest.get()
ignoreInlineBeginRequest.get() || !transactionSelector.hasBegin()
? Transaction.getDefaultInstance()
: Transaction.newBuilder().setId(transaction.getId()).build())
: Transaction.newBuilder().setId(transactionId).build())
.build())
.setStats(ResultSetStats.newBuilder().setRowCountExact(updateCount).build())
.build());
Expand All @@ -1832,11 +1837,11 @@ private void returnPartialResultSet(
PartialResultSet.newBuilder()
.setMetadata(
ResultSetMetadata.newBuilder()
.setRowType(StructType.newBuilder().addFields(field).build())
.setRowType(StructType.newBuilder().build())
.setTransaction(
ignoreInlineBeginRequest.get()
ignoreInlineBeginRequest.get() || !transactionSelector.hasBegin()
? Transaction.getDefaultInstance()
: Transaction.newBuilder().setId(transaction.getId()).build())
: Transaction.newBuilder().setId(transactionId).build())
.build())
.setStats(ResultSetStats.newBuilder().setRowCountLowerBound(updateCount).build())
.build());
Expand Down
Loading