Skip to content

Commit 5ef14fe

Browse files
harshachintaharshachinta
committed
chore(spanner): lint fix
1 parent 189ecbf commit 5ef14fe

File tree

8 files changed

+125
-40
lines changed

8 files changed

+125
-40
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,11 @@ public void onSessionReady(SessionImpl session) {
250250

251251
// initiate a begin transaction request to verify if read-write transactions are
252252
// supported using multiplexed sessions.
253-
if (sessionClient.getSpanner().getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW()) {
253+
if (sessionClient
254+
.getSpanner()
255+
.getOptions()
256+
.getSessionPoolOptions()
257+
.getUseMultiplexedSessionForRW()) {
254258
verifyBeginTransactionWithRWOnMultiplexedSession(session.getName());
255259
}
256260
}

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractMockServerTest.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,4 +146,19 @@ void addUpdateDdlError() {
146146
.build())
147147
.build());
148148
}
149+
150+
boolean isMultiplexedSessionsEnabledForRW(Spanner spanner) {
151+
if (spanner.getOptions() == null || spanner.getOptions().getSessionPoolOptions() == null) {
152+
return false;
153+
}
154+
return spanner.getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW();
155+
}
156+
157+
// Increment the total request count by 1 when multiplexed session is enabled for read-write
158+
// transactions..
159+
// This is due to the explicit BeginTransaction RPC that is executed once during multiplexed
160+
// session creation.
161+
protected int mayBeIncrementBeginTransactionRequestsCount(Spanner spanner, int count) {
162+
return isMultiplexedSessionsEnabledForRW(spanner) ? count + 1 : count;
163+
}
149164
}

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

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,9 @@ public void testMutationUsingWrite() {
598598

599599
List<BeginTransactionRequest> beginTransactionRequests =
600600
mockSpanner.getRequestsOfType(BeginTransactionRequest.class);
601-
assertEquals(2, beginTransactionRequests.size());
601+
assertEquals(
602+
mayBeIncrementBeginTransactionRequestsCount(spanner, /* count = */ 2),
603+
beginTransactionRequests.size());
602604
for (BeginTransactionRequest request : beginTransactionRequests) {
603605
// Verify that mutation key is set for mutations-only case in read-write transaction.
604606
assertTrue(request.hasMutationKey());
@@ -890,7 +892,9 @@ public void testAbortedReadWriteTxnUsesPreviousTxnIdOnRetryWithExplicitBegin() {
890892
assertThat(updateCount).isEqualTo(1L);
891893
List<BeginTransactionRequest> beginTransactionRequests =
892894
mockSpanner.getRequestsOfType(BeginTransactionRequest.class);
893-
assertEquals(2, beginTransactionRequests.size());
895+
assertEquals(
896+
mayBeIncrementBeginTransactionRequestsCount(spanner, /* count = */ 2),
897+
beginTransactionRequests.size());
894898

895899
// Verify the requests are executed using multiplexed sessions
896900
for (BeginTransactionRequest request : beginTransactionRequests) {
@@ -1122,7 +1126,9 @@ public void testPrecommitTokenForTransactionResponse() {
11221126
// Verify that for mutation only case, a mutation key is set in BeginTransactionRequest.
11231127
List<BeginTransactionRequest> beginTxnRequest =
11241128
mockSpanner.getRequestsOfType(BeginTransactionRequest.class);
1125-
assertEquals(1L, beginTxnRequest.size());
1129+
assertEquals(
1130+
mayBeIncrementBeginTransactionRequestsCount(spanner, /* count = */ 1),
1131+
beginTxnRequest.size());
11261132
assertTrue(mockSpanner.getSession(beginTxnRequest.get(0).getSession()).getMultiplexed());
11271133
assertTrue(beginTxnRequest.get(0).hasMutationKey());
11281134
assertTrue(beginTxnRequest.get(0).getMutationKey().hasInsert());
@@ -1162,7 +1168,9 @@ public void testMutationOnlyCaseAborted() {
11621168
// Verify that for mutation only case, a mutation key is set in BeginTransactionRequest.
11631169
List<BeginTransactionRequest> beginTransactionRequests =
11641170
mockSpanner.getRequestsOfType(BeginTransactionRequest.class);
1165-
assertEquals(2L, beginTransactionRequests.size());
1171+
assertEquals(
1172+
mayBeIncrementBeginTransactionRequestsCount(spanner, /* count = */ 2),
1173+
beginTransactionRequests.size());
11661174
// Verify the requests are executed using multiplexed sessions
11671175
for (BeginTransactionRequest request : beginTransactionRequests) {
11681176
assertTrue(mockSpanner.getSession(request.getSession()).getMultiplexed());
@@ -1207,7 +1215,8 @@ public void testMutationOnlyUsingTransactionManager() {
12071215
// Verify that for mutation only case, a mutation key is set in BeginTransactionRequest.
12081216
List<BeginTransactionRequest> beginTransactionRequests =
12091217
mockSpanner.getRequestsOfType(BeginTransactionRequest.class);
1210-
assertThat(beginTransactionRequests).hasSize(1);
1218+
assertThat(beginTransactionRequests)
1219+
.hasSize(mayBeIncrementBeginTransactionRequestsCount(spanner, /* count = */ 1));
12111220
BeginTransactionRequest beginTransaction = beginTransactionRequests.get(0);
12121221
assertTrue(mockSpanner.getSession(beginTransaction.getSession()).getMultiplexed());
12131222
assertTrue(beginTransaction.hasMutationKey());
@@ -1240,7 +1249,8 @@ public void testMutationOnlyUsingAsyncRunner() {
12401249
// Verify that the mutation key is set in BeginTransactionRequest
12411250
List<BeginTransactionRequest> beginTransactions =
12421251
mockSpanner.getRequestsOfType(BeginTransactionRequest.class);
1243-
assertThat(beginTransactions).hasSize(1);
1252+
assertThat(beginTransactions)
1253+
.hasSize(mayBeIncrementBeginTransactionRequestsCount(spanner, /* count = */ 1));
12441254
BeginTransactionRequest beginTransaction = beginTransactions.get(0);
12451255
assertTrue(beginTransaction.hasMutationKey());
12461256
assertTrue(beginTransaction.getMutationKey().hasDelete());
@@ -1276,7 +1286,8 @@ public void testMutationOnlyUsingAsyncTransactionManager() {
12761286
// Verify that the mutation key is set in BeginTransactionRequest
12771287
List<BeginTransactionRequest> beginTransactions =
12781288
mockSpanner.getRequestsOfType(BeginTransactionRequest.class);
1279-
assertThat(beginTransactions).hasSize(1);
1289+
assertThat(beginTransactions)
1290+
.hasSize(mayBeIncrementBeginTransactionRequestsCount(spanner, /* count = */ 1));
12801291
BeginTransactionRequest beginTransaction = beginTransactions.get(0);
12811292
assertTrue(beginTransaction.hasMutationKey());
12821293
assertTrue(beginTransaction.getMutationKey().hasDelete());
@@ -1330,7 +1341,9 @@ public void testInitialBeginTransactionWithRW_receivesUnimplemented_fallsBackToR
13301341
});
13311342

13321343
// Verify that we received one explicit BeginTransaction, and it uses a multiplexed session.
1333-
assertEquals(1, mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
1344+
assertEquals(
1345+
mayBeIncrementBeginTransactionRequestsCount(spanner, /* count = */ 1),
1346+
mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
13341347
List<BeginTransactionRequest> beginTxnRequests =
13351348
mockSpanner.getRequestsOfType(BeginTransactionRequest.class);
13361349
Session session1 = mockSpanner.getSession(beginTxnRequests.get(0).getSession());

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/RetryOnDifferentGrpcChannelMockServerTest.java‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,10 @@ public void testReadWriteTransaction_retriesOnNewChannel() {
143143
transaction.buffer(Mutation.newInsertBuilder("foo").set("id").to(1L).build());
144144
return null;
145145
});
146+
assertEquals(
147+
mayBeIncrementBeginTransactionRequestsCount(spanner, 2),
148+
mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
146149
}
147-
assertEquals(2, mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
148150
List<BeginTransactionRequest> requests =
149151
mockSpanner.getRequestsOfType(BeginTransactionRequest.class);
150152
assertNotEquals(requests.get(0).getSession(), requests.get(1).getSession());
@@ -180,7 +182,9 @@ public void testReadWriteTransaction_stopsRetrying() {
180182
assertEquals(ErrorCode.DEADLINE_EXCEEDED, exception.getErrorCode());
181183

182184
int numChannels = spanner.getOptions().getNumChannels();
183-
assertEquals(numChannels, mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
185+
assertEquals(
186+
mayBeIncrementBeginTransactionRequestsCount(spanner, numChannels),
187+
mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
184188
List<BeginTransactionRequest> requests =
185189
mockSpanner.getRequestsOfType(BeginTransactionRequest.class);
186190
Set<String> sessions =
@@ -241,7 +245,9 @@ public void testDenyListedChannelIsCleared() {
241245
int numChannels = spanner.getOptions().getNumChannels();
242246
// We should have numChannels BeginTransactionRequests from the first transaction, and 2 from
243247
// the second transaction.
244-
assertEquals(numChannels + 2, mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
248+
assertEquals(
249+
mayBeIncrementBeginTransactionRequestsCount(spanner, numChannels + 2),
250+
mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
245251
List<BeginTransactionRequest> requests =
246252
mockSpanner.getRequestsOfType(BeginTransactionRequest.class);
247253
// The requests should all use different sessions, as deny-listing a session will bring it to
@@ -352,11 +358,14 @@ public void testReadWriteTransaction_withGrpcContextDeadline_doesNotRetry() {
352358
return null;
353359
})));
354360
assertEquals(ErrorCode.DEADLINE_EXCEEDED, exception.getErrorCode());
361+
// A gRPC context deadline will still cause the underlying error handler to try to retry the
362+
// transaction on a new channel, but as the deadline has been exceeded even before those RPCs
363+
// are being executed, the RPC invocation will be skipped, and the error will eventually
364+
// bubble
365+
// up.
366+
assertEquals(
367+
mayBeIncrementBeginTransactionRequestsCount(spanner, 1),
368+
mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
355369
}
356-
// A gRPC context deadline will still cause the underlying error handler to try to retry the
357-
// transaction on a new channel, but as the deadline has been exceeded even before those RPCs
358-
// are being executed, the RPC invocation will be skipped, and the error will eventually bubble
359-
// up.
360-
assertEquals(1, mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
361370
}
362371
}

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/AbstractMockServerTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,10 @@ boolean isMultiplexedSessionsEnabledForRW(Spanner spanner) {
329329
return spanner.getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW();
330330
}
331331

332-
// Increment the total request count by 1 when multiplexed session is enabled for read-write transactions..
333-
// This is due to the explicit BeginTransaction RPC that is executed once during multiplexed session creation.
332+
// Increment the total request count by 1 when multiplexed session is enabled for read-write
333+
// transactions..
334+
// This is due to the explicit BeginTransaction RPC that is executed once during multiplexed
335+
// session creation.
334336
protected int mayBeIncrementBeginTransactionRequestsCount(Spanner spanner, int count) {
335337
return isMultiplexedSessionsEnabledForRW(spanner) ? count + 1 : count;
336338
}

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DelayTransactionStartUntilFirstWriteMockServerTest.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,9 @@ public void testTransactionWithQueryFollowedByMutations() {
362362
ExecuteSqlRequest queryRequest =
363363
mockSpanner.getRequestsOfType(ExecuteSqlRequest.class).get(0);
364364
assertFalse(queryRequest.hasTransaction());
365-
assertEquals(mayBeIncrementBeginTransactionRequestsCount(connection.getSpanner(), /* count = */ 1), mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
365+
assertEquals(
366+
mayBeIncrementBeginTransactionRequestsCount(connection.getSpanner(), /* count = */ 1),
367+
mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
366368
assertEquals(1, mockSpanner.countRequestsOfType(CommitRequest.class));
367369
}
368370
}
@@ -382,7 +384,9 @@ public void testTransactionWithMutationsFollowedByQuery() {
382384
ExecuteSqlRequest queryRequest =
383385
mockSpanner.getRequestsOfType(ExecuteSqlRequest.class).get(0);
384386
assertFalse(queryRequest.hasTransaction());
385-
assertEquals(mayBeIncrementBeginTransactionRequestsCount(connection.getSpanner(), /* count = */ 1), mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
387+
assertEquals(
388+
mayBeIncrementBeginTransactionRequestsCount(connection.getSpanner(), /* count = */ 1),
389+
mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
386390
assertEquals(1, mockSpanner.countRequestsOfType(CommitRequest.class));
387391
}
388392
}

0 commit comments

Comments
 (0)