Skip to content

fix: Fix transaction tag issue with blind-write #4243

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −0
Open

fix: Fix transaction tag issue with blind-write #4243

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: 5 additions & 0 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import com.google.cloud.spanner.SessionClient.SessionOption;
import com.google.cloud.spanner.TransactionRunnerImpl.TransactionContextImpl;
import com.google.cloud.spanner.spi.v1.SpannerRpc;
import com.google.common.base.Strings;
import com.google.common.base.Ticker;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.MoreExecutors;
Expand Down Expand Up @@ -511,6 +512,10 @@ ApiFuture<Transaction> beginTransactionAsync(
if (sessionReference.getIsMultiplexed() && mutation != null) {
requestBuilder.setMutationKey(mutation);
}
if (sessionReference.getIsMultiplexed() && !Strings.isNullOrEmpty(transactionOptions.tag())) {
requestBuilder.setRequestOptions(
RequestOptions.newBuilder().setTransactionTag(transactionOptions.tag()).build());
}
final BeginTransactionRequest request = requestBuilder.build();
final ApiFuture<Transaction> requestFuture;
XGoogSpannerRequestId reqId = this.getRequestIdCreator().nextRequestId(this.getChannel(), 1);
Expand Down
25 changes: 25 additions & 0 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1898,6 +1898,31 @@ public void testReadWriteExecuteQueryWithTag() {
.isEqualTo("app=spanner,env=test,action=txn");
}

@Test
public void testBlindWriteWithTransactionTag() {
DatabaseClient client =
spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
String transactionTag = "app=spanner,env=test,action=txn";
TransactionRunner runner = client.readWriteTransaction(Options.tag(transactionTag));
runner.run(
transaction -> {
transaction.buffer(Mutation.newInsertBuilder("abc").set("id").to(1L).build());
return null;
});

List<BeginTransactionRequest> beginTransactionRequests =
mockSpanner.getRequestsOfType(BeginTransactionRequest.class);
assertThat(beginTransactionRequests).hasSize(1);
if (isMultiplexedSessionsEnabled()) {
assertThat(beginTransactionRequests.get(0).getRequestOptions().getTransactionTag())
.isEqualTo(transactionTag);
}
List<CommitRequest> commitRequests = mockSpanner.getRequestsOfType(CommitRequest.class);
assertThat(commitRequests).hasSize(1);
assertThat(commitRequests.get(0).getRequestOptions().getTransactionTag())
.isEqualTo(transactionTag);
}

@Test
public void testReadWriteExecuteReadWithTag() {
DatabaseClient client =
Expand Down