smi2 / phpClickHouse

src/Transport/CurlerResponse.php

Spacing +5 added lines, -5 removed lines

@@ -70,7 +70,7 @@ 
      */
     public function total_time()
     {
-        return round($this->_info['total_time'],3);
+        return round($this->_info['total_time'], 3);
     }
 
     /**
@@ -78,7 +78,7 @@ 
      */
     public function starttransfer_time()
     {
-        return round($this->_info['starttransfer_time'],3);
+        return round($this->_info['starttransfer_time'], 3);
     }
 
     /**
@@ -86,7 +86,7 @@ 
      */
     public function connect_time()
     {
-        return round($this->_info['connect_time'],3);
+        return round($this->_info['connect_time'], 3);
     }
 
     /**
@@ -94,7 +94,7 @@ 
      */
     public function pretransfer_time()
     {
-        return round($this->_info['pretransfer_time'],3);
+        return round($this->_info['pretransfer_time'], 3);
     }
 
     /**
@@ -289,7 +289,7 @@ 
      */
     public function rawDataOrJson($format)
     {
-        if (stripos($format,'json')!==false)
+        if (stripos($format, 'json') !== false)
         {
             return $this->json();
         }

src/Transport/Http.php

Braces +12 added lines, -4 removed lines

@@ -114,7 +114,9 @@ 
     public function getUri()
     {
         $proto='http';
-        if ($this->settings()->isHttps()) $proto='https';
+        if ($this->settings()->isHttps()) {
+            $proto='https';
+        }
 
         return $proto.'://' . $this->_host . ':' . $this->_port;
     }
@@ -328,13 +330,19 @@ 
         if ($code==200) {
             $response = curl_multi_getcontent($handle);
             $header_size = curl_getinfo($handle, CURLINFO_HEADER_SIZE);
-            if (!$header_size) return false;
+            if (!$header_size) {
+                return false;
+            }
 
             $header = substr($response, 0, $header_size);
-            if (!$header_size) return false;
+            if (!$header_size) {
+                return false;
+            }
             $pos=strrpos($header,'X-ClickHouse-Progress');
 
-            if (!$pos) return false;
+            if (!$pos) {
+                return false;
+            }
 
             $last=substr($header,$pos);
             $data=@json_decode(str_ireplace('X-ClickHouse-Progress:','',$last),true);

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;
     }
 
     /**

src/Cluster.php

Indentation +2 added lines, -2 removed lines

@@ -493,8 +493,8 @@
      */
     public function getSizeTable($database_table)
     {
-       $list=[];
-       $nodes=$this->getNodesByTable($database_table);
+        $list=[];
+        $nodes=$this->getNodesByTable($database_table);
         // scan need node`s
         foreach ($nodes as $node)
         {

Spacing +39 added lines, -39 removed lines

@@ -42,7 +42,7 @@ 
     /**
      * @var int
      */
-    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();
@@ -360,22 +360,22 @@ 
     /**
      * @return Client
      */
-    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
                     {
@@ -387,8 +387,8 @@ 
             }
             if ($find) break;
         }
-        if (!$find){
-            $find=$nodes[0];
+        if (!$find) {
+            $find = $nodes[0];
         }
         return $this->client($find);
     }
@@ -462,10 +462,10 @@ 
      *
      * @return array
      */
-    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)
@@ -473,11 +473,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);
                 }
             }
         }
@@ -493,24 +493,24 @@ 
      */
     public function getSizeTable($database_table)
     {
-       $list=[];
-       $nodes=$this->getNodesByTable($database_table);
+       $list = [];
+       $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'];
 
 
 
@@ -531,17 +531,17 @@ 
      * @param $database_table
      * @return array
      */
-    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;
@@ -555,15 +555,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;
     }
@@ -575,7 +575,7 @@ 
      */
     public function getNodesByTable($database_table)
     {
-        $list=$this->getTables();
+        $list = $this->getTables();
         if (empty($list[$database_table])) {
             throw new QueryException('Not find :' . $database_table);
         }

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;
     }

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 +3 added lines, -1 removed lines

@@ -152,7 +152,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');
     }
 

doc/article_01_base.php

Spacing +8 added lines, -8 removed lines

@@ -57,14 +57,14 @@
         [time(), 'CLICKS', 1, 1237, '192.168.1.11', 'Moscow', 'user_11', ''],
         [time(), 'CLICKS', 1, 1237, '192.168.1.13', 'Moscow', 'user_13', ''],
         [time(), 'CLICKS', 1, 1237, '192.168.1.14', 'Moscow', 'user_14', ''],
