refactor: use Connection::handleRollbackException for rollback

CHANGELOG.md

@@ -11,6 +11,10 @@ Changed
 - Exception previously thrown in `Query/Builder` for `sharedLock`, `lockForUpdate`, `insertGetId` was moved to `Query/Grammar`.
 - Query/Builder::lock will now throw `BadMethodCallException` if called. Was ignored in previous versions.
 
+Refactored
+- Rollback handling has been refactored to better readability.
+
+
 # v4.7.0 (Not released yet)
 
 Chore

src/Concerns/ManagesTransactions.php

@@ -23,7 +23,6 @@
 use Google\Cloud\Core\Exception\NotFoundException;
 use Google\Cloud\Spanner\Database;
 use Google\Cloud\Spanner\Transaction;
-use Illuminate\Database\QueryException;
 use Throwable;
 
 /**
@@ -38,8 +37,6 @@ trait ManagesTransactions
      */
     protected ?Transaction $currentTransaction = null;
 
-    protected bool $ignoreSessionNotFoundErrorOnRollback = false;
-
     /**
      * @inheritDoc
      * @template T
@@ -74,27 +71,8 @@ public function transaction(Closure $callback, $attempts = Database::MAX_RETRIES
 
                     return $result;
                 } catch (Throwable $e) {
-                    // if session is lost, there is no way to rollback transaction at all,
-                    // so quietly ignore 'session not found' error in rollBack()
-                    // and then abort current transaction and rerun everything again
-                    $savedIgnoreError = $this->ignoreSessionNotFoundErrorOnRollback;
-                    $exceptionToCheck = $e instanceof QueryException ? $e->getPrevious() : $e;
-
-                    $this->ignoreSessionNotFoundErrorOnRollback =
-                        $exceptionToCheck instanceOf NotFoundException
-                        && $this->getSessionNotFoundMode() !== self::THROW_EXCEPTION
-                        && $this->causedBySessionNotFound($exceptionToCheck);
-
-                    try {
-                        $this->rollBack();
-                        // rethrow NotFoundException instead of QueryException
-                        $eToThrow = $this->ignoreSessionNotFoundErrorOnRollback ? $exceptionToCheck : $e;
-                        // mute phpstan
-                        assert($eToThrow !== null);
-                        throw $eToThrow;
-                    } finally {
-                        $this->ignoreSessionNotFoundErrorOnRollback = $savedIgnoreError;
-                    }
+                    $this->rollBack();
+                    throw $e;
                 }
             }, ['maxRetries' => $attempts - 1]);
 
@@ -188,10 +166,6 @@ protected function performRollBack($toLevel)
                 if ($this->currentTransaction->state() === Transaction::STATE_ACTIVE) {
                     $this->currentTransaction->rollBack();
                 }
-            } catch (NotFoundException $e) {
-                if (!$this->ignoreSessionNotFoundErrorOnRollback) {
-                    throw $e;
-                }
             } finally {
                 $this->currentTransaction = null;
             }
@@ -233,4 +207,19 @@ protected function handleTransactionException($e, $currentAttempt, $maxAttempts)
 
         throw $e;
     }
+
+    /**
+     * @param Throwable $e
+     * @return void
+     */
+    protected function handleRollbackException(Throwable $e)
+    {
+        if ($e instanceof NotFoundException) {
+            // Must be reset so that transaction can be retried.
+            // otherwise, transactions will remain at 1.
+            $this->transactions = 0;
+        }
+
+        throw $e;
+    }
 }

src/Connection.php

@@ -483,7 +483,7 @@ protected function withSessionNotFoundHandling(Closure $callback): mixed
 
         try {
             return $callback();
-        } catch (NotFoundException $e) {
+        } catch (Throwable $e) {
             // ensure if this really error with session
             if ($this->causedBySessionNotFound($e)) {
                 $this->disconnect();
@@ -492,7 +492,7 @@ protected function withSessionNotFoundHandling(Closure $callback): mixed
                 $this->reconnect();
                 try {
                     return $callback();
-                } catch (NotFoundException $e) {
+                } catch (Throwable $e) {
                     if ($handlerMode === self::CLEAR_SESSION_POOL && $this->causedBySessionNotFound($e)) {
                         $this->disconnect();
                         // forcefully clearing sessions, might affect parallel processes
@@ -518,8 +518,12 @@ protected function withSessionNotFoundHandling(Closure $callback): mixed
      */
     public function causedBySessionNotFound(Throwable $e): bool
     {
+        if ($e instanceof QueryException) {
+            $e = $e->getPrevious();
+        }
+
         return ($e instanceof NotFoundException)
-            && strpos($e->getMessage(), self::SESSION_NOT_FOUND_CONDITION) !== false;
+            && str_contains($e->getMessage(), self::SESSION_NOT_FOUND_CONDITION);
     }
 
 }