Readrows Filter and system test #1322

ajaaym · 2018-09-28T17:58:40Z

Added option for filter in readRows of DataClient and system test for filters

dwsupplee

Just a cursory review of the DataClient. Will follow up after taking a look at the system tests :).

Bigtable/src/DataClient.php

@@ -241,6 +241,7 @@ public function upsert(array $rows, array $options = [])
     *           associative array which may contain a start key
     *           (`startKeyClosed` or `startKeyOpen`) and/or an end key
     *           (`endKeyOpen` or `endKeyClosed`).
+     *     @type filter $filter A {@see Google\Cloud\Bigtable\Filter\FilterInterface} object to filter the rows.


Bigtable/src/DataClient.php


        array_walk($ranges, function (&$range) {
            $range = $this->serializer->decodeMessage(
                new RowRange(),
                $range
            );
        });
-
+        if (is_string($rowKeys)) {


ajaaym · 2018-10-01T14:45:32Z

@dwsupplee can you please review now?

Bigtable/src/DataClient.php

@@ -241,6 +242,9 @@ public function upsert(array $rows, array $options = [])
     *           associative array which may contain a start key
     *           (`startKeyClosed` or `startKeyOpen`) and/or an end key
     *           (`endKeyOpen` or `endKeyClosed`).
+     *     @type FilterInterface $filter A filter used to take an input row and produce an alternate view of the row


Bigtable/src/DataClient.php

+        if (!is_array($rowKeys)) {
+            throw new \InvalidArgumentException(
+                sprintf(
+                    'Expected rowKeys to be of array, instead got \'%s\'.',


Bigtable/src/DataClient.php

@@ -267,6 +279,10 @@ public function readRows(array $options = [])
            );
        }

+        if ($filter !== null) {


Bigtable/tests/System/ChainFilterTest.php

+                ]
+            )->readAll()
+        );
+        $expectedRows = ['rk1' => [


Bigtable/tests/System/ConditionFilterTest.php

+    public function testThen()
+    {
+        $rowFilter = Filter::condition(Filter::key()->exactMatch('rk1'))
+                    ->then(Filter::family()->exactMatch('cf1'));


Bigtable/tests/System/ChainFilterTest.php

+ * @group bigtable
+ * @group bigtabledata
+ */
+class ChainFilterTest extends FilterTest


Bigtable/tests/System/ConditionFilterTest.php

+            )->readAll()
+        );
+        $expectedRows = ['rk1' => self::$expectedRows['rk1']
+        ];


Bigtable/tests/System/LimitFilterTest.php

+            'rk3' => [
+                'cf0' => [
+                    'cq0' => [
+                        'value' => 'value1002',


Bigtable/tests/System/LimitFilterTest.php

+                ]
+            ]
+        ];
+        self::$dataClient->upsert($insertExtraCell);


Bigtable/tests/System/SimpleFilterTest.php

+
+    public function testLabel()
+    {
+        //TODO Implement label test


ajaaym · 2018-10-02T16:59:02Z

@dwsupplee Can you please review again? testLabel is not working correctly from server side, thats why its in TODO.

dwsupplee

Just some minor notes, otherwise looking very nice!

Bigtable/src/DataClient.php

+            if (!$filter instanceof FilterInterface) {
+                throw new \InvalidArgumentException(
+                    sprintf(
+                        'Expected filter to be of type FilterInterface, instead got \'%s\'.',