-        [time(), 'VIEWS',  1, 1237, '192.168.1.11', 'Moscow', 'user_11', ''],
-        [time(), 'VIEWS',  1, 1237, '192.168.1.12', 'Moscow', 'user_12', ''],
-
-        [time(), 'VIEWS',  1, 1237, '192.168.1.1', 'Rwanda',   'user_55', 'http://smi2.ru?utm_campaign=abc'],
-        [time(), 'VIEWS',  1, 1237, '192.168.1.1', 'Banaadir', 'user_54', 'http://smi2.ru?utm_campaign=abc'],
-        [time(), 'VIEWS',  1, 1237, '192.168.1.1', 'Tobruk',   'user_32', 'http://smi2.ru?utm_campaign=CM1'],
-        [time(), 'VIEWS',  1, 1237, '192.168.1.1', 'Gisborne', 'user_12', 'http://smi2.ru?utm_campaign=CM1'],
-        [time(), 'VIEWS',  1, 1237, '192.168.1.1', 'Moscow',   'user_43', 'http://smi2.ru?utm_campaign=CM3'],
+        [time(), 'VIEWS', 1, 1237, '192.168.1.11', 'Moscow', 'user_11', ''],
+        [time(), 'VIEWS', 1, 1237, '192.168.1.12', 'Moscow', 'user_12', ''],
+
+        [time(), 'VIEWS', 1, 1237, '192.168.1.1', 'Rwanda', 'user_55', 'http://smi2.ru?utm_campaign=abc'],
+        [time(), 'VIEWS', 1, 1237, '192.168.1.1', 'Banaadir', 'user_54', 'http://smi2.ru?utm_campaign=abc'],
+        [time(), 'VIEWS', 1, 1237, '192.168.1.1', 'Tobruk', 'user_32', 'http://smi2.ru?utm_campaign=CM1'],
+        [time(), 'VIEWS', 1, 1237, '192.168.1.1', 'Gisborne', 'user_12', 'http://smi2.ru?utm_campaign=CM1'],
+        [time(), 'VIEWS', 1, 1237, '192.168.1.1', 'Moscow', 'user_43', 'http://smi2.ru?utm_campaign=CM3'],
     ],
     ['event_time', 'event_type', 'site_id', 'article_id', 'ip', 'city', 'user_uuid', 'referer']
 );

doc/article_01_bigtable.php

Braces +3 added lines, -1 removed lines

@@ -68,7 +68,9 @@
             'utm' => $userEvent->getUtm(),
         ];
         file_put_contents($fileName, \ClickHouseDB\FormatLine::TSV($row) . "\n", FILE_APPEND);
-        if ($z % 100 == 0) echo "$z\r";
+        if ($z % 100 == 0) {
+            echo "$z\r";
+        }
     }
 
 

doc/article_01_wherein.php

Spacing +8 added lines, -8 removed lines

@@ -56,14 +56,14 @@
         [time(), 'CLICKS', 1, 1237, '192.168.1.13', 'Moscow', 'user_13', ''],
         [time(), 'CLICKS', 1, 1237, '192.168.1.14', 'Moscow', 'user_14', ''],
 
-        [time(), 'VIEWS',  1, 1237, '192.168.1.11', 'Moscow', 'user_11', ''],
-        [time(), 'VIEWS',  1, 1237, '192.168.1.12', 'Moscow', 'user_12', ''],
-
-        [time(), 'VIEWS',  1, 27, '192.168.1.1', 'Rwanda',   'user_55', 'http://smi2.ru?utm_campaign=abc'],
-        [time(), 'VIEWS',  1, 27, '192.168.1.1', 'Banaadir', 'user_54', 'http://smi2.ru?utm_campaign=abc'],
-        [time(), 'VIEWS',  1, 27, '192.168.1.1', 'Tobruk',   'user_32', 'http://smi2.ru?utm_campaign=CM1'],
-        [time(), 'VIEWS',  1, 28, '192.168.1.1', 'Gisborne', 'user_12', 'http://smi2.ru?utm_campaign=CM1'],
-        [time(), 'VIEWS',  1, 26, '192.168.1.1', 'Moscow',   'user_43', 'http://smi2.ru?utm_campaign=CM3'],
+        [time(), 'VIEWS', 1, 1237, '192.168.1.11', 'Moscow', 'user_11', ''],
+        [time(), 'VIEWS', 1, 1237, '192.168.1.12', 'Moscow', 'user_12', ''],
+
+        [time(), 'VIEWS', 1, 27, '192.168.1.1', 'Rwanda', 'user_55', 'http://smi2.ru?utm_campaign=abc'],
+        [time(), 'VIEWS', 1, 27, '192.168.1.1', 'Banaadir', 'user_54', 'http://smi2.ru?utm_campaign=abc'],
+        [time(), 'VIEWS', 1, 27, '192.168.1.1', 'Tobruk', 'user_32', 'http://smi2.ru?utm_campaign=CM1'],
+        [time(), 'VIEWS', 1, 28, '192.168.1.1', 'Gisborne', 'user_12', 'http://smi2.ru?utm_campaign=CM1'],
+        [time(), 'VIEWS', 1, 26, '192.168.1.1', 'Moscow', 'user_43', 'http://smi2.ru?utm_campaign=CM3'],
     ],
     ['event_time', 'event_type', 'site_id', 'article_id', 'ip', 'city', 'user_uuid', 'referer']
 );