smi2 / phpClickHouse

src/Client.php

Spacing +44 added lines, -44 removed lines

@@ -39,11 +39,11 @@ 
     /**
      * @var bool
      */
-    private $_connect_user_readonly=false;
+    private $_connect_user_readonly = false;
     /**
      * @var array
      */
-    private $_support_format=['TabSeparated','TabSeparatedWithNames','CSV','CSVWithNames','JSONEachRow'];
+    private $_support_format = ['TabSeparated', 'TabSeparatedWithNames', 'CSV', 'CSVWithNames', 'JSONEachRow'];
 
     /**
      * Client constructor.
@@ -120,7 +120,7 @@ 
      */
     public function setReadOnlyUser($flag)
     {
-        $this->_connect_user_readonly=$flag;
+        $this->_connect_user_readonly = $flag;
         $this->settings()->setReadOnlyUser($this->_connect_user_readonly);
     }
     /**
@@ -163,10 +163,10 @@ 
 
         if (is_array($host))
         {
-            $host=array_rand(array_flip($host));
+            $host = array_rand(array_flip($host));
         }
 
-        $this->_connect_host=$host;
+        $this->_connect_host = $host;
         $this->transport()->setHost($host);
     }
 
@@ -289,7 +289,7 @@ 
     /**
      * @return $this
      */
