resolve system tests issues of CacheSessionPool

googleapis · May 15, 2024 · 5b9841d · 5b9841d
1 parent 0966a99
commit 5b9841d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Spanner/src/Database.php b/Spanner/src/Database.php
@@ -55,6 +55,7 @@
 use Google\Cloud\Spanner\V1\TypeCode;
 use Google\Protobuf\FieldMask;
 use Google\Rpc\Code;
+use GuzzleHttp\Promise\PromiseInterface;
 
 /**
  * Represents a Cloud Spanner Database.
@@ -2237,7 +2238,6 @@ public function batchCreateSessions(array $options)
     public function deleteSessionAsync(array $options)
     {
         list($data, $optionalArgs) = $this->splitOptionalArgs($options);
-        $data['name'] = $this->name;
         return $this->createAndSendRequest(
             GapicSpannerClient::class,
             'deleteSessionAsync',

diff --git a/Spanner/src/Operation.php b/Spanner/src/Operation.php
@@ -397,6 +397,7 @@ public function executeUpdate(
         if (!isset($options['transaction']['begin'])) {
             $options['transaction'] = ['id' => $transaction->id()];
         }
+        $statsItem = $this->pluck('statsItem', $options, false);
         $res = $this->execute($session, $sql, $options);
         if (empty($transaction->id()) && $res->transaction()) {
             $transaction->setId($res->transaction()->id());
@@ -412,7 +413,7 @@ public function executeUpdate(
             );
         }
 
-        $statsItem = $options['statsItem'] ?? 'rowCountExact';
+        $statsItem = $statsItem ?? 'rowCountExact';
 
         return $stats[$statsItem];
     }
@@ -601,7 +602,7 @@ public function transaction(Session $session, array $options = [])
             'requestOptions' => [],
             'singleUse' => false
         ];
-        $isRetry = $options['isRetry'] ?? false;
+        $isRetry = $this->pluck('isRetry', $options, false) ?? false;
         $transactionTag = $this->pluck('tag', $options, false);
 
         if (isset($transactionTag)) {

diff --git a/Spanner/tests/System/ReadTest.php b/Spanner/tests/System/ReadTest.php
@@ -346,7 +346,7 @@ public function testReadWithLimit()
         };
 
         $limitCount = count(iterator_to_array($res(10)));
-        $unlimitCount = count(iterator_to_array($res(null)));
+        $unlimitCount = count(iterator_to_array($res(0)));
 
         $this->assertEquals(10, $limitCount);
         $this->assertNotEquals($limitCount, $unlimitCount);
@@ -368,7 +368,7 @@ public function testReadOverIndexWithLimit()
         };
 
         $limitCount = count(iterator_to_array($res(10)));
-        $unlimitCount = count(iterator_to_array($res(null)));
+        $unlimitCount = count(iterator_to_array($res(0)));
 
         $this->assertEquals(10, $limitCount);
         $this->assertNotEquals($limitCount, $unlimitCount);