Added timeout and canceled params

Author: Илья

slo-workload/Dockerfile

@@ -3,6 +3,5 @@ FROM ilyakharev/php-grpc:7.2
 COPY . /src
 WORKDIR /src/slo-workload
 RUN composer update
-RUN apt instll bmon
 #RUN apt update; apt install htop
 ENTRYPOINT  ["php", "application.php"]

src/Session.php

@@ -4,6 +4,8 @@
 
 use Closure;
 use Exception;
+use Google\Protobuf\Duration;
+use Ydb\Operations\OperationParams;
 use Ydb\Table\Query;
 use Ydb\Table\QueryCachePolicy;
 // use Ydb\Table\StaleModeSettings;
@@ -366,6 +368,18 @@ public function query($yql, array $parameters = null, array $options = [])
         if(isset($options['collectStats'])){
             $query->collectStats($options['collectStats']);
         }
+        $operationParams = new OperationParams();
+        if(isset($options['operation_timeout_ms'])){
+            $operationParams->setOperationTimeout(new Duration([
+                'nanos'  => $options['operation_timeout_ms'] * 1000000 // convert ms to ns
+            ]));
+        }
+        if(isset($options['cancel_after_ms'])){
+            $operationParams->setCancelAfter(new Duration([
+                'nanos'  => $options['cancel_after_ms'] * 1000000 // convert ms to ns
+            ]));
+        }
+        $query->operationParams($operationParams);
 
         return $this->executeQuery($query);
     }

tests/CheckTimeoutAndDurationParamsTest.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace YdbPlatform\Ydb\Test;
+
+use PHPUnit\Framework\TestCase;
+use YdbPlatform\Ydb\Auth\Implement\AnonymousAuthentication;
+use YdbPlatform\Ydb\Logger\SimpleStdLogger;
+use YdbPlatform\Ydb\Session;
+use YdbPlatform\Ydb\Ydb;
+
+class CheckTimeoutAndDurationParamsTest extends TestCase
+{
+    public function testTimeoutAndDurationParams(){
+        $config = [
+
+            // Database path
+            'database'    => '/local',
+
+            // Database endpoint
+            'endpoint'    => 'localhost:2136',
+
+            // Auto discovery (dedicated server only)
+            'discovery'   => false,
+
+            // IAM config
+            'iam_config'  => [
+                'insecure' => true,
+            ],
+            'credentials' => new AnonymousAuthentication()
+        ];
+
+        $ydb = new Ydb($config, new SimpleStdLogger(7));
+        $table = $ydb->table();
+
+        $this->expectException('YdbPlatform\Ydb\Exceptions\Ydb\TimeoutException');
+        $table->retrySession(function (Session $session){
+            $session->query('SELECT 1;', null, [
+                'operation_timeout_ms' => 1e-5
+            ]);
+        });
+
+        $this->expectException('YdbPlatform\Ydb\Exceptions\Ydb\CancelledException');
+        $table->retrySession(function (Session $session){
+            $session->query('SELECT 1;', null, [
+                'cancel_after_ms' => 1e-5
+            ]);
+        });
+    }
+}