smi2 / phpClickHouse

src/Cluster.php

Spacing +38 added lines, -38 removed lines

@@ -42,7 +42,7 @@ 
     /**
      * @var int|float
      */
-    private $scanTimeOut=10;
+    private $scanTimeOut = 10;
 
     /**
      * @var array
@@ -77,7 +77,7 @@ 
      *
      * @var array
      */
-    private $_table_size_cache=[];
+    private $_table_size_cache = [];
 
     /**
      * Cluster constructor.
@@ -191,7 +191,7 @@ 
 
             // @todo : rewrite total_replicas=1 если кластер без реплики , нужно проверять какой класте и сколько в нем реплик
 //            if ($replica['total_replicas']<2) {$ok=false;$this->error[]='total_replicas : '.json_encode($replica);}
-            if ($this->softCheck )
+            if ($this->softCheck)
             {
                 if (!$ok) break;
                 continue;
@@ -262,7 +262,7 @@ 
             $statementsClusters[$node]->getRequest()->setDnsCache(0)->timeOut($this->scanTimeOut)->connectTimeOut($this->scanTimeOut);
         }
         $this->defaultClient()->executeAsync();
-        $tables=[];
+        $tables = [];
 
         foreach ($this->nodes as $node) {
 
@@ -270,16 +270,16 @@ 
             try {
                 $r = $statementsReplicas[$node]->rows();
                 foreach ($r as $row) {
-                    $tables[$row['database']][$row['table']][$node] =$row;
+                    $tables[$row['database']][$row['table']][$node] = $row;
                 }
                 $result['replicas'][$node] = $r;
-            } catch (\Exception $E) {
+            }catch (\Exception $E) {
                 $result['replicas'][$node] = false;
                 $badNodes[$node] = $E->getMessage();
                 $this->error[] = 'statementsReplicas:' . $E->getMessage();
             }
             // ---------------------------------------------------------------------------------------------------
-            $hosts=[];
+            $hosts = [];
 
             try {
                 $c = $statementsClusters[$node]->rows();
@@ -295,7 +295,7 @@ 
                         ];
                 }
 
-            } catch (\Exception $E) {
+            }catch (\Exception $E) {
                 $result['clusters'][$node] = false;
 
                 $this->error[] = 'clusters:' . $E->getMessage();
@@ -363,22 +363,22 @@ 
      * @return Client
      * @throws Exception\TransportException
      */
