add ability to use filters with #readRow() (#1679)

googleapis · Feb 15, 2019 · bec28c8 · bec28c8
1 parent 0c2dfd5
commit bec28c8
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/Bigtable/src/Table.php b/Bigtable/src/Table.php
@@ -325,8 +325,7 @@ public function readRows(array $options = [])
     public function readRow($rowKey, array $options = [])
     {
         return $this->readRows(
-            ['rowKeys' => [$rowKey]],
-            $options + $this->options
+            ['rowKeys' => [$rowKey]] + $options + $this->options
         )
             ->readAll()
             ->current();

diff --git a/Bigtable/tests/Unit/TableTest.php b/Bigtable/tests/Unit/TableTest.php
@@ -345,6 +345,32 @@ public function testReadRow()
         $this->assertNull($row);
     }
 
+    public function testReadRowWithFilter()
+    {
+        $rowSet = new RowSet();
+        $rowSet->setRowKeys(['rk1']);
+        $rowFilter = Filter::pass();
+        $expectedArgs = $this->options + [
+            'rows' => $rowSet,
+            'filter' => $rowFilter->toProto()
+        ];
+        $this->serverStream->readAll()
+            ->shouldBeCalled()
+            ->willReturn(
+                $this->arrayAsGenerator([])
+            );
+        $this->bigtableClient->readRows(self::TABLE_NAME, $expectedArgs)
+            ->shouldBeCalled()
+            ->willReturn(
+                $this->serverStream->reveal()
+            );
+        $args = [
+            'filter' => $rowFilter
+        ];
+        $row = $this->table->readRow('rk1', $args);
+        $this->assertNull($row);
+    }
+
     public function testReadRowsWithMultipleRowKeys()
     {
         $rowSet = new RowSet();