Removed keep in cache by default false in YdbQuery

Remove keep in cache by default false in YdbQuery

Author: ilyakharev

CHANGELOG.md

@@ -1,3 +1,4 @@
+* fix keepInCache param in YdbQuery
 * added Yson type
 * add logger as Ydb config
 * added snapshot mode in noninteractive transaction

src/Session.php

@@ -363,7 +363,7 @@ public function query($yql, array $parameters = null, array $options = [])
         $query = $this->newQuery($yql)
             ->parameters($parameters)
             ->txControl($tx_control)
-            ->keepInCache($this->keep_query_in_cache ?? ($parameters&&count($parameters)>0));
+            ->keepInCache($this->keep_query_in_cache);
 
         if(isset($options['collectStats'])){
             $query->collectStats($options['collectStats']);

src/YdbQuery.php

@@ -27,7 +27,7 @@ class YdbQuery
     /**
      * @var bool
      */
-    protected $keep_query_in_cache = false;
+    protected $keep_query_in_cache = null;
 
     /**
      * @var int
@@ -219,6 +219,17 @@ public function getRequestData()
      */
     public function execute()
     {
+        $this->keep_query_in_cache = self::isNeedSetKeepQueryInCache($this->keep_query_in_cache, $this->parameters);
         return $this->session->executeQuery($this);
     }
+
+    /**
+     * @param bool|null $userFlag
+     * @param array|null $queryDeclaredParams
+     * @return bool
+     */
+    protected static function isNeedSetKeepQueryInCache(?bool $userFlag, ?array $queryDeclaredParams): bool
+    {
+        return $userFlag ?? $queryDeclaredParams&&count($queryDeclaredParams)>0;
+    }
 }

tests/KeepInCacheTest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace YdbPlatform\Ydb\Test;
+
+use PHPUnit\Framework\TestCase;
+use YdbPlatform\Ydb\Session;
+
+class KeepInCacheTest extends TestCase
+{
+    protected $sampleParams = ["x", 1];
+
+    public function testIsNeedSetKeepQueryInCache()
+    {
+        $tests = [
+            ["flag" => null, "params" => null, "result" => false],
+            ["flag" => null, "params" => [], "result" => false],
+            ["flag" => null, "params" => $this->sampleParams, "result" => true],
+            ["flag" => false, "params" => null, "result" => false],
+            ["flag" => false, "params" => [], "result" => false],
+            ["flag" => false, "params" => $this->sampleParams, "result" => false],
+            ["flag" => true, "params" => null, "result" => true],
+            ["flag" => true, "params" => [], "result" => true],
+            ["flag" => true, "params" => $this->sampleParams, "result" => true],
+        ];
+        foreach ($tests as $i => $test){
+            self::assertEquals($test["result"], YdbQuery::isNeedSetKeepQueryInCache($test["flag"], $test["params"]));
+        }
+    }
+}
+class YdbQuery extends \YdbPlatform\Ydb\YdbQuery{
+    public static function isNeedSetKeepQueryInCache(?bool $userFlag, ?array $queryDeclaredParams): bool
+    {
+        return parent::isNeedSetKeepQueryInCache($userFlag, $queryDeclaredParams);
+    }
+}