ok

Author: ierusalim

src/ClickHouseAPI.php

@@ -298,8 +298,6 @@ public function setServerUrl($full_server_url = null)
         if ($this->host) {
             // If host is set, we assume that the server accepts requests
             $this->isSupported('query', false, true);
-            // But, send async-requests to find out this reliably
-            //$this->versionSendQuery();
         }
 
         return $this;
@@ -452,7 +450,6 @@ public function doQuery(
         }
 
         return ($response_data['code'] === 102) ? $this : $response_data;
-        //return $response_data;
     }
 
     /**
@@ -680,7 +677,7 @@ public function isSupported($fe_key = 'session_id', $re_check = false, $set = nu
             }
             if (!isset($support_fe[$s_key][$fe_key]) || $re_check) {
                 if ($fe_key == 'session_id' || ($fe_key === 'query' && $re_check)) {
-                    $ver = $this->getVersion($re_check);
+                    $this->getVersion($re_check);
                 } else {
                     return false;
                 }
@@ -716,8 +713,8 @@ public function getVersion($re_check = false)
                 $this->eraseSlot($slot2);
                 $this->versionSendQuery();
             }
-            $ans = $this->slotWaitReady($slot1);
-            $ans = $this->slotWaitReady($slot2);
+            $this->slotWaitReady($slot1);
+            $this->slotWaitReady($slot2);
             $ver = $this->isSupported('version');
             if (empty($ver)) {
                 $ver = 'Unknown';

src/ClickHouseFunctions.php

@@ -539,7 +539,7 @@ public function getTableFields($table, $renew_cache = true, $sess = null)
                 $this->table_structure_cached[$table] = $results = yield;
                 yield $results;
             };
-            $yi = $yi($table);
+            $this->last_yi = $yi = $yi($table);
             $this->slotHookPush($slot,
                 ['mode' => 1, 'fn' => $yi, 'par' => 'getTableFields']);
         }
@@ -708,7 +708,7 @@ public function getTableInfo($table, $extended = 2)
                 $fields_arr[$col_name] = $col_arr['type'];
             }
             $ret_arr = $this->getTableRowSize($fields_arr);
-            $ret_arr['table_name'] = $dbtb = $database . '.' . $table;
+            $ret_arr['table_name'] = $database . '.' . $table;
             if ($extended) {
                 //results of queryTableSys($dbtb, 'tables', ['d', 't', 'n']);
                 $engine = $this->slotResults($slots['tables']);
@@ -741,7 +741,7 @@ public function getTableInfo($table, $extended = 2)
             }
             yield $ret_arr;
         };
-        $yi = $yi($slots, $table, $extended);
+        $this->last_yi = $yi = $yi($slots, $table, $extended);
 
         $this->slotHookPush($slots['root'],
             ['mode' => 1, 'fn' => $yi, 'par' => 'getTableInfo']);
@@ -784,7 +784,7 @@ public function clearTable($table, $sess = null)
             $this->queryFalse("DROP TABLE IF EXISTS $table", [], $sess);
             yield $this->queryFalse($create_request, [], $sess);
         };
-        $yi = $yi($table, $sess, $slot);
+        $this->last_yi = $yi = $yi($table, $sess, $slot);
         $create_request = $yi->current();
         if (empty($slot)) {
             return $yi->send($create_request);

src/ClickHouseSlots.php

@@ -187,7 +187,6 @@ public function slotAdd($slot, $curl_h, $slot_hook = false)
         if (!$this->multi_h) {
             $this->multi_h = \curl_multi_init();
             curl_multi_setopt($this->multi_h, \CURLMOPT_MAXCONNECTS, 1023);
-            //curl_multi_setopt($this->multi_h, \CURLMOPT_MAX_HOST_CONNECTIONS, 1023);
         }
         $ans = \curl_multi_add_handle($this->multi_h, $curl_h);
         if (!$this->multi_h || ($ans !== 0)) {
@@ -386,7 +385,7 @@ public function slotsRefresh()
             if (!$this->multi_still_run) {
                 break;
             }
-            $ans = \curl_multi_exec($this->multi_h, $this->multi_still_run);
+            \curl_multi_exec($this->multi_h, $this->multi_still_run);
         }
         foreach ($changed_slots as $slot) {
             $curl_h = $this->multi_ch[$slot];
@@ -444,7 +443,7 @@ public function slotContentToResults($slot_low)
         if (isset($this->slot_hooks[$slot_low][0])) {
             foreach ($this->slot_hooks[$slot_low] as $k => $hook) {
                 if ($hook['mode'] == 0) {
-                    $ret = \call_user_func(
+                    $this->slot_data[$slot_low]['m0'][] = \call_user_func(
                         $hook['fn'], $this, $slot_low,
                         isset($hook['par']) ? $hook['par'] : null
                     );

tests/src/ClickHouseAPITest.php

@@ -54,9 +54,6 @@ protected function resetServerUrl()
             $clickhouse_url = null;
         }
         $ch->setServerUrl($clickhouse_url);
-        if (!is_null($clickhouse_url)) {
-            $ch->isSupported('session_id', false, true);
-        }
     }
 
     /**
@@ -438,6 +435,7 @@ public function testYiDoApiCall()
 
             $ch->query("DROP TABLE IF EXISTS $table");
             unlink($file);
+            unlink($file . '.gz');
             $slot = "tmp1";
             $ans = $ch->toSlot($slot)->doApiCall(false, ['query'=>'SELECT 123']);
             $this->assertEquals(102, $ans['code']);

tests/src/ClickHouseFunctionsTest.php

@@ -25,9 +25,6 @@ protected function setUp()
             $clickhouse_url = null;
         }
         $this->object = new ClickHouseFunctions($clickhouse_url);
-        if (!is_null($clickhouse_url)) {
-            $this->object->isSupported('session_id', false, true);
-        }
     }
 
     /**
@@ -555,6 +552,7 @@ public function testClearTable()
 
             $ans = $ch->clearTable('system.numbers');
             $this->assertTrue(\is_string($ans));
+            $ch->last_yi->next();
 
             $ans = $ch->createTableQuick($table, [
                 'id' => 'Int16',

tests/src/ClickHouseQueryTest.php

@@ -34,9 +34,6 @@ protected function resetServerUrl()
             $clickhouse_url = null;
         }
         $ch->setServerUrl($clickhouse_url);
-        if (!is_null($clickhouse_url)) {
-            $ch->isSupported('session_id', false, true);
-        }
     }
 
     /**