Update

Author: ilyakharev

examples/app/Commands/Select1Command.php

@@ -8,6 +8,7 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use YdbPlatform\Ydb\Session;
 use YdbPlatform\Ydb\Ydb;
 
 class Select1Command extends Command
@@ -44,11 +45,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $ydb = $this->appService->initYdb();
 
-        $result = $ydb->retry(function (Ydb $ydb) use ($output) {
+        $result = $ydb->table()->retrySession(function (Session $session) use ($output) {
 
-            $table = $ydb->table();
-
-            return $table->session()->query('select 1;');
+            return $session->query('select 1;');
 
         }, true);
 

src/Session.php

@@ -329,7 +329,6 @@ public function newQuery($yql)
      */
     public function executeQuery(YdbQuery $query)
     {
-        $data = $query->getRequestData();
         $data = $query->getRequestData();
         $data['session_id'] = $this->session_id;
 

tests/RetryOnExceptionTest.php

@@ -19,7 +19,7 @@ public static function getSessionId(\YdbPlatform\Ydb\Session $session){
     }
 }
 
-class RetryOnBadSessionTest extends TestCase
+class RetryOnExceptionTest extends TestCase
 {
     /**
      * @var string
@@ -53,22 +53,10 @@ public function test(){
         $this->oldSessionId = SessionManager::getSessionId($session);
         $session->delete();
 
-//        $this->backwardCompatibility($table);
-
         $this->retryTest($table);
 
     }
 
-    private function backwardCompatibility(Table $table)
-    {
-        $session = $table->createSession();
-        SessionManager::setSessionId($session, $this->oldSessionId);
-        $tres = $session->query('select 1 as res')->rows()[0]['res'];
-        self::assertEquals(
-            1,
-            $tres
-        );
-    }
 
     private function retryTest(Table $table)
     {
@@ -81,6 +69,6 @@ private function retryTest(Table $table)
                 1,
                 $tres
             );
-        }, false, new RetryParams(20000));
+        }, true, new RetryParams(20000));
     }
 }

tests/RunTest.php

@@ -37,11 +37,9 @@ private function getYdbResult(array $config) : array
     {
         $ydb = new Ydb($config);
         $table = $ydb->table();
-        $x = microtime(true);
+
         $session = $table->createSession();
-        print microtime(true)-$x;
-        print "\n";
-        print microtime(true);
+
         $session->createTable(
             'episodes',
             YdbTable::make()