fix(Bigtable): ensure RowRanges are set on retry (#8224)

Author: bshaffer

Bigtable/src/ChunkFormatter.php

@@ -197,6 +197,10 @@ public function readAll()
         //   are to be discarded.
 
         foreach ($this->stream as $readRowsResponse) {
+            if ($lastScannedRowKey = $readRowsResponse->getLastScannedRowKey()) {
+                // The server sends the response with a "last_scanned_row_key" in some cases
+                $this->prevRowKey = $lastScannedRowKey;
+            }
             foreach ($readRowsResponse->getChunks() as $chunk) {
                 switch ($this->state) {
                     case self::$rowStateEnum['NEW_ROW']:
@@ -234,7 +238,6 @@ private function updateReadRowsRequest($request, $options, $prevRowKey)
                 $options['requestCompleted'] = true;
             }
         }
-
         if ($request->hasRows()) {
             $rowSet = $request->getRows();
             if (count($rowSet->getRowKeys()) > 0) {
@@ -252,7 +255,8 @@ private function updateReadRowsRequest($request, $options, $prevRowKey)
                     if (($range->getEndKeyOpen() && $prevRowKey > $range->getEndKeyOpen())
                         || ($range->getEndKeyClosed() && $prevRowKey >= $range->getEndKeyClosed())) {
                         continue;
-                    } elseif ((!$range->getStartKeyOpen() || $prevRowKey > $range->getStartKeyOpen())
+                    }
+                    if ((!$range->getStartKeyOpen() || $prevRowKey > $range->getStartKeyOpen())
                         && (!$range->getStartKeyClosed() || $prevRowKey >= $range->getStartKeyClosed())) {
                         $range->setStartKeyOpen($prevRowKey);
                     }
@@ -270,8 +274,10 @@ private function updateReadRowsRequest($request, $options, $prevRowKey)
                 $options['requestCompleted'] = true;
             }
         } else {
-            $range = (new RowRange())->setStartKeyOpen($prevRowKey);
-            $options['rows'] = (new RowSet())->setRowRanges([$range]);
+            $range = (new RowRange());
+            $range->setStartKeyOpen($prevRowKey);
+            $rowset = (new RowSet())->setRowRanges([$range]);
+            $request->setRows($rowset);
         }
 
         return [$request, $options];

Bigtable/tests/Conformance/proxy/known_failures.txt

@@ -3,7 +3,6 @@ _Retry_WithRetryInfo
 TestMutateRows_Generic_DeadlineExceeded
 TestReadRow_Generic_DeadlineExceeded
 TestReadRows_Retry_StreamReset
-TestReadRows_Retry_PausedScan
-TestReadRows_Retry_LastScannedRow
+TestReadRows_Retry_LastScannedRow_Reverse
 TestReadRows_ReverseScans_FeatureFlag_Enabled
 TestReadRows_Generic_DeadlineExceeded