Update Bigtable branch with latest from master

.travis.yml

@@ -5,6 +5,7 @@ jobs:
     - php: 7.2
       install:
         - pecl install grpc || echo 'Failed to install grpc'
+        - pecl install protobuf || echo 'Failed to install protobuf'
         - pecl install stackdriver_debugger-alpha || echo 'Failed to install stackdriver_debugger'
         - composer self-update
         - travis_retry composer install

BigQuery/VERSION

@@ -1 +1 @@
-1.2.4
+1.4.0

BigQuery/src/BigQueryClient.php

@@ -49,7 +49,7 @@ class BigQueryClient
     use ClientTrait;
     use RetryDeciderTrait;
 
-    const VERSION = '1.2.4';
+    const VERSION = '1.4.0';
 
     const MAX_DELAY_MICROSECONDS = 32000000;
 
@@ -442,6 +442,10 @@ public function job($id, array $options = [])
      *           resume the loading of results from a specific point.
      *     @type string $stateFilter Filter for job state. Maybe be either
      *           `done`, `pending`, or `running`.
+     *     @type int $maxCreationTime Milliseconds since the POSIX epoch. If set, only jobs created
+     *           before or at this timestamp are returned.
+     *     @type int $minCreationTime Milliseconds since the POSIX epoch. If set, only jobs created
+     *           after or at this timestamp are returned.
      * }
      * @return ItemIterator<Job>
      */
@@ -682,4 +686,46 @@ public function timestamp(\DateTimeInterface $value)
     {
         return new Timestamp($value);
     }
+
+    /**
+     * Create a Numeric object.
+     *
+     * Numeric represents a value with a data type of
+     * [Numeric](https://cloud.google.com/bigquery/docs/reference/standard-sql/data-types#numeric-type).
+     *
+     * It supports a fixed 38 decimal digits of precision and 9 decimal digits of scale, and values
+     * are in the range of -99999999999999999999999999999.999999999 to
+     * 99999999999999999999999999999.999999999.
+     *
+     * Example:
+     * ```
+     * $numeric = $bigQuery->numeric('99999999999999999999999999999999999999.999999999');
+     * ```
+     *
+     * @param string|int|float $value The Numeric value.
+     * @return Numeric
+     * @throws \InvalidArgumentException
+     */
+    public function numeric($value)
+    {
+        return new Numeric($value);
+    }
+
+    /**
+     * Get a service account for the KMS integration.
+     *
+     * Example:
+     * ```
+     * $serviceAccount = $bigQuery->getServiceAccount();
+     * ```
+     *
+     * @param array $options [optional] Configuration options.
+     *
+     * @return string
+     */
+    public function getServiceAccount(array $options = [])
+    {
+        $resp = $this->connection->getServiceAccount($options + ['projectId' => $this->projectId]);
+        return $resp['email'];
+    }
 }

BigQuery/src/Connection/ConnectionInterface.php

@@ -138,4 +138,10 @@ public function insertJob(array $args = []);
      * @return AbstractUploader
      */
     public function insertJobUpload(array $args = []);
+
+    /**
+     * @param array $args
+     * @return array
+     */
+    public function getServiceAccount(array $args = []);
 }

BigQuery/src/Connection/Rest.php

@@ -237,6 +237,15 @@ public function insertJobUpload(array $args = [])
         );
     }
 
