Get rid of double whitespaces [#CLICKHOUSE-2].

contrib/librdkafka

@@ -1 +1 @@
-Subproject commit 3401fa1e45605b5ae806f94905c92f5f546a607b
+Subproject commit c44f40be96556ab8145f0f5bcaa500d16d4e0fc4

contrib/poco

@@ -1 +1 @@
-Subproject commit ad1643c6698a8c890b68186d5c9d72e496c27af2
+Subproject commit 1e437f873645b81f8676141e17f02395fa69a0c0

dbms/benchmark/greenplum/benchmark.sh

@@ -7,7 +7,7 @@ orca=${4-on}
 host1=somehost
 host2=somehost
 mem='15GB'
-cat $filename  | sed "s/{table}/$table/g" | while read query ;
+cat $filename | sed "s/{table}/$table/g" | while read query ;
 do
     ssh -n $host1 'echo 3 |  tee /proc/sys/vm/drop_caches; sync' > /dev/null
     ssh -n $host2 'echo 3 |  tee /proc/sys/vm/drop_caches; sync' > /dev/null

dbms/benchmark/hive/run_hive.sh

@@ -1,2 +1,2 @@
 cd /home/kartavyy/benchmark
-./benchmark.sh -c hive/conf.sh  -n $1  > hive/log/log_$1
+./benchmark.sh -c hive/conf.sh -n $1 > hive/log/log_$1

dbms/src/DataTypes/NumberTraits.h

@@ -60,14 +60,14 @@ struct AddNullability<T, HasNoNull>
 
 template <typename T> struct Next;
 
-template <> struct Next<Bits0>    { using Type = Bits0; };
-template <> struct Next<Bits8>    { using Type = Bits16; };
-template <> struct Next<Bits16>    { using Type = Bits32; };
-template <> struct Next<Bits32>    { using Type = Bits64; };
-template <> struct Next<Bits64>    { using Type = Bits64; };
+template <> struct Next<Bits0> { using Type = Bits0; };
+template <> struct Next<Bits8> { using Type = Bits16; };
+template <> struct Next<Bits16> { using Type = Bits32; };
+template <> struct Next<Bits32> { using Type = Bits64; };
+template <> struct Next<Bits64> { using Type = Bits64; };
 
 template <typename T> struct ExactNext { using Type = typename Next<T>::Type; };
-template <> struct ExactNext<Bits64>    { using Type = BitsTooMany; };
+template <> struct ExactNext<Bits64> { using Type = BitsTooMany; };
 
 template <typename T> struct Traits;
 

dbms/src/Dictionaries/Embedded/RegionsHierarchy.h

@@ -5,10 +5,10 @@
 #include <common/Types.h>
 
 
-#define REGION_TYPE_CITY       6
-#define REGION_TYPE_AREA       5
-#define REGION_TYPE_DISTRICT  4
-#define REGION_TYPE_COUNTRY   3
+#define REGION_TYPE_CITY 6
+#define REGION_TYPE_AREA 5
+#define REGION_TYPE_DISTRICT 4
+#define REGION_TYPE_COUNTRY 3
 #define REGION_TYPE_CONTINENT 1
 
 

dbms/src/Functions/FunctionsHashing.h

@@ -42,21 +42,20 @@ namespace ErrorCodes
 
 /** Hashing functions.
   *
-  * Half MD5:
-  * halfMD5:     String -> UInt64
+  * halfMD5: String -> UInt64
   *
   * A faster cryptographic hash function:
-  * sipHash64:  String -> UInt64
+  * sipHash64: String -> UInt64
   *
   * Fast non-cryptographic hash function for strings:
   * cityHash64: String -> UInt64
   *
   * A non-cryptographic hash from a tuple of values of any types (uses cityHash64 for strings and intHash64 for numbers):
-  * cityHash64:  any* -> UInt64
+  * cityHash64: any* -> UInt64
   *
   * Fast non-cryptographic hash function from any integer:
-  * intHash32:    number -> UInt32
-  * intHash64:  number -> UInt64
+  * intHash32: number -> UInt32
+  * intHash64: number -> UInt64
   *
   */
 

dbms/src/IO/tests/read_buffer_aio.cpp

@@ -14,10 +14,10 @@ namespace
 {
 
 void run();
-void prepare(size_t s, std::string  & filename, std::string & buf);
-void prepare2(std::string  & filename, std::string & buf);
-void prepare3(std::string  & filename, std::string & buf);
-void prepare4(std::string  & filename, std::string & buf);
+void prepare(size_t s, std::string & filename, std::string & buf);
+void prepare2(std::string & filename, std::string & buf);
+void prepare3(std::string & filename, std::string & buf);
+void prepare4(std::string & filename, std::string & buf);
 std::string createTmpFile();
 void die(const std::string & msg);
 void runTest(unsigned int num, const std::function<bool()> & func);
@@ -105,7 +105,7 @@ void run()
     fs::remove_all(fs::path(filename5).parent_path().string());
 }
 
-void prepare(size_t s, std::string  & filename, std::string & buf)
+void prepare(size_t s, std::string & filename, std::string & buf)
 {
     static const std::string symbols = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 

dbms/src/Interpreters/tests/in_join_subqueries_preprocessor.cpp

@@ -96,7 +96,7 @@ using TestEntries = std::vector<TestEntry>;
 using TestResult = std::pair<bool, std::string>;
 
 TestResult check(const TestEntry & entry);
-bool parse(DB::ASTPtr  & ast, const std::string & query);
+bool parse(DB::ASTPtr & ast, const std::string & query);
 bool equals(const DB::ASTPtr & lhs, const DB::ASTPtr & rhs);
 void reorder(DB::IAST * ast);
 

dbms/src/Interpreters/tests/logical_expressions_optimizer.cpp

@@ -27,7 +27,7 @@ using TestResult = std::pair<bool, std::string>;
 void run();
 void performTests(const TestEntries & entries);
 TestResult check(const TestEntry & entry);
-bool parse(DB::ASTPtr  & ast, const std::string & query);
+bool parse(DB::ASTPtr & ast, const std::string & query);
 bool equals(const DB::ASTPtr & lhs, const DB::ASTPtr & rhs);
 void reorder(DB::IAST * ast);
 

dbms/src/Storages/tests/collapsing_merge_order_test.sh

@@ -1,10 +1,8 @@
 #!/usr/bin/env bash
 
-# METR-9072
-
 echo "DROP DATABASE IF EXISTS collapsing_test" | clickhouse-client || exit 1
 echo "CREATE DATABASE collapsing_test" | clickhouse-client || exit 2
-echo "CREATE TABLE collapsing_test.p0 ( d Date, k String,  s Int8,  v String) ENGINE = CollapsingMergeTree(d, tuple(k), 8192, s)" | clickhouse-client || exit 3
+echo "CREATE TABLE collapsing_test.p0 ( d Date, k String, s Int8, v String) ENGINE = CollapsingMergeTree(d, tuple(k), 8192, s)" | clickhouse-client || exit 3
 echo "CREATE TABLE collapsing_test.p1 AS collapsing_test.p0" | clickhouse-client || exit 4
 echo "CREATE TABLE collapsing_test.p2 AS collapsing_test.p0" | clickhouse-client || exit 5
 echo "CREATE TABLE collapsing_test.m0 AS collapsing_test.p0" | clickhouse-client || exit 9

dbms/src/Storages/tests/final_deleted_test.sh

@@ -2,7 +2,7 @@
 
 echo "DROP DATABASE IF EXISTS final_deleted_test" | clickhouse-client || exit 1
 echo "CREATE DATABASE final_deleted_test" | clickhouse-client || exit 2
-echo "CREATE TABLE final_deleted_test.a ( d Date, k String,  s Int8,  v String) ENGINE = CollapsingMergeTree(d, tuple(k), 8192, s)" | clickhouse-client || exit 4
+echo "CREATE TABLE final_deleted_test.a ( d Date, k String, s Int8, v String) ENGINE = CollapsingMergeTree(d, tuple(k), 8192, s)" | clickhouse-client || exit 4
 
 echo "('2014-01-01','key1',1,'val1'),('2014-01-01','key1',-1,'val1')" | clickhouse-client --query="INSERT INTO final_deleted_test.a VALUES" || exit 5
 

dbms/tests/perf_drafts/accurate_comparisons/accurate_comparisons.sh

@@ -12,23 +12,23 @@ function test_cmp {
     rm test.json
 }
 
-test_cmp "u64 > i64         "
-test_cmp "u64 > toInt64(1)  "
-test_cmp "i64 > u64         "
-test_cmp "i64 > toUInt64(1) "
+test_cmp "u64 > i64"
+test_cmp "u64 > toInt64(1)"
+test_cmp "i64 > u64"
+test_cmp "i64 > toUInt64(1)"
 
-test_cmp "u64 = i64         "
-test_cmp "u64 = toInt64(1)  "
-test_cmp "i64 = u64         "
-test_cmp "i64 = toUInt64(1) "
+test_cmp "u64 = i64"
+test_cmp "u64 = toInt64(1)"
+test_cmp "i64 = u64"
+test_cmp "i64 = toUInt64(1)"
 
 test_cmp "u64 >= i64"
-test_cmp "i64 >  -1 "
-test_cmp "i64 =  0  "
-test_cmp "u64 != 0  "
+test_cmp "i64 > -1"
+test_cmp "i64 = 0"
+test_cmp "u64 != 0"
 
-test_cmp "i64 =  f64"
-test_cmp "i64 <  f64"
-test_cmp "f64 >= 0  "
+test_cmp "i64 = f64"
+test_cmp "i64 < f64"
+test_cmp "f64 >= 0"
 
 clickhouse-client -q "DROP TABLE IF EXISTS test.comparisons"

dbms/tests/queries/0_stateless/00408_http_keep_alive.sh

@@ -3,7 +3,7 @@
 curl -vsS http://localhost:8123/ --data-binary @- <<< "SELECT 1" 2>&1 | perl -lnE 'print if /Keep-Alive/';
 curl -vsS http://localhost:8123/ --data-binary @- <<< " error here " 2>&1 | perl -lnE 'print if /Keep-Alive/';
 curl -vsS http://localhost:8123/ping  2>&1 | perl -lnE 'print if /Keep-Alive/';
-curl -vsS http://localhost:8123/replicas_status  2>&1 | perl -lnE 'print if /Keep-Alive/';
+curl -vsS http://localhost:8123/replicas_status 2>&1 | perl -lnE 'print if /Keep-Alive/';
 
 # no keep-alive:
-curl -vsS http://localhost:8123/404/not/found/  2>&1 | perl -lnE 'print if /Keep-Alive/';
+curl -vsS http://localhost:8123/404/not/found/ 2>&1 | perl -lnE 'print if /Keep-Alive/';

dbms/tests/queries/0_stateless/00429_http_bufferization.sh

@@ -47,7 +47,7 @@ function check_exception_handling() {
 
     check_only_exception         "max_result_bytes=4000000&buffer_size=2000000&wait_end_of_query=1" 5000000
     check_only_exception         "max_result_bytes=4000000&wait_end_of_query=1" 5000000
-    check_last_line_exception     "max_result_bytes=4000000&buffer_size=2000000&wait_end_of_query=0" 5000000
+    check_last_line_exception    "max_result_bytes=4000000&buffer_size=2000000&wait_end_of_query=0" 5000000
 }
 
 check_exception_handling

dbms/tests/queries/0_stateless/00504_insert_miss_columns.sh

@@ -8,7 +8,7 @@ clickhouse-client -q "CREATE TABLE test.advertiser ( action_date Date, adblock U
 clickhouse-client -q "CREATE TABLE test.advertiser_test ( action_date Date, adblock UInt8, imps Int64, Hash UInt64 ) Engine = SummingMergeTree( action_date, ( adblock, Hash ), 8192, ( imps ) )";
 
 # This test will fail. It's ok.
-clickhouse-client -q "INSERT INTO test.advertiser_test SELECT *,  sipHash64( CAST(adblock  AS String) ), CAST(1 AS Int8) FROM test.advertiser;" 2>/dev/null
+clickhouse-client -q "INSERT INTO test.advertiser_test SELECT *, sipHash64( CAST(adblock  AS String) ), CAST(1 AS Int8) FROM test.advertiser;" 2>/dev/null
 clickhouse-client -q "DROP TABLE test.advertiser";
 clickhouse-client -q "DROP TABLE test.advertiser_test";
 clickhouse-client -q "SELECT 'server still alive'";

utils/iotest/iotest_aio.cpp

@@ -45,7 +45,7 @@ inline int io_destroy(aio_context_t ctx)
     return syscall(__NR_io_destroy, ctx);
 }
 
-inline int io_submit(aio_context_t ctx, long nr,  struct iocb **iocbpp)
+inline int io_submit(aio_context_t ctx, long nr, struct iocb **iocbpp)
 {
     return syscall(__NR_io_submit, ctx, nr, iocbpp);
 }