Set token extension from json to txt

Author: Илья

src/QueryResult.php

@@ -3,20 +3,13 @@
 namespace YdbPlatform\Ydb;
 
 use DateTime;
-use Ydb\CostInfo;
-use Ydb\TableStats\QueryStats;
 
 class QueryResult
 {
     protected $columns = [];
     protected $rows = [];
     protected $truncated = false;
 
-    /**
-     * @var CostInfo|null
-     */
-    protected $costInfo = null;
-
     /**
      * @var QueryStats|null
      */
@@ -55,9 +48,9 @@ public function __construct($result)
             throw new Exception('Unknown result');
         }
 
-        if (method_exists($result, 'getQueryStats'))
+        if (method_exists($result, 'getQueryStats') && $result->getQueryStats())
         {
-            $this->queryStats = $result->getQueryStats();
+            $this->queryStats = new QueryStats($result->getQueryStats());
         }
     }
 

src/QueryStats.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace YdbPlatform\Ydb;
+
+class QueryStats
+{
+
+    private $query_phases;
+    protected $compilation = null;
+    protected $process_cpu_time_us = 0;
+    protected $query_plan = '';
+    protected $query_ast = '';
+    protected $total_duration_us = 0;
+    protected $total_cpu_time_us = 0;
+    public function __construct(\Ydb\TableStats\QueryStats $queryStats)
+    {
+        $this->compilation = $queryStats->getCompilation();
+        $this->query_ast = $queryStats->getQueryAst();
+        $this->query_plan = $queryStats->getQueryPlan();
+        $this->query_phases = $queryStats->getQueryPhases();
+        $this->total_cpu_time_us = $queryStats->getTotalCpuTimeUs();
+        $this->total_duration_us = $queryStats->getTotalDurationUs();
+        $this->process_cpu_time_us = $queryStats->getProcessCpuTimeUs();
+    }
+
+    /**
+     * @return \Google\Protobuf\Internal\RepeatedField
+     */
+    public function getQueryPhases(): \Google\Protobuf\Internal\RepeatedField
+    {
+        return $this->query_phases;
+    }
+
+    /**
+     * @return \Ydb\TableStats\CompilationStats|null
+     */
+    public function getCompilation(): ?\Ydb\TableStats\CompilationStats
+    {
+        return $this->compilation;
+    }
+
+    /**
+     * @return int|string
+     */
+    public function getProcessCpuTimeUs()
+    {
+        return $this->process_cpu_time_us;
+    }
+
+    /**
+     * @return string
+     */
+    public function getQueryPlan(): string
+    {
+        return $this->query_plan;
+    }
+
+    /**
+     * @return string
+     */
+    public function getQueryAst(): string
+    {
+        return $this->query_ast;
+    }
+
+    /**
+     * @return int|string
+     */
+    public function getTotalDurationUs()
+    {
+        return $this->total_duration_us;
+    }
+
+    /**
+     * @return int|string
+     */
+    public function getTotalCpuTimeUs()
+    {
+        return $this->total_cpu_time_us;
+    }
+
+}

src/Session.php

@@ -345,7 +345,7 @@ public function executeQuery(YdbQuery $query)
      * @return bool|QueryResult
      * @throws \YdbPlatform\Ydb\Exception
      */
-    public function query($yql, array $parameters = null)
+    public function query($yql, array $parameters = null, array $options = [])
     {
         $tx_id = $this->tx_id;
 
@@ -363,6 +363,10 @@ public function query($yql, array $parameters = null)
             ->txControl($tx_control)
             ->keepInCache($this->keep_query_in_cache ?? ($parameters&&count($parameters)>0));
 
+        if(isset($options['collectStats'])){
+            $query->collectStats($options['collectStats']);
+        }
+
         return $this->executeQuery($query);
     }
 

src/Traits/RequestTrait.php

@@ -42,7 +42,6 @@ trait RequestTrait
      */
     protected $lastDiscovery = 0;
 
-    protected $collectStats = CollectQueryStatsMode::STATS_COLLECTION_UNSPECIFIED;
 
 
     /**
@@ -90,10 +89,6 @@ protected function doRequest($service, $method, array $data = [])
 
         $request = new $requestClass($data);
 
-        if (method_exists($request, 'setCollectStats')){
-            $request->setCollectStats($this->collectStats);
-        }
-
         $this->logger()->debug(
             'YDB: Sending API request [' . $requestClass . '].',
             json_decode($request->serializeToJsonString(), true)
@@ -383,12 +378,4 @@ protected function checkDiscovery(){
         16 => "UNAUTHENTICATED"
     ];
 
-    /**
-     * @param int $collectStats YdbPlatform\Ydb\Enums\CollectQueryStatsMode
-     */
-    public function setCollectStats(int $collectStats): void
-    {
-        $this->collectStats = $collectStats;
-    }
-
 }