+    /**
+     * @param array $args
+     * @return array
+     */
+    public function getServiceAccount(array $args = [])
+    {
+        return $this->send('projects', 'getServiceAccount', $args);
+    }
+
     /**
      * @param array $args
      * @return array

BigQuery/src/Numeric.php

@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Google\Cloud\BigQuery;
+
+/**
+ * Represents a value with a data type of
+ * [Numeric](https://cloud.google.com/bigquery/docs/reference/standard-sql/data-types#numeric-type).
+ *
+ * It supports a fixed 38 decimal digits of precision and 9 decimal digits of scale, and values
+ * are in the range of -99999999999999999999999999999.999999999 to
+ * 99999999999999999999999999999.999999999.
+ *
+ * Example:
+ * ```
+ * use Google\Cloud\BigQuery\BigQueryClient;
+ *
+ * $bigQuery = new BigQueryClient();
+ *
+ * $numeric = $bigQuery->numeric('99999999999999999999999999999999999999.999999999');
+ * ```
+ */
+class Numeric implements ValueInterface
+{
+    /**
+     * @var string
+     */
+    private $value;
+
+    /**
+     * @param string|int|float $value The NUMERIC value.
+     * @throws \InvalidArgumentException
+     */
+    public function __construct($value)
+    {
+        $value = (string) $value;
+        // allow minus sign at the beginning
+        // 38 or less decimal digits (or none)
+        // optional period and 9 or less digits of scale
+        $pattern = '/^-?([0-9]{1,38})?(\.([0-9]{1,9})?)?$/';
+        if (! preg_match($pattern, $value)) {
+            throw new \InvalidArgumentException(
+                'Numeric type only allows fixed 38 decimal digits and 9 decimal digits of scale.'
+            );
+        }
+        $this->value = $value;
+    }
+
+    /**
+     * Get the underlying value.
+     *
+     * @return string
+     */
+    public function get()
+    {
+        return $this->value;
+    }
+
+    /**
+     * Get the type.
+     *
+     * @return string
+     */
+    public function type()
+    {
+        return ValueMapper::TYPE_NUMERIC;
+    }
+
+    /**
+     * Format the value as a string.
+     *
+     * @return string
+     */
+    public function formatAsString()
+    {
+        return $this->value;
+    }
+
+    /**
+     * Format the value as a string.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->value;
+    }
+}

BigQuery/src/ValueMapper.php

@@ -34,6 +34,7 @@ class ValueMapper
     const TYPE_INTEGER = 'INTEGER';
     const TYPE_FLOAT64 = 'FLOAT64';
     const TYPE_FLOAT = 'FLOAT';
+    const TYPE_NUMERIC = 'NUMERIC';
     const TYPE_STRING = 'STRING';
     const TYPE_BYTES = 'BYTES';
     const TYPE_DATE = 'DATE';
@@ -95,6 +96,8 @@ public function fromBigQuery(array $value, array $schema)
                     : (int) $value;
             case self::TYPE_FLOAT:
                 return (float) $value;
+            case self::TYPE_NUMERIC:
+                return new Numeric($value);
             case self::TYPE_STRING:
                 return (string) $value;
             case self::TYPE_BYTES:

BigQuery/tests/Snippet/BigQueryClientTest.php

@@ -20,6 +20,7 @@
 use Google\Cloud\BigQuery\BigQueryClient;
 use Google\Cloud\BigQuery\Bytes;
 use Google\Cloud\BigQuery\Date;
+use Google\Cloud\BigQuery\Numeric;
 use Google\Cloud\BigQuery\Time;
 use Google\Cloud\BigQuery\Timestamp;
 use Google\Cloud\BigQuery\Connection\ConnectionInterface;
@@ -393,6 +394,16 @@ public function testInt64()
         $this->assertInstanceOf(Int64::class, $res->returnVal());
     }
 
+    public function testNumeric()
+    {
+        $snippet = $this->snippetFromMethod(BigQueryClient::class, 'numeric');
+        $snippet->addLocal('bigQuery', $this->client);
+        $this->client->___setProperty('connection', $this->connection->reveal());
+        $res = $snippet->invoke('numeric');
+
+        $this->assertInstanceOf(Numeric::class, $res->returnVal());
+    }
+
     public function testTime()
     {
         $snippet = $this->snippetFromMethod(BigQueryClient::class, 'time');
@@ -412,6 +423,23 @@ public function testTimestamp()
 
         $this->assertInstanceOf(Timestamp::class, $res->returnVal());
     }
+
+    public function testGetServiceAccount()
+    {
+        $expectedEmail = uniqid() . '@bigquery-encryption.iam.gserviceaccount.com';
+        $snippet = $this->snippetFromMethod(BigQueryClient::class, 'getServiceAccount');
+        $snippet->addLocal('bigQuery', $this->client);
+        $this->connection->getServiceAccount(['projectId' => self::PROJECT_ID])
+            ->willReturn([
+                "kind" => "bigquery#getServiceAccountResponse",
+                "email" => $expectedEmail
+            ])
+            ->shouldBeCalledTimes(1);
+        $this->client->___setProperty('connection', $this->connection->reveal());
+        $res = $snippet->invoke('serviceAccount');
+
+        $this->assertEquals($expectedEmail, $res->returnVal());
+    }
 }
 
 class BigQueryTestClient extends BigQueryClient

BigQuery/tests/Snippet/NumericTest.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Google\Cloud\BigQuery\Tests\Snippet;
+
+use Google\Cloud\BigQuery\Numeric;
+use Google\Cloud\Core\Testing\Snippet\SnippetTestCase;
+
+/**
+ * @group bigquery
+ */
+class NumericTest extends SnippetTestCase
+{
+    public function testClass()
+    {
+        $expected = new Numeric('99999999999999999999999999999999999999.999999999');
+        $snippet = $this->snippetFromClass(Numeric::class);
+        $res = $snippet->invoke('numeric');
+
+        $this->assertInstanceOf(Numeric::class, $res->returnVal());
+        $this->assertEquals($expected, $res->returnVal());
+    }
+}

BigQuery/tests/System/LoadDataAndQueryTest.php

@@ -18,6 +18,7 @@
 namespace Google\Cloud\BigQuery\Tests\System;
 
 use Google\Cloud\BigQuery\Bytes;
+use Google\Cloud\BigQuery\Numeric;
 use Google\Cloud\BigQuery\Date;
 use Google\Cloud\Core\ExponentialBackoff;
 use Google\Cloud\BigQuery\Time;
@@ -60,7 +61,7 @@ public function setUp()
                 'NextVacation' => self::$client->date(new \DateTime('2020-10-11')),
                 'FavoriteTime' => new \DateTime('1920-01-01 15:15:12')
             ],
