From 5ec179377a5cb83ca56a411381a70e598c341ca1 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 5 Jun 2019 11:52:39 +0000 Subject: [PATCH] DEVTOOLS-5170 Delete Y_IGNORE markers (#5533) They have been superseded by a new include resolution configuration that lives outside clickhouse source tree. --- contrib/libpcg-random/include/pcg_extras.hpp | 2 +- .../include/librdkafka/rdkafka.h | 2 +- dbms/programs/client/Client.cpp | 2 +- dbms/programs/main.cpp | 2 +- .../odbc-bridge/ColumnInfoHandler.cpp | 6 +- .../odbc-bridge/IdentifierQuoteHandler.cpp | 6 +- .../odbc-bridge/getIdentifierQuote.cpp | 6 +- .../programs/odbc-bridge/getIdentifierQuote.h | 2 +- dbms/src/Common/OptimizedRegularExpression.h | 2 +- .../Common/getNumberOfPhysicalCPUCores.cpp | 2 +- dbms/src/DataTypes/Native.h | 2 +- dbms/src/Formats/CapnProtoRowInputStream.cpp | 8 +-- dbms/src/Formats/ProtobufSchemas.cpp | 4 +- dbms/src/Formats/ProtobufWriter.cpp | 4 +- dbms/src/Functions/FunctionBase64Conversion.h | 2 +- dbms/src/Functions/FunctionBinaryArithmetic.h | 2 +- .../src/Functions/FunctionMathBinaryFloat64.h | 4 +- dbms/src/Functions/FunctionMathUnaryFloat64.h | 6 +- dbms/src/Functions/FunctionUnaryArithmetic.h | 2 +- dbms/src/Functions/FunctionsHashing.h | 2 +- dbms/src/Functions/FunctionsLogical.h | 2 +- dbms/src/Functions/FunctionsStringRegex.cpp | 2 +- dbms/src/Functions/IFunction.cpp | 2 +- dbms/src/IO/BrotliReadBuffer.cpp | 2 +- dbms/src/IO/HDFSCommon.h | 2 +- dbms/src/IO/ReadBufferFromHDFS.cpp | 4 +- dbms/src/IO/WriteBufferFromHDFS.cpp | 4 +- dbms/src/Interpreters/AsynchronousMetrics.cpp | 2 +- dbms/src/Interpreters/ExpressionJIT.cpp | 56 ++++++++----------- dbms/src/Storages/StorageHDFS.cpp | 6 +- dbms/src/TableFunctions/TableFunctionHDFS.cpp | 4 +- libs/libcommon/src/DateLUTImpl.cpp | 4 +- libs/libmysqlxx/src/Connection.cpp | 2 +- libs/libmysqlxx/src/Exception.cpp | 2 +- libs/libmysqlxx/src/Pool.cpp | 4 +- libs/libmysqlxx/src/Query.cpp | 2 +- libs/libmysqlxx/src/ResultBase.cpp | 2 +- libs/libmysqlxx/src/Row.cpp | 2 +- libs/libmysqlxx/src/StoreQueryResult.cpp | 2 +- libs/libmysqlxx/src/UseQueryResult.cpp | 2 +- 40 files changed, 84 insertions(+), 92 deletions(-) diff --git a/contrib/libpcg-random/include/pcg_extras.hpp b/contrib/libpcg-random/include/pcg_extras.hpp index 08e8dbacd8..929c756b15 100644 --- a/contrib/libpcg-random/include/pcg_extras.hpp +++ b/contrib/libpcg-random/include/pcg_extras.hpp @@ -81,7 +81,7 @@ #define PCG_128BIT_CONSTANT(high,low) \ ((pcg128_t(high) << 64) + low) #else - #include "pcg_uint128.hpp" // Y_IGNORE + #include "pcg_uint128.hpp" namespace pcg_extras { typedef pcg_extras::uint_x4 pcg128_t; } diff --git a/contrib/librdkafka-cmake/include/librdkafka/rdkafka.h b/contrib/librdkafka-cmake/include/librdkafka/rdkafka.h index 3387659281..bcba977e39 100644 --- a/contrib/librdkafka-cmake/include/librdkafka/rdkafka.h +++ b/contrib/librdkafka-cmake/include/librdkafka/rdkafka.h @@ -1,5 +1,5 @@ #if __has_include() // maybe bundled -# include_next // Y_IGNORE +# include_next #else // system # include_next #endif diff --git a/dbms/programs/client/Client.cpp b/dbms/programs/client/Client.cpp index d8081d7c97..79e6a18e00 100644 --- a/dbms/programs/client/Client.cpp +++ b/dbms/programs/client/Client.cpp @@ -67,7 +67,7 @@ #include #if USE_READLINE -#include "Suggest.h" // Y_IGNORE +#include "Suggest.h" #endif #ifndef __clang__ diff --git a/dbms/programs/main.cpp b/dbms/programs/main.cpp index 15f1673985..9d0a0b4f0a 100644 --- a/dbms/programs/main.cpp +++ b/dbms/programs/main.cpp @@ -15,7 +15,7 @@ #endif #if USE_TCMALLOC -#include // Y_IGNORE +#include #endif #include diff --git a/dbms/programs/odbc-bridge/ColumnInfoHandler.cpp b/dbms/programs/odbc-bridge/ColumnInfoHandler.cpp index 997ef9cf21..2b46a6cd49 100644 --- a/dbms/programs/odbc-bridge/ColumnInfoHandler.cpp +++ b/dbms/programs/odbc-bridge/ColumnInfoHandler.cpp @@ -3,9 +3,9 @@ #if USE_POCO_SQLODBC || USE_POCO_DATAODBC #if USE_POCO_SQLODBC -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE +#include +#include +#include #define POCO_SQL_ODBC_CLASS Poco::SQL::ODBC #endif #if USE_POCO_DATAODBC diff --git a/dbms/programs/odbc-bridge/IdentifierQuoteHandler.cpp b/dbms/programs/odbc-bridge/IdentifierQuoteHandler.cpp index 77fd32d80b..303165a4d4 100644 --- a/dbms/programs/odbc-bridge/IdentifierQuoteHandler.cpp +++ b/dbms/programs/odbc-bridge/IdentifierQuoteHandler.cpp @@ -2,9 +2,9 @@ #if USE_POCO_SQLODBC || USE_POCO_DATAODBC #if USE_POCO_SQLODBC -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE +#include +#include +#include #define POCO_SQL_ODBC_CLASS Poco::SQL::ODBC #endif #if USE_POCO_DATAODBC diff --git a/dbms/programs/odbc-bridge/getIdentifierQuote.cpp b/dbms/programs/odbc-bridge/getIdentifierQuote.cpp index 055b211e99..9ac0a56bfc 100644 --- a/dbms/programs/odbc-bridge/getIdentifierQuote.cpp +++ b/dbms/programs/odbc-bridge/getIdentifierQuote.cpp @@ -2,9 +2,9 @@ #if USE_POCO_SQLODBC || USE_POCO_DATAODBC #if USE_POCO_SQLODBC -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE +#include +#include +#include #define POCO_SQL_ODBC_CLASS Poco::SQL::ODBC #endif #if USE_POCO_DATAODBC diff --git a/dbms/programs/odbc-bridge/getIdentifierQuote.h b/dbms/programs/odbc-bridge/getIdentifierQuote.h index 09d20937ea..30371b4060 100644 --- a/dbms/programs/odbc-bridge/getIdentifierQuote.h +++ b/dbms/programs/odbc-bridge/getIdentifierQuote.h @@ -8,7 +8,7 @@ #if USE_POCO_SQLODBC || USE_POCO_DATAODBC #if USE_POCO_SQLODBC -#include // Y_IGNORE +#include #endif #if USE_POCO_DATAODBC #include diff --git a/dbms/src/Common/OptimizedRegularExpression.h b/dbms/src/Common/OptimizedRegularExpression.h index 729711277b..ccbd8a517d 100644 --- a/dbms/src/Common/OptimizedRegularExpression.h +++ b/dbms/src/Common/OptimizedRegularExpression.h @@ -6,7 +6,7 @@ #include #include #if USE_RE2_ST - #include // Y_IGNORE + #include #else #define re2_st re2 #endif diff --git a/dbms/src/Common/getNumberOfPhysicalCPUCores.cpp b/dbms/src/Common/getNumberOfPhysicalCPUCores.cpp index b31ae600f3..de158a51a7 100644 --- a/dbms/src/Common/getNumberOfPhysicalCPUCores.cpp +++ b/dbms/src/Common/getNumberOfPhysicalCPUCores.cpp @@ -7,7 +7,7 @@ # include namespace DB { namespace ErrorCodes { extern const int CPUID_ERROR; }} #elif USE_CPUINFO -# include // Y_IGNORE +# include #endif diff --git a/dbms/src/DataTypes/Native.h b/dbms/src/DataTypes/Native.h index 26191c17cb..e8e54c3a9a 100644 --- a/dbms/src/DataTypes/Native.h +++ b/dbms/src/DataTypes/Native.h @@ -16,7 +16,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" -#include // Y_IGNORE +#include #pragma GCC diagnostic pop diff --git a/dbms/src/Formats/CapnProtoRowInputStream.cpp b/dbms/src/Formats/CapnProtoRowInputStream.cpp index 414a25cf39..6770c54a9f 100644 --- a/dbms/src/Formats/CapnProtoRowInputStream.cpp +++ b/dbms/src/Formats/CapnProtoRowInputStream.cpp @@ -3,13 +3,13 @@ #include #include -#include // Y_IGNORE +#include #include #include #include -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE +#include +#include +#include #include #include #include diff --git a/dbms/src/Formats/ProtobufSchemas.cpp b/dbms/src/Formats/ProtobufSchemas.cpp index 80b71e9797..c443ea221c 100644 --- a/dbms/src/Formats/ProtobufSchemas.cpp +++ b/dbms/src/Formats/ProtobufSchemas.cpp @@ -2,8 +2,8 @@ #if USE_PROTOBUF #include -#include // Y_IGNORE -#include // Y_IGNORE +#include +#include #include diff --git a/dbms/src/Formats/ProtobufWriter.cpp b/dbms/src/Formats/ProtobufWriter.cpp index 815786fab0..dd4ba7ff6d 100644 --- a/dbms/src/Formats/ProtobufWriter.cpp +++ b/dbms/src/Formats/ProtobufWriter.cpp @@ -7,8 +7,8 @@ #include #include #include -#include // Y_IGNORE -#include // Y_IGNORE +#include +#include #include #include #include "ProtobufWriter.h" diff --git a/dbms/src/Functions/FunctionBase64Conversion.h b/dbms/src/Functions/FunctionBase64Conversion.h index dfd3a05ce4..5ee6ff8f25 100644 --- a/dbms/src/Functions/FunctionBase64Conversion.h +++ b/dbms/src/Functions/FunctionBase64Conversion.h @@ -7,7 +7,7 @@ #include #include #include -#include // Y_IGNORE +#include namespace DB diff --git a/dbms/src/Functions/FunctionBinaryArithmetic.h b/dbms/src/Functions/FunctionBinaryArithmetic.h index 9ccb8fbbd5..9faa2ee51e 100644 --- a/dbms/src/Functions/FunctionBinaryArithmetic.h +++ b/dbms/src/Functions/FunctionBinaryArithmetic.h @@ -24,7 +24,7 @@ #if USE_EMBEDDED_COMPILER #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" -#include // Y_IGNORE +#include #pragma GCC diagnostic pop #endif diff --git a/dbms/src/Functions/FunctionMathBinaryFloat64.h b/dbms/src/Functions/FunctionMathBinaryFloat64.h index 86766aef2c..af7c8f97ef 100644 --- a/dbms/src/Functions/FunctionMathBinaryFloat64.h +++ b/dbms/src/Functions/FunctionMathBinaryFloat64.h @@ -22,8 +22,8 @@ #pragma clang diagnostic ignored "-Wshift-negative-value" #endif - #include // Y_IGNORE - #include // Y_IGNORE + #include + #include #ifdef __clang__ #pragma clang diagnostic pop diff --git a/dbms/src/Functions/FunctionMathUnaryFloat64.h b/dbms/src/Functions/FunctionMathUnaryFloat64.h index 12ecd3e2d0..82ae17a0bb 100644 --- a/dbms/src/Functions/FunctionMathUnaryFloat64.h +++ b/dbms/src/Functions/FunctionMathUnaryFloat64.h @@ -21,9 +21,9 @@ #pragma clang diagnostic ignored "-Wshift-negative-value" #endif - #include // Y_IGNORE - #include // Y_IGNORE - #include // Y_IGNORE + #include + #include + #include #ifdef __clang__ #pragma clang diagnostic pop diff --git a/dbms/src/Functions/FunctionUnaryArithmetic.h b/dbms/src/Functions/FunctionUnaryArithmetic.h index 8cc02420a2..243b981308 100644 --- a/dbms/src/Functions/FunctionUnaryArithmetic.h +++ b/dbms/src/Functions/FunctionUnaryArithmetic.h @@ -13,7 +13,7 @@ #if USE_EMBEDDED_COMPILER #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" -#include // Y_IGNORE +#include #pragma GCC diagnostic pop #endif diff --git a/dbms/src/Functions/FunctionsHashing.h b/dbms/src/Functions/FunctionsHashing.h index 3b41e9ab91..9fa5168e69 100644 --- a/dbms/src/Functions/FunctionsHashing.h +++ b/dbms/src/Functions/FunctionsHashing.h @@ -12,7 +12,7 @@ #include #if USE_XXHASH -# include // Y_IGNORE +# include #endif #if USE_SSL diff --git a/dbms/src/Functions/FunctionsLogical.h b/dbms/src/Functions/FunctionsLogical.h index 2773152da0..6a32307cf2 100644 --- a/dbms/src/Functions/FunctionsLogical.h +++ b/dbms/src/Functions/FunctionsLogical.h @@ -18,7 +18,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" -#include // Y_IGNORE +#include #pragma GCC diagnostic pop #endif diff --git a/dbms/src/Functions/FunctionsStringRegex.cpp b/dbms/src/Functions/FunctionsStringRegex.cpp index d1d4a7b246..4abdae40d1 100644 --- a/dbms/src/Functions/FunctionsStringRegex.cpp +++ b/dbms/src/Functions/FunctionsStringRegex.cpp @@ -27,7 +27,7 @@ #endif #if USE_RE2_ST -# include // Y_IGNORE +# include #else # define re2_st re2 #endif diff --git a/dbms/src/Functions/IFunction.cpp b/dbms/src/Functions/IFunction.cpp index 417b1c9863..527562d825 100644 --- a/dbms/src/Functions/IFunction.cpp +++ b/dbms/src/Functions/IFunction.cpp @@ -25,7 +25,7 @@ #if USE_EMBEDDED_COMPILER #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" -#include // Y_IGNORE +#include #pragma GCC diagnostic pop #endif diff --git a/dbms/src/IO/BrotliReadBuffer.cpp b/dbms/src/IO/BrotliReadBuffer.cpp index 53af498ab7..145d096f0d 100644 --- a/dbms/src/IO/BrotliReadBuffer.cpp +++ b/dbms/src/IO/BrotliReadBuffer.cpp @@ -2,7 +2,7 @@ #if USE_BROTLI #include "BrotliReadBuffer.h" -#include // Y_IGNORE +#include namespace DB { diff --git a/dbms/src/IO/HDFSCommon.h b/dbms/src/IO/HDFSCommon.h index 9f4205c984..8c526d908b 100644 --- a/dbms/src/IO/HDFSCommon.h +++ b/dbms/src/IO/HDFSCommon.h @@ -4,7 +4,7 @@ #include #if USE_HDFS -#include // Y_IGNORE +#include namespace DB { diff --git a/dbms/src/IO/ReadBufferFromHDFS.cpp b/dbms/src/IO/ReadBufferFromHDFS.cpp index 5d67618497..daedd9b048 100644 --- a/dbms/src/IO/ReadBufferFromHDFS.cpp +++ b/dbms/src/IO/ReadBufferFromHDFS.cpp @@ -2,10 +2,10 @@ #if USE_HDFS -#include // Y_IGNORE +#include #include #include -#include // Y_IGNORE +#include namespace DB diff --git a/dbms/src/IO/WriteBufferFromHDFS.cpp b/dbms/src/IO/WriteBufferFromHDFS.cpp index dd236da9ad..ee38e132da 100644 --- a/dbms/src/IO/WriteBufferFromHDFS.cpp +++ b/dbms/src/IO/WriteBufferFromHDFS.cpp @@ -3,9 +3,9 @@ #if USE_HDFS #include -#include // Y_IGNORE +#include #include -#include // Y_IGNORE +#include namespace DB diff --git a/dbms/src/Interpreters/AsynchronousMetrics.cpp b/dbms/src/Interpreters/AsynchronousMetrics.cpp index c79a0277bb..2b9ce2d947 100644 --- a/dbms/src/Interpreters/AsynchronousMetrics.cpp +++ b/dbms/src/Interpreters/AsynchronousMetrics.cpp @@ -17,7 +17,7 @@ #endif #if USE_TCMALLOC - #include // Y_IGNORE + #include /// Initializing malloc extension in global constructor as required. struct MallocExtensionInitializer diff --git a/dbms/src/Interpreters/ExpressionJIT.cpp b/dbms/src/Interpreters/ExpressionJIT.cpp index 567341c249..9779a2df99 100644 --- a/dbms/src/Interpreters/ExpressionJIT.cpp +++ b/dbms/src/Interpreters/ExpressionJIT.cpp @@ -19,38 +19,30 @@ #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" -/** Y_IGNORE marker means that this header is not analyzed by Arcadia build system. - * "Arcadia" is the name of internal Yandex source code repository. - * ClickHouse have limited support for build in Arcadia - * (ClickHouse source code is used in another Yandex products as a library). - * Some libraries are not enabled when build inside Arcadia is used, - * that what does Y_IGNORE indicate. - */ - -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE -#include // Y_IGNORE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #pragma GCC diagnostic pop diff --git a/dbms/src/Storages/StorageHDFS.cpp b/dbms/src/Storages/StorageHDFS.cpp index aec846f1a5..d7bd942527 100644 --- a/dbms/src/Storages/StorageHDFS.cpp +++ b/dbms/src/Storages/StorageHDFS.cpp @@ -3,12 +3,12 @@ #if USE_HDFS #include -#include // Y_IGNORE +#include #include #include #include -#include // Y_IGNORE -#include // Y_IGNORE +#include +#include #include #include #include diff --git a/dbms/src/TableFunctions/TableFunctionHDFS.cpp b/dbms/src/TableFunctions/TableFunctionHDFS.cpp index cf33fb8f43..9c09ad9313 100644 --- a/dbms/src/TableFunctions/TableFunctionHDFS.cpp +++ b/dbms/src/TableFunctions/TableFunctionHDFS.cpp @@ -1,9 +1,9 @@ #include #if USE_HDFS -#include // Y_IGNORE +#include #include -#include // Y_IGNORE +#include namespace DB { diff --git a/libs/libcommon/src/DateLUTImpl.cpp b/libs/libcommon/src/DateLUTImpl.cpp index d244b313a5..3f812accb4 100644 --- a/libs/libcommon/src/DateLUTImpl.cpp +++ b/libs/libcommon/src/DateLUTImpl.cpp @@ -1,13 +1,13 @@ #if __has_include() #include // bundled, debian #else -#include // Y_IGNORE // freebsd +#include // freebsd #endif #if __has_include() #include #else -#include // Y_IGNORE +#include #endif #include diff --git a/libs/libmysqlxx/src/Connection.cpp b/libs/libmysqlxx/src/Connection.cpp index e26a067f3d..8097154944 100644 --- a/libs/libmysqlxx/src/Connection.cpp +++ b/libs/libmysqlxx/src/Connection.cpp @@ -1,5 +1,5 @@ #if __has_include() -#include // Y_IGNORE +#include #else #include #endif diff --git a/libs/libmysqlxx/src/Exception.cpp b/libs/libmysqlxx/src/Exception.cpp index eb778e0c86..dadd37e29e 100644 --- a/libs/libmysqlxx/src/Exception.cpp +++ b/libs/libmysqlxx/src/Exception.cpp @@ -1,5 +1,5 @@ #if __has_include() -#include // Y_IGNORE +#include #else #include #endif diff --git a/libs/libmysqlxx/src/Pool.cpp b/libs/libmysqlxx/src/Pool.cpp index 113f41925e..ab34ff2be0 100644 --- a/libs/libmysqlxx/src/Pool.cpp +++ b/libs/libmysqlxx/src/Pool.cpp @@ -1,6 +1,6 @@ #if __has_include() -#include // Y_IGNORE -#include // Y_IGNORE +#include +#include #else #include #include diff --git a/libs/libmysqlxx/src/Query.cpp b/libs/libmysqlxx/src/Query.cpp index 08474b8d86..6f275c918a 100644 --- a/libs/libmysqlxx/src/Query.cpp +++ b/libs/libmysqlxx/src/Query.cpp @@ -1,5 +1,5 @@ #if __has_include() -#include // Y_IGNORE +#include #else #include #endif diff --git a/libs/libmysqlxx/src/ResultBase.cpp b/libs/libmysqlxx/src/ResultBase.cpp index b9fd3110ac..b03f92e38f 100644 --- a/libs/libmysqlxx/src/ResultBase.cpp +++ b/libs/libmysqlxx/src/ResultBase.cpp @@ -1,5 +1,5 @@ #if __has_include() -#include // Y_IGNORE +#include #else #include #endif diff --git a/libs/libmysqlxx/src/Row.cpp b/libs/libmysqlxx/src/Row.cpp index d7c6e67d0e..e4baa681d6 100644 --- a/libs/libmysqlxx/src/Row.cpp +++ b/libs/libmysqlxx/src/Row.cpp @@ -1,5 +1,5 @@ #if __has_include() -#include // Y_IGNORE +#include #else #include #endif diff --git a/libs/libmysqlxx/src/StoreQueryResult.cpp b/libs/libmysqlxx/src/StoreQueryResult.cpp index 9b516cb05f..05ad4299e1 100644 --- a/libs/libmysqlxx/src/StoreQueryResult.cpp +++ b/libs/libmysqlxx/src/StoreQueryResult.cpp @@ -1,5 +1,5 @@ #if __has_include() -#include // Y_IGNORE +#include #else #include #endif diff --git a/libs/libmysqlxx/src/UseQueryResult.cpp b/libs/libmysqlxx/src/UseQueryResult.cpp index 7d200583f9..c5c52ffcb9 100644 --- a/libs/libmysqlxx/src/UseQueryResult.cpp +++ b/libs/libmysqlxx/src/UseQueryResult.cpp @@ -1,5 +1,5 @@ #if __has_include() -#include // Y_IGNORE +#include #else #include #endif -- GitLab