Remove query id in prepare statement

Author: ilyakharev

src/Session.php

@@ -359,7 +359,7 @@ public function query($yql, array $parameters = null)
         $query = $this->newQuery($yql)
             ->parameters($parameters)
             ->txControl($tx_control)
-            ->keepInCache($this->keep_query_in_cache);
+            ->keepInCache($this->keep_query_in_cache || ($parameters&&count($parameters)>0));
 
         return $this->executeQuery($query);
     }
@@ -416,20 +416,11 @@ public function prepare($yql)
     {
         $statement = new Statement($this, $yql);
 
-        if ($statement->isCached())
-        {
-            return $statement;
-        }
-
         $result = $this->request('PrepareDataQuery', [
             'session_id' => $this->session_id,
             'yql_text' => $yql,
         ]);
 
-        $query_id = $result->getQueryId();
-
-        $statement->saveQueryId($query_id);
-
         return $statement;
     }
 

src/Statement.php

@@ -21,31 +21,11 @@ class Statement
      */
     protected $yql;
 
-    /**
-     * @var string
-     */
-    protected $query_id;
-
-    /**
-     * @var string
-     */
-    protected $qhash;
-
-    /**
-     * @var bool
-     */
-    protected $cached = false;
-
     /**
      * @var array
      */
     protected $params = [];
 
-    /**
-     * @var array
-     */
-    protected static $qcache = [];
-
     /**
      * @param Session $session
      * @param string $yql
@@ -55,7 +35,6 @@ public function __construct(Session $session, $yql)
         $this->session = $session;
         $this->yql = $yql;
 
-        $this->checkQueryCache();
         $this->detectParams();
     }
 
@@ -67,37 +46,12 @@ public function __construct(Session $session, $yql)
     public function execute(array $parameters = [])
     {
         $q = new Query([
-            'id' => $this->query_id,
+            'yql_text' => $this->yql,
         ]);
 
         return $this->session->query($q, $this->prepareParameters($parameters));
     }
 
-    /**
-     * @return bool
-     */
-    public function isCached()
-    {
-        return $this->cached;
-    }
-
-    /**
-     * @return string
-     */
-    public function getQueryId()
-    {
-        return $this->query_id;
-    }
-
-    /**
-     * @param string $query_id
-     */
-    public function saveQueryId($query_id)
-    {
-        $this->query_id = $query_id;
-        static::$qcache[$this->qhash] = $this->query_id;
-    }
-
     /**
      * @param array $parameters
      * @return array
@@ -127,19 +81,6 @@ protected function prepareParameters($parameters)
         return $data;
     }
 
-    /**
-     * @return void
-     */
-    protected function checkQueryCache()
-    {
-        $this->qhash = sha1($this->session->id() . '~' . trim($this->yql));
-        $this->query_id = static::$qcache[$this->qhash] ?? null;
-        if ($this->query_id)
-        {
-            $this->cached = true;
-        }
-    }
-
     /**
      * @return void
      */

tests/PreparedQueryTest.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace YdbPlatform\Ydb\Test;
+
+use PHPUnit\Framework\TestCase;
+use YdbPlatform\Ydb\Auth\Implement\AnonymousAuthentication;
+use YdbPlatform\Ydb\Ydb;
+
+class PreparedQueryTest extends TestCase
+{
+    public function test(){
+        $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);
+        $table = $ydb->table();
+
+        $session = $table->session();
+
+        $prepared_query = $ydb->table()->session()->prepare('
+declare $pk as Int64;
+select $pk;');
+        $x = 2;
+        $result = $session->transaction(function($session) use ($prepared_query, $x){
+            return $prepared_query->execute([
+                'pk' => $x,
+            ]);
+        });
+        self::assertEquals($x,
+            $result->rows()[0]['column0']
+        );
+    }
+}