-            'FavoriteNumbers' => [10, 11]
+            'FavoriteNumbers' => [new Numeric('.123'), new Numeric('123.')]
         ];
     }
 
@@ -133,8 +134,8 @@ public function testRunQuery($useLegacySql)
             $expectedRow = $this->row;
             $expectedBytes = $expectedRow['Spells'][0]['Icon'];
             $actualBytes = $actualRow['Spells'][0]['Icon'];
-            unset($expectedRow['ImportantDates']);
             unset($expectedRow['FavoriteNumbers']);
+            unset($expectedRow['ImportantDates']);
             unset($expectedRow['Spells'][0]['Icon']);
             unset($actualRow['Spells'][0]['Icon']);
 
@@ -216,9 +217,11 @@ public function testRunQueryWithNamedParameters()
             . '@datetime as datetime,'
             . '@date as date,'
             . '@time as time,'
-            . '@bytes as bytes';
+            . '@bytes as bytes, '
+            . '@numeric as numeric';
 
         $bytes = self::$client->bytes('123');
+        $numeric = self::$client->numeric('9.999999999');
         $params = [
             'structType' => [
                 'hello' => 'world'
@@ -241,7 +244,8 @@ public function testRunQueryWithNamedParameters()
             'datetime' => new \DateTime('2003-02-05 11:15:02.421827Z'),
             'date' => self::$client->date(new \DateTime('2003-12-12')),
             'time' => self::$client->time(new \DateTime('11:15:02')),
-            'bytes' => $bytes
+            'bytes' => $bytes,
+            'numeric' => $numeric
         ];
         $query = self::$client->query($queryString)
             ->parameters($params);

BigQuery/tests/System/ManageJobsTest.php

@@ -47,6 +47,33 @@ public function testListJobs()
         return $job;
     }
 
+    public function testListJobsWithTimeFilter()
+    {
+        $query = self::$client->query(sprintf(
+            'SELECT * FROM [%s.%s]',
+            self::$dataset->id(),
+            self::$table->id()
+        ));
+        $job = self::$client->startQuery($query);
+        $info = $job->info();
+        $jobId = $job->id();
+        $creationTime = $info['statistics']['creationTime'];
+        $jobs = self::$client->jobs([
+            'maxCreationTime' => $creationTime + 1,
+            'minCreationTime' => $creationTime - 1,
+        ]);
+        $job = null;
+
+        // break early to prevent subsequent requests
+        foreach ($jobs as $j) {
+            $job = $j;
+            break;
+        }
+
+        $this->assertInstanceOf(Job::class, $job);
+        $this->assertEquals($jobId, $job->id());
+    }
+
     /**
      * @depends testListJobs
      */