Skip to content

Commit 13b0c65

Browse files
committed
chore(spanner): do not register backgroung begin txn in mock spanner
1 parent c36df63 commit 13b0c65

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

google-cloud-spanner/src/main/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClient.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,9 @@ private void verifyBeginTransactionWithRWOnMultiplexedSession(String sessionName
316316
SessionImpl.createReadWriteTransactionOptions(
317317
Options.fromTransactionOptions(), /* previousTransactionId = */ null))
318318
.setRequestOptions(
319-
RequestOptions.newBuilder().setTransactionTag("multiplexed-rw-background-begin-txn").build());
319+
RequestOptions.newBuilder()
320+
.setTransactionTag("multiplexed-rw-background-begin-txn")
321+
.build());
320322
final BeginTransactionRequest request = requestBuilder.build();
321323
final ApiFuture<Transaction> requestFuture;
322324
requestFuture =

google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockSpannerServiceImpl.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1872,7 +1872,10 @@ private Transaction getTemporaryTransactionOrNull(TransactionSelector tx) {
18721872
@Override
18731873
public void beginTransaction(
18741874
BeginTransactionRequest request, StreamObserver<Transaction> responseObserver) {
1875-
if (!request.getRequestOptions().getTransactionTag().equals("multiplexed-rw-background-begin-txn")) {
1875+
if (!request
1876+
.getRequestOptions()
1877+
.getTransactionTag()
1878+
.equals("multiplexed-rw-background-begin-txn")) {
18761879
requests.add(request);
18771880
}
18781881
Preconditions.checkNotNull(request.getSession());

google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClientMockServerTest.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1341,16 +1341,6 @@ public void testInitialBeginTransactionWithRW_receivesUnimplemented_fallsBackToR
13411341
return null;
13421342
});
13431343

1344-
// Verify that we received one explicit BeginTransaction, and it uses a multiplexed session.
1345-
assertEquals(
1346-
mayBeIncrementBeginTransactionRequestsCount(spanner, /* count = */ 0),
1347-
mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
1348-
List<BeginTransactionRequest> beginTxnRequests =
1349-
mockSpanner.getRequestsOfType(BeginTransactionRequest.class);
1350-
Session session1 = mockSpanner.getSession(beginTxnRequests.get(0).getSession());
1351-
assertNotNull(session1);
1352-
assertTrue(session1.getMultiplexed());
1353-
13541344
// Verify that we received one ExecuteSqlRequest, and it uses a regular session due to fallback.
13551345
List<ExecuteSqlRequest> executeSqlRequests =
13561346
mockSpanner.getRequestsOfType(ExecuteSqlRequest.class);

0 commit comments

Comments
 (0)