Added more style checks [#CLICKHOUSE-3]

dbms/programs/odbc-bridge/ColumnInfoHandler.cpp

@@ -124,9 +124,9 @@ void ODBCColumnsInfoHandler::handleRequest(Poco::Net::HTTPServerRequest & reques
         auto identifier_quote = getIdentifierQuote(hdbc);
         if (identifier_quote.length() == 0)
             settings.identifier_quoting_style = IdentifierQuotingStyle::None;
-        else if(identifier_quote[0] == '`')
+        else if (identifier_quote[0] == '`')
             settings.identifier_quoting_style = IdentifierQuotingStyle::Backticks;
-        else if(identifier_quote[0] == '"')
+        else if (identifier_quote[0] == '"')
             settings.identifier_quoting_style = IdentifierQuotingStyle::DoubleQuotes;
         else
             throw Exception("Can not map quote identifier '" + identifier_quote + "' to IdentifierQuotingStyle value", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);

dbms/programs/odbc-bridge/HandlerFactory.cpp

@@ -25,7 +25,7 @@ Poco::Net::HTTPRequestHandler * HandlerFactory::createRequestHandler(const Poco:
 #else
             return nullptr;
 #endif
-        else if(uri.getPath() == "/identifier_quote")
+        else if (uri.getPath() == "/identifier_quote")
 #if USE_POCO_SQLODBC || USE_POCO_DATAODBC
             return new IdentifierQuoteHandler(keep_alive_timeout, context);
 #else

dbms/src/Columns/ReverseIndex.h

@@ -272,7 +272,7 @@ public:
             auto hash = calcHashes();
             ptr = &hash->getData()[0];
             UInt64 * expected = nullptr;
-            if(saved_hash_ptr.compare_exchange_strong(expected, ptr))
+            if (saved_hash_ptr.compare_exchange_strong(expected, ptr))
                 saved_hash = std::move(hash);
             else
                 ptr = expected;

dbms/src/Core/BackgroundSchedulePool.cpp

@@ -278,7 +278,7 @@ void BackgroundSchedulePool::delayExecutionThreadFunction()
         {
             std::unique_lock lock(delayed_tasks_mutex);
 
-            while(!shutdown)
+            while (!shutdown)
             {
                 Poco::Timestamp min_time;
 

dbms/src/Core/ExternalTable.cpp

@@ -168,7 +168,7 @@ void ExternalTablesHandler::handlePart(const Poco::Net::MessageHeader & header,
     /// Write data
     data.first->readPrefix();
     output->writePrefix();
-    while(Block block = data.first->read())
+    while (Block block = data.first->read())
         output->write(block);
     data.first->readSuffix();
     output->writeSuffix();

dbms/src/DataStreams/DistinctSortedBlockInputStream.cpp

@@ -150,7 +150,7 @@ ColumnRawPtrs DistinctSortedBlockInputStream::getClearingColumns(const Block & b
 {
     ColumnRawPtrs clearing_hint_columns;
     clearing_hint_columns.reserve(description.size());
-    for(const auto & sort_column_description : description)
+    for (const auto & sort_column_description : description)
     {
         const auto sort_column_ptr = block.safeGetByPosition(sort_column_description.column_number).column.get();
         const auto it = std::find(key_columns.cbegin(), key_columns.cend(), sort_column_ptr);

dbms/src/Databases/DatabasesCommon.cpp

@@ -163,7 +163,7 @@ DatabaseWithOwnTablesBase::~DatabaseWithOwnTablesBase()
     {
         shutdown();
     }
-    catch(...)
+    catch (...)
     {
         tryLogCurrentException(__PRETTY_FUNCTION__);
     }

dbms/src/Dictionaries/ExecutableDictionarySource.cpp

@@ -213,7 +213,7 @@ bool ExecutableDictionarySource::supportsSelectiveLoad() const
 
 bool ExecutableDictionarySource::hasUpdateField() const
 {
-    if(update_field.empty())
+    if (update_field.empty())
         return false;
     else
         return true;

dbms/src/Functions/FunctionsArithmetic.h

@@ -1238,7 +1238,7 @@ class FunctionBinaryArithmetic : public IFunction
         auto column_to = ColumnAggregateFunction::create(columns[0]->getAggregateFunction());
         column_to->reserve(input_rows_count);
 
-        for(size_t i = 0; i < input_rows_count; ++i)
+        for (size_t i = 0; i < input_rows_count; ++i)
         {
             column_to->insertFrom(columns[0]->getData()[i]);
             column_to->insertMergeFrom(columns[1]->getData()[i]);

dbms/src/Functions/FunctionsVisitParam.h

@@ -104,7 +104,7 @@ struct ExtractRaw
             }
             else
             {
-                switch(*pos)
+                switch (*pos)
                 {
                     case '[':
                         expects_end.push_back((current_expect_end = ']'));

dbms/src/Functions/GatherUtils/Selectors.h

@@ -179,7 +179,7 @@ struct ArrayAndValueSourceSelectorBySink : public ArraySinkSelector<ArrayAndValu
         if (array_source.isConst() && value_source.isConst())
             checkTypeAndCallConcat(typeid_cast<ConstSource<ArraySource> *>(&array_source),
                                    typeid_cast<ConstSource<ValueSource> *>(&value_source));
-        else if(array_source.isConst())
+        else if (array_source.isConst())
             checkTypeAndCallConcat(typeid_cast<ConstSource<ArraySource> *>(&array_source),
                                    typeid_cast<ValueSource *>(&value_source));
         else if (value_source.isConst())

dbms/src/Functions/arrayIntersect.cpp

@@ -324,9 +324,9 @@ void FunctionArrayIntersect::executeImpl(Block & block, const ColumnNumbers & ar
             result_column = execute<DateMap, ColumnVector<DataTypeDate::FieldType>, true>(arrays, std::move(column));
         else if (which.isDateTime())
             result_column = execute<DateTimeMap, ColumnVector<DataTypeDateTime::FieldType>, true>(arrays, std::move(column));
-        else if(which.isString())
+        else if (which.isString())
             result_column = execute<StringMap, ColumnString, false>(arrays, std::move(column));
-        else if(which.isFixedString())
+        else if (which.isFixedString())
             result_column = execute<StringMap, ColumnFixedString, false>(arrays, std::move(column));
         else
         {

dbms/src/Functions/formatDateTime.cpp

@@ -350,7 +350,7 @@ public:
 
             for (size_t i = 0; i < vec.size(); ++i)
             {
-                for(auto & instruction : instructions)
+                for (auto & instruction : instructions)
                     instruction.perform(pos, vec[i], time_zone);
 
                 dst_offsets[i] = pos - begin;

dbms/src/IO/ReadHelpers.h

@@ -58,7 +58,7 @@ namespace ErrorCodes
 
 inline char parseEscapeSequence(char c)
 {
-    switch(c)
+    switch (c)
     {
         case 'a':
             return '\a';

dbms/src/Interpreters/ExpressionActions.cpp

@@ -1150,7 +1150,7 @@ UInt128 ExpressionAction::ActionHash::operator()(const ExpressionAction & action
     SipHash hash;
     hash.update(action.type);
     hash.update(action.is_function_compiled);
-    switch(action.type)
+    switch (action.type)
     {
         case ADD_COLUMN:
             hash.update(action.result_name);

dbms/src/Interpreters/InterpreterSelectQuery.cpp

@@ -590,7 +590,7 @@ void InterpreterSelectQuery::executeImpl(Pipeline & pipeline, const BlockInputSt
 
                     if (query.group_by_with_rollup)
                         executeRollupOrCube(pipeline, Modificator::ROLLUP);
-                    else if(query.group_by_with_cube)
+                    else if (query.group_by_with_cube)
                         executeRollupOrCube(pipeline, Modificator::CUBE);
                 }
                 else if (expressions.has_having)

dbms/src/Interpreters/PredicateExpressionsOptimizer.cpp

@@ -72,7 +72,7 @@ bool PredicateExpressionsOptimizer::optimizeImpl(
                 ASTPtr inner_predicate;
                 cloneOuterPredicateForInnerPredicate(outer_predicate, projection_columns, database_and_table_with_aliases, inner_predicate);
 
-                switch(optimize_kind)
+                switch (optimize_kind)
                 {
                     case OptimizeKind::NONE: continue;
                     case OptimizeKind::PUSH_TO_WHERE: is_rewrite_subquery |= optimizeExpression(inner_predicate, subquery->where_expression, subquery); continue;

dbms/src/Storages/MergeTree/MergeTreeData.h

@@ -192,7 +192,7 @@ public:
             {
                 rollback();
             }
-            catch(...)
+            catch (...)
             {
                 tryLogCurrentException("~MergeTreeData::Transaction");
             }

dbms/src/Storages/StorageMySQL.cpp

@@ -100,7 +100,7 @@ public:
             }
             trans.commit();
         }
-        catch(...)
+        catch (...)
         {
             trans.rollback();
             throw;

dbms/src/Storages/StorageReplicatedMergeTree.cpp

@@ -2943,7 +2943,7 @@ StorageReplicatedMergeTree::~StorageReplicatedMergeTree()
     {
         shutdown();
     }
-    catch(...)
+    catch (...)
     {
         tryLogCurrentException(__PRETTY_FUNCTION__);
     }

utils/check-style/check-style

@@ -16,5 +16,5 @@ ROOT_PATH=$(git rev-parse --show-toplevel)
 
 find $ROOT_PATH/dbms -name '*.h' -or -name '*.cpp' |
     grep -vP 'Compiler|build' |
-    xargs grep $@ -P '((class|struct|namespace|enum|if|for|while|else|throw|switch).*|\)(\s*const)?(\s*override)?\s*)\{$|\s$|\t|^ {1,3}[^\* ]\S|\t'
+    xargs grep $@ -P '((class|struct|namespace|enum|if|for|while|else|throw|switch).*|\)(\s*const)?(\s*override)?\s*)\{$|\s$|\t|^ {1,3}[^\* ]\S|\t|^\s*(if|else if|for|while|catch|switch)\('
-# a curly brace not in a new line, but not for the case of C++11 init or agg. initialization | trailing whitespace | number of ws not a multiple of 4, but not in the case of comment continuation | a tab character
+# a curly brace not in a new line, but not for the case of C++11 init or agg. initialization | trailing whitespace | number of ws not a multiple of 4, but not in the case of comment continuation | a tab character | missing whitespace after for/if/while... before opening brace