Merge branch 'main' into mux-rw-it

Author: harshachinta

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

@@ -81,7 +81,8 @@ public void commit() {
       txnState = TransactionState.COMMIT_FAILED;
       throw e2;
     } finally {
-      // At this point, if the TransactionState is not ABORTED, then the transaction has reached a terminal state.
+      // At this point, if the TransactionState is not ABORTED, then the transaction has reached an
+      // end state.
       // We can safely call close() to release resources.
       if (getState() != TransactionState.ABORTED) {
         close();
@@ -98,7 +99,7 @@ public void rollback() {
       txn.rollback();
     } finally {
       txnState = TransactionState.ROLLED_BACK;
-      // At this point, the TransactionState is ROLLED_BACK which is a terminal state.
+      // At this point, the TransactionState is ROLLED_BACK which is an end state.
       // We can safely call close() to release resources.
       close();
     }

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

@@ -63,6 +63,11 @@ public void testAsyncRunner_doesNotReturnCommitTimestampBeforeCommit() {
     AsyncRunner runner = client().runAsync();
     if (isMultiplexedSessionsEnabledForRW()) {
       Throwable e = assertThrows(Throwable.class, () -> runner.getCommitTimestamp().get());
+      // If the error occurs within the future, it gets wrapped in an ExecutionException.
+      // This happens when DelayedAsyncRunner is invoked while the multiplexed session is not yet
+      // created.
+      // If the error occurs before the future is created, it may throw an IllegalStateException
+      // instead.
       assertTrue(e instanceof ExecutionException || e instanceof IllegalStateException);
       if (e instanceof ExecutionException) {
         Throwable cause = e.getCause();
@@ -83,6 +88,11 @@ public void testAsyncRunner_doesNotReturnCommitResponseBeforeCommit() {
     AsyncRunner runner = client().runAsync();
     if (isMultiplexedSessionsEnabledForRW()) {
       Throwable e = assertThrows(Throwable.class, () -> runner.getCommitResponse().get());
+      // If the error occurs within the future, it gets wrapped in an ExecutionException.
+      // This happens when DelayedAsyncRunner is invoked while the multiplexed session is not yet
+      // created.
+      // If the error occurs before the future is created, it may throw an IllegalStateException
+      // instead.
       assertTrue(e instanceof ExecutionException || e instanceof IllegalStateException);
       if (e instanceof ExecutionException) {
         Throwable cause = e.getCause();
@@ -583,7 +593,7 @@ public void closeTransactionBeforeEndOfAsyncQuery() throws Exception {
     // Wait until at least one row has been fetched. At that moment there should be one session
     // checked out.
     dataReceived.await();
-    if(!isMultiplexedSessionsEnabledForRW()) {
+    if (!isMultiplexedSessionsEnabledForRW()) {
       assertThat(clientImpl.pool.getNumberOfSessionsInUse()).isEqualTo(1);
     }
     assertThat(res.isDone()).isFalse();

samples/snippets/pom.xml

@@ -34,7 +34,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>26.53.0</version>
+        <version>26.54.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>