smi2 / phpClickHouse

src/Cluster.php

Braces +29 added lines, -13 removed lines

@@ -193,7 +193,9 @@ 
 //            if ($replica['total_replicas']<2) {$ok=false;$this->error[]='total_replicas : '.json_encode($replica);}
             if ($this->softCheck )
             {
-                if (!$ok) break;
+                if (!$ok) {
+                    break;
+                }
                 continue;
             }
 
@@ -209,7 +211,9 @@ 
                 $ok = false;
                 $this->error[] = 'log_max_index : ' . json_encode($replica);
             }
-            if (!$ok) break;
+            if (!$ok) {
+                break;
+            }
         }
         return $ok;
     }
@@ -308,7 +312,9 @@ 
             // Let's check that replication goes well
             $rIsOk = $this->isReplicasWork($result['replicas'][$node]);
             $result['replicasIsOk'][$node] = $rIsOk;
-            if (!$rIsOk) $replicasIsOk = false;
+            if (!$rIsOk) {
+                $replicasIsOk = false;
+            }
             // ---------------------------------------------------------------------------------------------------
         }
 
@@ -328,7 +334,9 @@ 
             $this->error[] = 'Have bad node : ' . json_encode($this->badNodes);
             $this->replicasIsOk = false;
         }
-        if (!sizeof($this->error)) $this->error = false;
+        if (!sizeof($this->error)) {
+            $this->error = false;
+        }
         $this->resultScan = $result;
         // @todo  : We connect to everyone in the DNS list, we need to decry that the requests were returned by all the hosts to which we connected
         return $this;
@@ -376,16 +384,19 @@ 
                     if (in_array($node,$nodes_check))
                     {
                         $find=$node;
-                    }
-                    else
+                    } else
                     {
                         // node exists on cluster, but not check
                     }
 
                 }
-                if ($find) break;
+                if ($find) {
+                    break;
+                }
+            }
+            if ($find) {
+                break;
             }
-            if ($find) break;
         }
         if (!$find){
             $find=$nodes[0];
@@ -435,7 +446,9 @@ 
     public function getClusterInfoTable($cluster)
     {
         $this->connect();
-        if (empty($this->resultScan['cluster.list'][$cluster])) throw new QueryException('Cluster not find:' . $cluster);
+        if (empty($this->resultScan['cluster.list'][$cluster])) {
+            throw new QueryException('Cluster not find:' . $cluster);
+        }
         return $this->resultScan['cluster.list'][$cluster];
     }
 
@@ -474,8 +487,7 @@ 
                 if ($resultDetail)
                 {
                     $list[$db_name.'.'.$table_name]=$nodes;
-                }
-                else
+                } else
                 {
                     $list[$db_name.'.'.$table_name]=array_keys($nodes);
                 }
@@ -557,13 +569,17 @@ 
     {
         $list=$this->getTables(true);
 
-        if (empty($list[$database_table])) return [];
+        if (empty($list[$database_table])) {
+            return [];
+        }
 
 
         $result=[];
         foreach ($list[$database_table] as $node=>$row)
         {
-            if ($row['is_leader']) $result[]=$node;
+            if ($row['is_leader']) {
+                $result[]=$node;
+            }
         }
         return $result;
     }

Indentation +1 added lines, -1 removed lines