-    public function useSession($useSessionId=false)
+    public function useSession($useSessionId = false)
     {
         if (!$this->settings()->getSessionId())
         {
@@ -346,7 +346,7 @@ 
      */
     public function enableLogQueries($flag = true)
     {
-        $this->settings()->set('log_queries',intval($flag));
+        $this->settings()->set('log_queries', intval($flag));
         return $this;
     }
 
@@ -368,7 +368,7 @@ 
      * @param bool $flag
      * @return $this
      */
-    public function https($flag=true)
+    public function https($flag = true)
     {
         $this->settings()->https($flag);
         return $this;
@@ -382,7 +382,7 @@ 
      */
     public function enableExtremes($flag = true)
     {
-        $this->settings()->set('extremes',intval($flag));
+        $this->settings()->set('extremes', intval($flag));
         return $this;
     }
 
@@ -397,9 +397,9 @@ 
      * @throws Exception\TransportException
      * @throws \Exception
      */
-    public function select($sql, $bindings = [], $whereInFile = null, $writeToFile=null)
+    public function select($sql, $bindings = [], $whereInFile = null, $writeToFile = null)
     {
-        return $this->transport()->select($sql, $bindings, $whereInFile,$writeToFile);
+        return $this->transport()->select($sql, $bindings, $whereInFile, $writeToFile);
     }
 
     /**
@@ -445,9 +445,9 @@ 
      * @throws Exception\TransportException
      * @throws \Exception
      */
-    public function selectAsync($sql, $bindings = [], $whereInFile = null,$writeToFile=null)
+    public function selectAsync($sql, $bindings = [], $whereInFile = null, $writeToFile = null)
     {
-        return $this->transport()->selectAsync($sql, $bindings, $whereInFile,$writeToFile);
+        return $this->transport()->selectAsync($sql, $bindings, $whereInFile, $writeToFile);
     }
 
     /**
@@ -484,7 +484,7 @@ 
      */
     public function showCreateTable($table)
     {
-        return ($this->select('SHOW CREATE TABLE '.$table)->fetchOne('statement'));
+        return ($this->select('SHOW CREATE TABLE ' . $table)->fetchOne('statement'));
     }
 
     /**
@@ -544,17 +544,17 @@ 
       */
     public function prepareInsertAssocBulk(array $values)
     {
-        if (isset($values[0]) && is_array($values[0])){ //случай, когда много строк вставляется
+        if (isset($values[0]) && is_array($values[0])) { //случай, когда много строк вставляется
             $preparedFields = array_keys($values[0]);
             $preparedValues = [];
-            foreach ($values as $idx => $row){
+            foreach ($values as $idx => $row) {
                 $_fields = array_keys($row);
-                if ($_fields !== $preparedFields){
-                    throw new QueryException("Fields not match: ".implode(',',$_fields)." and ".implode(',', $preparedFields)." on element $idx");
+                if ($_fields !== $preparedFields) {
+                    throw new QueryException("Fields not match: " . implode(',', $_fields) . " and " . implode(',', $preparedFields) . " on element $idx");
                 }
                 $preparedValues[] = array_values($row);
             }
-        }else{ //одна строка
+        } else { //одна строка
             $preparedFields = array_keys($values);
             $preparedValues = [array_values($values)];
         }
@@ -587,7 +587,7 @@ 
      */
     public function insertBatchTSVFiles($table_name, $file_names, $columns_array)
     {
-        return $this->insertBatchFiles($table_name,$file_names,$columns_array,'TabSeparated');
+        return $this->insertBatchFiles($table_name, $file_names, $columns_array, 'TabSeparated');
     }
 
     /**
@@ -600,17 +600,17 @@ 
      * @return array
      * @throws Exception\TransportException
      */
-    public function insertBatchFiles($table_name, $file_names, $columns_array,$format="CSV")
+    public function insertBatchFiles($table_name, $file_names, $columns_array, $format = "CSV")
     {
         if (is_string($file_names))
         {
-            $file_names=[$file_names];
+            $file_names = [$file_names];
         }
         if ($this->getCountPendingQueue() > 0) {
             throw new QueryException('Queue must be empty, before insertBatch, need executeAsync');
         }
 
-        if (!in_array($format,$this->_support_format))
+        if (!in_array($format, $this->_support_format))
         {
             throw new QueryException('Format not support in insertBatchFiles');
         }
@@ -619,17 +619,17 @@ 
 
         foreach ($file_names as $fileName) {
             if (!is_file($fileName) || !is_readable($fileName)) {
-                throw  new QueryException('Cant read file: ' . $fileName.' '.(is_file($fileName)?'':' is not file'));
+                throw  new QueryException('Cant read file: ' . $fileName . ' ' . (is_file($fileName) ? '' : ' is not file'));
             }
 
             if (!$columns_array)
             {
-                $sql = 'INSERT INTO ' . $table_name . ' FORMAT '.$format;
+                $sql = 'INSERT INTO ' . $table_name . ' FORMAT ' . $format;
 
             }
             else
             {
-                $sql = 'INSERT INTO ' . $table_name . ' ( ' . implode(',', $columns_array) . ' ) FORMAT '.$format;
+                $sql = 'INSERT INTO ' . $table_name . ' ( ' . implode(',', $columns_array) . ' ) FORMAT ' . $format;
 
             }
             $result[$fileName] = $this->transport()->writeAsyncCSV($sql, $fileName);
@@ -656,25 +656,25 @@ 
      * @param string $format
      * @return Transport\CurlerRequest
      */
-    public function insertBatchStream($table_name, $columns_array,$format="CSV")
+    public function insertBatchStream($table_name, $columns_array, $format = "CSV")
     {
         if ($this->getCountPendingQueue() > 0) {
             throw new QueryException('Queue must be empty, before insertBatch, need executeAsync');
         }
 
-        if (!in_array($format,$this->_support_format))
+        if (!in_array($format, $this->_support_format))
         {
             throw new QueryException('Format not support in insertBatchFiles');
         }
 
         if (!$columns_array)
         {
-            $sql = 'INSERT INTO ' . $table_name . ' FORMAT '.$format;
+            $sql = 'INSERT INTO ' . $table_name . ' FORMAT ' . $format;
 
         }
         else
         {
-            $sql = 'INSERT INTO ' . $table_name . ' ( ' . implode(',', $columns_array) . ' ) FORMAT '.$format;
+            $sql = 'INSERT INTO ' . $table_name . ' ( ' . implode(',', $columns_array) . ' ) FORMAT ' . $format;
 
         }
 
@@ -739,16 +739,16 @@ 
      * @throws Exception\TransportException
      * @throws \Exception
      */
-    public function tablesSize($flatList=false)
+    public function tablesSize($flatList = false)
     {
-        $z=$this->select('
+        $z = $this->select('
             SELECT table,database,
             formatReadableSize(sum(bytes)) as size,
             sum(bytes) as sizebytes,
             min(min_date) as min_date,
             max(max_date) as max_date
             FROM system.parts 
-            WHERE active AND database=\''.$this->settings()->getDatabase().'\'
+            WHERE active AND database=\''.$this->settings()->getDatabase() . '\'
             GROUP BY table,database
         ');
 
@@ -771,12 +771,12 @@ 
      * @throws Exception\TransportException
      * @throws \Exception
      */
-    public function isExists($database,$table)
+    public function isExists($database, $table)
     {
         return $this->select('
             SELECT *
             FROM system.tables 
-            WHERE name=\''.$table.'\' AND database=\''.$database.'\''
+            WHERE name=\''.$table . '\' AND database=\'' . $database . '\''
         )->rowsAsTree('name');
     }
 
@@ -795,7 +795,7 @@ 
         return $this->select('
             SELECT *
             FROM system.parts 
-            WHERE like(table,\'%' . $table . '%\') AND database=\''.$this->settings()->getDatabase().'\' 
+            WHERE like(table,\'%' . $table . '%\') AND database=\'' . $this->settings()->getDatabase() . '\' 
             ORDER BY max_date ' . ($limit > 0 ? ' LIMIT ' . intval($limit) : '')
         )->rowsAsTree('name');
     }
@@ -810,8 +810,8 @@ 
     public function dropPartition($dataBaseTableName, $partition_id)
     {
 
-        $partition_id=trim($partition_id,'\'');
-        $this->settings()->set('replication_alter_partitions_sync',2);
+        $partition_id = trim($partition_id, '\'');
+        $this->settings()->set('replication_alter_partitions_sync', 2);
         $state = $this->write('ALTER TABLE {dataBaseTableName} DROP PARTITION :partion_id', [
             'dataBaseTableName'  => $dataBaseTableName,
             'partion_id' => $partition_id
@@ -829,12 +829,12 @@ 
      */
     public function truncateTable($tableName)
     {
-        $partions=$this->partitions($tableName);
-        $out=[];
+        $partions = $this->partitions($tableName);
+        $out = [];
         foreach ($partions as $part_key=>$part)
         {
-            $part_id=$part['partition'];
-            $out[$part_id]=$this->dropPartition($tableName,$part_id);
+            $part_id = $part['partition'];
+            $out[$part_id] = $this->dropPartition($tableName, $part_id);
         }
         return $out;
     }
@@ -869,9 +869,9 @@ 
             }
         }
 
-        $result=[];
+        $result = [];
         foreach ($drop as $partition_id) {
-            $result[$partition_id]=$this->dropPartition($table_name, $partition_id);
+            $result[$partition_id] = $this->dropPartition($table_name, $partition_id);
         }
 
         return $result;

src/Transport/Http.php

Spacing +17 added lines, -17 removed lines

@@ -61,7 +61,7 @@ 
     /**
      * @var bool
      */
-    private $xClickHouseProgress=false;
+    private $xClickHouseProgress = false;
 
     /**
      * Http constructor.
@@ -113,10 +113,10 @@ 
      */
     public function getUri()
     {
-        $proto='http';
-        if ($this->settings()->isHttps()) $proto='https';
+        $proto = 'http';
+        if ($this->settings()->isHttps()) $proto = 'https';
 
-        return $proto.'://' . $this->_host . ':' . $this->_port;
+        return $proto . '://' . $this->_host . ':' . $this->_port;
     }
 
     /**
@@ -185,7 +185,7 @@ 
         }
 
         $new->timeOut($this->settings()->getTimeOut());
-        $new->connectTimeOut($this->_connectTimeOut)->keepAlive();// one sec
+        $new->connectTimeOut($this->_connectTimeOut)->keepAlive(); // one sec
         $new->verbose($this->_verbose);
 
         return $new;
@@ -279,7 +279,7 @@ 
         $request = $this->newRequest($extendinfo);
         $request->url($url);
 
-        $request->setCallbackFunction(function (CurlerRequest $request) {
+        $request->setCallbackFunction(function(CurlerRequest $request) {
             fclose($request->getInfileHandle());
         });
 
@@ -322,29 +322,29 @@ 
 
     public function __findXClickHouseProgress($handle)
     {
-        $code=curl_getinfo($handle,CURLINFO_HTTP_CODE);
+        $code = curl_getinfo($handle, CURLINFO_HTTP_CODE);
 
         // Search X-ClickHouse-Progress
-        if ($code==200) {
+        if ($code == 200) {
             $response = curl_multi_getcontent($handle);
             $header_size = curl_getinfo($handle, CURLINFO_HEADER_SIZE);
             if (!$header_size) return false;
 
             $header = substr($response, 0, $header_size);
             if (!$header_size) return false;
-            $pos=strrpos($header,'X-ClickHouse-Progress');
+            $pos = strrpos($header, 'X-ClickHouse-Progress');
 
             if (!$pos) return false;
 
-            $last=substr($header,$pos);
-            $data=@json_decode(str_ireplace('X-ClickHouse-Progress:','',$last),true);
+            $last = substr($header, $pos);
+            $data = @json_decode(str_ireplace('X-ClickHouse-Progress:', '', $last), true);
 
             if ($data && is_callable($this->xClickHouseProgress)) {
 
-                if (is_array($this->xClickHouseProgress)){
-                    call_user_func_array($this->xClickHouseProgress,[$data]);
+                if (is_array($this->xClickHouseProgress)) {
+                    call_user_func_array($this->xClickHouseProgress, [$data]);
                 } else {
-                    call_user_func($this->xClickHouseProgress,$data);
+                    call_user_func($this->xClickHouseProgress, $data);
                 }
 
 
@@ -407,13 +407,13 @@ 
             }
 
 
-            $request->setResultFileHandle($fout, $isGz)->setCallbackFunction(function (CurlerRequest $request) {
+            $request->setResultFileHandle($fout, $isGz)->setCallbackFunction(function(CurlerRequest $request) {
                 fclose($request->getResultFileHandle());
             });
         }
         if ($this->xClickHouseProgress)
         {
-            $request->setFunctionProgress([$this,'__findXClickHouseProgress']);
+            $request->setFunctionProgress([$this, '__findXClickHouseProgress']);
         }
         // ---------------------------------------------------------------------------------
         return $request;
@@ -541,7 +541,7 @@ 
      */
     public function setProgressFunction(callable $callback)
     {
-        $this->xClickHouseProgress=$callback;
+        $this->xClickHouseProgress = $callback;
     }
 
     /**