-    public function clientLike($cluster,$ip_addr_like)
+    public function clientLike($cluster, $ip_addr_like)
     {
-        $nodes_check=$this->nodes;
-        $nodes=$this->getClusterNodes($cluster);
-        $list_ips_need=explode(';',$ip_addr_like);
-        $find=false;
-        foreach($list_ips_need as $like)
+        $nodes_check = $this->nodes;
+        $nodes = $this->getClusterNodes($cluster);
+        $list_ips_need = explode(';', $ip_addr_like);
+        $find = false;
+        foreach ($list_ips_need as $like)
         {
             foreach ($nodes as $node)
             {
 
-                if (stripos($node,$like)!==false)
+                if (stripos($node, $like) !== false)
                 {
-                    if (in_array($node,$nodes_check))
+                    if (in_array($node, $nodes_check))
                     {
-                        $find=$node;
+                        $find = $node;
                     }
                     else
                     {
@@ -390,8 +390,8 @@ 
             }
             if ($find) break;
         }
-        if (!$find){
-            $find=$nodes[0];
+        if (!$find) {
+            $find = $nodes[0];
         }
         return $this->client($find);
     }
@@ -471,10 +471,10 @@ 
      * @return array
      * @throws Exception\TransportException
      */
-    public function getTables($resultDetail=false)
+    public function getTables($resultDetail = false)
     {
         $this->connect();
-        $list=[];
+        $list = [];
         foreach ($this->tables as $db_name=>$tables)
         {
             foreach ($tables as $table_name=>$nodes)
@@ -482,11 +482,11 @@ 
 
                 if ($resultDetail)
                 {
-                    $list[$db_name.'.'.$table_name]=$nodes;
+                    $list[$db_name . '.' . $table_name] = $nodes;
                 }
                 else
                 {
-                    $list[$db_name.'.'.$table_name]=array_keys($nodes);
+                    $list[$db_name . '.' . $table_name] = array_keys($nodes);
                 }
             }
         }
@@ -503,23 +503,23 @@ 
      */
     public function getSizeTable($database_table)
     {
-       $nodes=$this->getNodesByTable($database_table);
+       $nodes = $this->getNodesByTable($database_table);
         // scan need node`s
         foreach ($nodes as $node)
         {
             if (empty($this->_table_size_cache[$node]))
             {
-                $this->_table_size_cache[$node]=$this->client($node)->tablesSize(true);
+                $this->_table_size_cache[$node] = $this->client($node)->tablesSize(true);
             }
         }
 
-        $sizes=[];
+        $sizes = [];
         foreach ($this->_table_size_cache as $node=>$rows)
         {
             foreach ($rows as $row)
             {
-                $sizes[$row['database'].'.'.$row['table']][$node]=$row;
-                @$sizes[$row['database'].'.'.$row['table']]['total']['sizebytes']+=$row['sizebytes'];
+                $sizes[$row['database'] . '.' . $row['table']][$node] = $row;
+                @$sizes[$row['database'] . '.' . $row['table']]['total']['sizebytes'] += $row['sizebytes'];
 
 
 
@@ -541,17 +541,17 @@ 
      * @return array
      * @throws Exception\TransportException
      */
-    public function truncateTable($database_table,$timeOut=2000)
+    public function truncateTable($database_table, $timeOut = 2000)
     {
-        $out=[];
-        list($db,$table)=explode('.',$database_table);
-        $nodes=$this->getMasterNodeForTable($database_table);
+        $out = [];
+        list($db, $table) = explode('.', $database_table);
+        $nodes = $this->getMasterNodeForTable($database_table);
         // scan need node`s
         foreach ($nodes as $node)
         {
-            $def=$this->client($node)->getTimeout();
+            $def = $this->client($node)->getTimeout();
             $this->client($node)->database($db)->setTimeout($timeOut);
-            $out[$node]=$this->client($node)->truncateTable($table);
+            $out[$node] = $this->client($node)->truncateTable($table);
             $this->client($node)->setTimeout($def);
         }
         return $out;
@@ -566,15 +566,15 @@ 
      */
     public function getMasterNodeForTable($database_table)
     {
-        $list=$this->getTables(true);
+        $list = $this->getTables(true);
 
         if (empty($list[$database_table])) return [];
 
 
-        $result=[];
+        $result = [];
         foreach ($list[$database_table] as $node=>$row)
         {
-            if ($row['is_leader']) $result[]=$node;
+            if ($row['is_leader']) $result[] = $node;
         }
         return $result;
     }
@@ -587,7 +587,7 @@ 
      */
     public function getNodesByTable($database_table)
     {
-        $list=$this->getTables();
+        $list = $this->getTables();
         if (empty($list[$database_table])) {
             throw new QueryException('Not find :' . $database_table);
         }

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);
     }
 
     /**
@@ -446,9 +446,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);
     }
 
     /**
@@ -485,7 +485,7 @@ 
      */
     public function showCreateTable($table)
     {
-        return ($this->select('SHOW CREATE TABLE '.$table)->fetchOne('statement'));
+        return ($this->select('SHOW CREATE TABLE ' . $table)->fetchOne('statement'));
     }
 
     /**
@@ -545,17 +545,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)];
         }
@@ -588,7 +588,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');
     }
 
     /**
@@ -601,17 +601,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');
         }
@@ -620,17 +620,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);
@@ -657,25 +657,25 @@ 
      * @param string $format ['TabSeparated','TabSeparatedWithNames','CSV','CSVWithNames']
      * @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;
 
         }
 
@@ -742,9 +742,9 @@ 
      * @throws Exception\TransportException
      * @throws \Exception
      */
-    public function tablesSize($flatList=false)
+    public function tablesSize($flatList = false)
     {
-        $z=$this->select('
+        $z = $this->select('
         SELECT name as table,database,
             max(sizebytes) as sizebytes,
             max(size) as size,
@@ -764,7 +764,7 @@ 
             ) USING ( table,database )
             WHERE database=:database
             GROUP BY table,database
-        ', [ 'database'=>$this->settings()->getDatabase() ]);
+        ', ['database'=>$this->settings()->getDatabase()]);
 
         if ($flatList) {
             return $z->rows();
@@ -786,12 +786,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');
     }
 
@@ -810,7 +810,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');
     }
@@ -826,8 +826,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
@@ -845,12 +845,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;
     }
@@ -885,9 +885,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;