@@ -503,7 +503,7 @@
      */
     public function getSizeTable($database_table)
     {
-       $nodes=$this->getNodesByTable($database_table);
+        $nodes=$this->getNodesByTable($database_table);
         // scan need node`s
         foreach ($nodes as $node)
         {

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/Settings.php

Spacing +4 added lines, -4 removed lines

@@ -16,12 +16,12 @@ 
      */
     private $settings = [];
 
-    private $_ReadOnlyUser=false;
+    private $_ReadOnlyUser = false;
 
     /**
      * @var bool
      */
-    private $_isHttps=false;
+    private $_isHttps = false;
 
     /**
      * Settings constructor.
@@ -116,7 +116,7 @@ 
     }
 
 
-    public function https($flag=true)
+    public function https($flag = true)
     {
         $this->set('https', $flag);
         return $this;
@@ -201,7 +201,7 @@ 
      */
     public function setReadOnlyUser($flag)
     {
-        $this->_ReadOnlyUser=$flag;
+        $this->_ReadOnlyUser = $flag;
     }
 
     /**

Braces +6 added lines, -2 removed lines

@@ -47,7 +47,9 @@ 
      */
     public function get($key)
     {
-        if (!$this->is($key)) return null;
+        if (!$this->is($key)) {
+            return null;
+        }
         return $this->settings[$key];
     }
 
@@ -153,7 +155,9 @@ 
      */
     public function getSessionId()
     {
-        if (empty($this->settings['session_id'])) return false;
+        if (empty($this->settings['session_id'])) {
+            return false;
+        }
         return $this->get('session_id');
     }
 

src/Query/Query.php

Braces +4 added lines, -3 removed lines

@@ -49,7 +49,9 @@ 
     private function applyFormatQuery()
     {
         // FORMAT\s(\w)*$
-        if (null === $this->format) return false;
+        if (null === $this->format) {
+            return false;
+        }
         $supportFormats=
             "FORMAT\\s+TSV|FORMAT\\s+TSVRaw|FORMAT\\s+TSVWithNames|FORMAT\\s+TSVWithNamesAndTypes|FORMAT\\s+Vertical|FORMAT\\s+JSONCompact|FORMAT\\s+JSONEachRow|FORMAT\\s+TSKV|FORMAT\\s+TabSeparatedWithNames|FORMAT\\s+TabSeparatedWithNamesAndTypes|FORMAT\\s+TabSeparatedRaw|FORMAT\\s+BlockTabSeparated|FORMAT\\s+CSVWithNames|FORMAT\\s+CSV|FORMAT\\s+JSON|FORMAT\\s+TabSeparated";
 
@@ -63,8 +65,7 @@ 
                 $this->format=trim(str_ireplace('format','',$matches[0][0]));
 
             }
-        }
-        else {
+        } else {
             $this->sql = $this->sql . ' FORMAT ' . $this->format;
         }
 

Spacing +8 added lines, -8 removed lines

@@ -20,21 +20,21 @@ 
     /**
      * @var array
      */
-    private $degenerations=[];
+    private $degenerations = [];
 
     /**
      * Query constructor.
      * @param string $sql
      * @param array $degenerations
      */
-    public function __construct($sql,$degenerations=[])
+    public function __construct($sql, $degenerations = [])
     {
         if (!trim($sql))
         {
             throw new QueryException('Empty Query');
         }
         $this->sql = $sql;
-        $this->degenerations=$degenerations;
+        $this->degenerations = $degenerations;
     }
 
     /**
@@ -50,17 +50,17 @@ 
     {
         // FORMAT\s(\w)*$
         if (null === $this->format) return false;
-        $supportFormats=
+        $supportFormats =
             "FORMAT\\s+TSV|FORMAT\\s+TSVRaw|FORMAT\\s+TSVWithNames|FORMAT\\s+TSVWithNamesAndTypes|FORMAT\\s+Vertical|FORMAT\\s+JSONCompact|FORMAT\\s+JSONEachRow|FORMAT\\s+TSKV|FORMAT\\s+TabSeparatedWithNames|FORMAT\\s+TabSeparatedWithNamesAndTypes|FORMAT\\s+TabSeparatedRaw|FORMAT\\s+BlockTabSeparated|FORMAT\\s+CSVWithNames|FORMAT\\s+CSV|FORMAT\\s+JSON|FORMAT\\s+TabSeparated";
 
-        $matches=[];
-        if (preg_match_all('%('.$supportFormats.')%ius',$this->sql,$matches)){
+        $matches = [];
+        if (preg_match_all('%(' . $supportFormats . ')%ius', $this->sql, $matches)) {
 
             // skip add "format json"
             if (isset($matches[0]))
             {
 
-                $this->format=trim(str_ireplace('format','',$matches[0][0]));
+                $this->format = trim(str_ireplace('format', '', $matches[0][0]));
 
             }
         }
@@ -95,7 +95,7 @@ 
             foreach ($this->degenerations as $degeneration)
             {
                 if ($degeneration instanceof Degeneration) {
-                    $this->sql=$degeneration->process($this->sql);
+                    $this->sql = $degeneration->process($this->sql);
                 }
             }
         }

src/Statement.php

Braces +15 added lines, -15 removed lines

@@ -167,13 +167,11 @@ 
 
             if ($parse) {
                 throw new DatabaseException($parse['message'] . "\nIN:" . $this->sql(), $parse['code']);
-            }
-            else {
+            } else {
                 $code = $this->response()->http_code();
                 $message = "HttpCode:" . $this->response()->http_code() . " ; ".$this->response()->error()." ;" . $body;
             }
-        }
-        else {
+        } else {
             $code = $error_no;
             $message = $this->response()->error();
         }
@@ -349,8 +347,12 @@ 
         $this->init();
         if ($key)
         {
-            if (!is_array($this->statistics)) return null;
-            if (!isset($this->statistics[$key])) return null;
+            if (!is_array($this->statistics)) {
+                return null;
+            }
+            if (!isset($this->statistics[$key])) {
+                return null;
+            }
             return $this->statistics[$key];
         }
         return $this->statistics;
@@ -394,8 +396,7 @@ 
             if ($key) {
                 if (isset($this->array_data[0][$key])) {
                     return $this->array_data[0][$key];
-                }
-                else {
+                } else {
                     return null;
                 }
             }
@@ -489,16 +490,14 @@ 
     {
         if (is_array($path)) {
             $keys = $path;
-        }
-        else {
+        } else {
             $args = func_get_args();
             array_shift($args);
 
             if (sizeof($args) < 2) {
                 $separator = '.';
                 $keys = explode($separator, $path);
-            }
-            else {
+            } else {
                 $keys = $args;
             }
         }
@@ -510,14 +509,15 @@ 
 
             if (isset($arr[$key])) {
                 $val = $arr[$key];
-            }
-            else {
+            } else {
                 $val = $key;
             }
 
             $tree = array($val => $tree);
         }
-        if (!is_array($tree)) return [];
+        if (!is_array($tree)) {
+            return [];
+        }
         return $tree;
     }
 }

Spacing +5 added lines, -5 removed lines

@@ -83,7 +83,7 @@ 
     /**
      * @var array|null
      */
-    private $statistics=null;
+    private $statistics = null;
 
 
     public function __construct(CurlerRequest $request)
@@ -160,7 +160,7 @@ 
 
         $body = $this->response()->body();
         $error_no = $this->response()->error_no();
-        $error=$this->response()->error();
+        $error = $this->response()->error();
 
         if (!$error_no && !$error) {
             $parse = $this->parseErrorClickHouse($body);
@@ -170,7 +170,7 @@ 
             }
             else {
                 $code = $this->response()->http_code();
-                $message = "HttpCode:" . $this->response()->http_code() . " ; ".$this->response()->error()." ;" . $body;
+                $message = "HttpCode:" . $this->response()->http_code() . " ; " . $this->response()->error() . " ;" . $body;
             }
         }
         else {
@@ -227,7 +227,7 @@ 
             return false;
         }
 
-        foreach (['meta', 'data', 'totals', 'extremes', 'rows', 'rows_before_limit_at_least','statistics'] as $key) {
+        foreach (['meta', 'data', 'totals', 'extremes', 'rows', 'rows_before_limit_at_least', 'statistics'] as $key) {
             if (isset($this->_rawData[$key])) {
                 $this->{$key} = $this->_rawData[$key];
             }
@@ -344,7 +344,7 @@ 
      * @return array|mixed|null
      * @throws Exception\TransportException
      */
-    public function statistics($key=false)
+    public function statistics($key = false)
     {
         $this->init();
         if ($key)