Self iteration

yash30201 · Apr 5, 2024 · 8e43aab · 8e43aab
1 parent 170d590
commit 8e43aab
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 45 deletions.
diff --git a/Core/src/GrpcTrait.php b/Core/src/GrpcTrait.php
@@ -18,7 +18,6 @@
 namespace Google\Cloud\Core;
 
 use Google\Auth\GetUniverseDomainInterface;
-use Google\ApiCore\ArrayTrait;
 use Google\ApiCore\CredentialsWrapper;
 use Google\Cloud\Core\Exception\NotFoundException;
 use Google\Cloud\Core\Exception\ServiceException;

diff --git a/Core/src/Testing/DatastoreOperationRefreshTrait.php b/Core/src/Testing/DatastoreOperationRefreshTrait.php
@@ -60,22 +60,7 @@ public function refreshOperation($stub, RequestHandler $requestHandler, array $o
             $options['returnInt64AsObject']
         );
 
-        $serializer = new Serializer([], [
-            'google.protobuf.Value' => function ($v) {
-                return $this->flattenValue($v);
-            },
-            'google.protobuf.Timestamp' => function ($v) {
-                return $this->formatTimestampFromApi($v);
-            }
-        ], [], [
-            'google.protobuf.Timestamp' => function ($v) {
-                if (is_string($v)) {
-                    $dt = new \DateTime($v);
-                    return ['seconds' => $dt->format('U')];
-                }
-                return $v;
-            }
-        ]);
+        $serializer = $this->getSerializer();
 
         $stub->___setProperty('operation', new Operation(
             $requestHandler,
@@ -105,26 +90,7 @@ public function refreshOperation($stub, RequestHandler $requestHandler, array $o
      */
     private function mockSendRequest($methodName, $params, $returnValue, $shouldBeCalledTimes = null)
     {
-        if (isset($this->serializer)) {
-            $serializer = $this->serializer;
-        } else {
-            $serializer = new Serializer([], [
-                'google.protobuf.Value' => function ($v) {
-                    return $this->flattenValue($v);
-                },
-                'google.protobuf.Timestamp' => function ($v) {
-                    return $this->formatTimestampFromApi($v);
-                }
-            ], [], [
-                'google.protobuf.Timestamp' => function ($v) {
-                    if (is_string($v)) {
-                        $dt = new \DateTime($v);
-                        return ['seconds' => $dt->format('U')];
-                    }
-                    return $v;
-                }
-            ]);
-        }
+        $serializer = $this->getSerializer();
 
         $prophecy = $this->requestHandler->sendRequest(
             DatastoreClient::class,
@@ -153,4 +119,28 @@ private function mockSendRequest($methodName, $params, $returnValue, $shouldBeCa
 
         $prophecy->willReturn($returnValue);
     }
+
+    private function getSerializer()
+    {
+        if (isset($this->serializer)) {
+            return $this->serializer;
+        }
+
+        return new Serializer([], [
+            'google.protobuf.Value' => function ($v) {
+                return $this->flattenValue($v);
+            },
+            'google.protobuf.Timestamp' => function ($v) {
+                return $this->formatTimestampFromApi($v);
+            }
+        ], [], [
+            'google.protobuf.Timestamp' => function ($v) {
+                if (is_string($v)) {
+                    $dt = new \DateTime($v);
+                    return ['seconds' => $dt->format('U')];
+                }
+                return $v;
+            }
+        ]);
+    }
 }
diff --git a/Datastore/src/DatastoreClient.php b/Datastore/src/DatastoreClient.php
@@ -191,12 +191,6 @@ public function __construct(array $config = [])
             'projectIdRequired' => true,
             'hasEmulator' => (bool) $emulatorHost,
             'emulatorHost' => $emulatorHost,
-            'transportConfig' => [
-                'grpc' => [
-                    // increase default limit to 4MB to prevent metadata exhausted errors
-                    'stubOpts' => ['grpc.max_metadata_size' => 4 * 1024 * 1024,]
-                ],
-            ],
         ];
         $config = $this->buildClientOptions($config);
         $config['credentials'] = $this->createCredentialsWrapper(

diff --git a/Datastore/src/Operation.php b/Datastore/src/Operation.php
@@ -475,7 +475,6 @@ public function lookup(array $keys, array $options = [])
         ];
 
         $request = $this->serializer->decodeMessage(new LookupRequest(), $data);
-        $x = $this->serializer->encodeMessage($request);
 
         $res = $this->requestHandler->sendRequest(
             DatastoreClient::class,
@@ -774,7 +773,7 @@ public function commit(array $mutations, array $options = [])
         ];
 
         if (is_null($options['transaction'])) {
-            // Remove 'transaction' if `null` to avoid serialization error
+            // Remove 'transaction' if set to `null` to avoid serialization error
             unset($options['transaction']);
         }
         list($data, $optionalArgs) = $this->splitOptionalArgs($options, ['allowOverwrite', 'baseVersion']);