diff --git a/dbms/CMakeLists.txt b/dbms/CMakeLists.txt index c178dac5c012a080f3a931a7dab5c5579f45d979..658ea74def9a5849c991e85b38f2912e710413b1 100644 --- a/dbms/CMakeLists.txt +++ b/dbms/CMakeLists.txt @@ -67,8 +67,8 @@ add_headers_only(dbms src/Server) list (APPEND dbms_sources ${CONFIG_BUILD}) list (APPEND dbms_headers ${CONFIG_VERSION} ${CONFIG_COMMON}) -list (APPEND dbms_sources src/Functions/IFunction.cpp src/Functions/FunctionFactory.cpp src/Functions/DataTypeTraits.cpp) -list (APPEND dbms_headers src/Functions/IFunction.h src/Functions/FunctionFactory.h src/Functions/DataTypeTraits.h) +list (APPEND dbms_sources src/Functions/IFunction.cpp src/Functions/FunctionFactory.cpp) +list (APPEND dbms_headers src/Functions/IFunction.h src/Functions/FunctionFactory.h) list (APPEND dbms_sources src/AggregateFunctions/AggregateFunctionFactory.cpp diff --git a/dbms/src/Functions/DataTypeTraits.cpp b/dbms/src/DataTypes/DataTypeTraits.cpp similarity index 89% rename from dbms/src/Functions/DataTypeTraits.cpp rename to dbms/src/DataTypes/DataTypeTraits.cpp index f22a49e270ae2d668c9522035d6f99e9fe4e0f06..fd1b179fb35cd11b6f609dcff3ebb409f33b6dab 100644 --- a/dbms/src/Functions/DataTypeTraits.cpp +++ b/dbms/src/DataTypes/DataTypeTraits.cpp @@ -1,4 +1,4 @@ -#include +#include namespace DB { namespace DataTypeTraits { diff --git a/dbms/src/Functions/DataTypeTraits.h b/dbms/src/DataTypes/DataTypeTraits.h similarity index 99% rename from dbms/src/Functions/DataTypeTraits.h rename to dbms/src/DataTypes/DataTypeTraits.h index 5c12d57fa447448a805a0d2f587533cdb0f75b66..d083e67793de77edc52c492d38414c49fbda7f66 100644 --- a/dbms/src/Functions/DataTypeTraits.h +++ b/dbms/src/DataTypes/DataTypeTraits.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include diff --git a/dbms/src/Functions/NumberTraits.h b/dbms/src/DataTypes/NumberTraits.h similarity index 100% rename from dbms/src/Functions/NumberTraits.h rename to dbms/src/DataTypes/NumberTraits.h diff --git a/dbms/src/Dictionaries/TrieDictionary.cpp b/dbms/src/Dictionaries/TrieDictionary.cpp index ab9b1fa39208a874d0676a570d24198cfb2a3cc3..c63a88f32da3d6dfa211496a4531ed91a20b33d8 100644 --- a/dbms/src/Dictionaries/TrieDictionary.cpp +++ b/dbms/src/Dictionaries/TrieDictionary.cpp @@ -8,10 +8,12 @@ #include #include #include -#include #include #include +#include + + namespace DB { diff --git a/dbms/src/Functions/Conditional/ArgsInfo.cpp b/dbms/src/Functions/Conditional/ArgsInfo.cpp index f3b9df0a5c591316cbc9db3049eb8ae450237702..fdc55f96f74baa02e7439d850a7b355f8ab36d58 100644 --- a/dbms/src/Functions/Conditional/ArgsInfo.cpp +++ b/dbms/src/Functions/Conditional/ArgsInfo.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/dbms/src/Functions/Conditional/ArrayEvaluator.h b/dbms/src/Functions/Conditional/ArrayEvaluator.h index ef226f0160eb6dff93de72eb4390e969f08ab621..c81eb0034f23ac4ac76aec50f23ded2ee773627c 100644 --- a/dbms/src/Functions/Conditional/ArrayEvaluator.h +++ b/dbms/src/Functions/Conditional/ArrayEvaluator.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include namespace DB diff --git a/dbms/src/Functions/Conditional/NumericEvaluator.h b/dbms/src/Functions/Conditional/NumericEvaluator.h index 2c01a4c9459ac71d39b9c0386b4183b69af6e720..7ceb241115d8ca3d34287557c771b3149c27852a 100644 --- a/dbms/src/Functions/Conditional/NumericEvaluator.h +++ b/dbms/src/Functions/Conditional/NumericEvaluator.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/dbms/src/Functions/Conditional/NumericPerformer.cpp b/dbms/src/Functions/Conditional/NumericPerformer.cpp index 61d9e0a14f3440eb6d2206768afb42b210b8489f..fe4210b79e50d083515a9659a080912aef4ead15 100644 --- a/dbms/src/Functions/Conditional/NumericPerformer.cpp +++ b/dbms/src/Functions/Conditional/NumericPerformer.cpp @@ -4,8 +4,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/dbms/src/Functions/Conditional/getArrayType.cpp b/dbms/src/Functions/Conditional/getArrayType.cpp index 53ed9c18eaf1fbe28c6d4c85a5293787aa9fe41a..1b3f42580abbdfcf9a7522166dca035a14f83795 100644 --- a/dbms/src/Functions/Conditional/getArrayType.cpp +++ b/dbms/src/Functions/Conditional/getArrayType.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include diff --git a/dbms/src/Functions/FunctionsArithmetic.h b/dbms/src/Functions/FunctionsArithmetic.h index 2e78fc3fd327bc047d29523dab2e53c52141976d..92933585b8d1ed680445a2751c67d9b588ff6b08 100644 --- a/dbms/src/Functions/FunctionsArithmetic.h +++ b/dbms/src/Functions/FunctionsArithmetic.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include diff --git a/dbms/src/Functions/FunctionsArray.h b/dbms/src/Functions/FunctionsArray.h index 956afb0be3ca3c3a19ab38ced490af34f4e31a6c..28a01fbdf7ba089c9ddc8fe3b3c7b93cc564b2cd 100644 --- a/dbms/src/Functions/FunctionsArray.h +++ b/dbms/src/Functions/FunctionsArray.h @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include diff --git a/dbms/src/Functions/FunctionsConditional.h b/dbms/src/Functions/FunctionsConditional.h index afa2b53bc9c30f3d6e8a0e1261d5cba697445eff..4ea26ac537cb4f55eda53391f5893b596f72103b 100644 --- a/dbms/src/Functions/FunctionsConditional.h +++ b/dbms/src/Functions/FunctionsConditional.h @@ -13,8 +13,8 @@ #include #include #include -#include -#include +#include +#include namespace DB { diff --git a/dbms/src/Functions/FunctionsMiscellaneous.h b/dbms/src/Functions/FunctionsMiscellaneous.h index 951b3d3663b6177d555f54d66e5f6a86ecde2d17..cecb35507f3e4651bfae270695194a400eb199e5 100644 --- a/dbms/src/Functions/FunctionsMiscellaneous.h +++ b/dbms/src/Functions/FunctionsMiscellaneous.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include diff --git a/dbms/src/Functions/FunctionsTransform.cpp b/dbms/src/Functions/FunctionsTransform.cpp index dbd7c487cb226edf8b8fa4bc0e00f6ac55b96eab..6166e9a7f751949ba099a1b4527b400236c58a76 100644 --- a/dbms/src/Functions/FunctionsTransform.cpp +++ b/dbms/src/Functions/FunctionsTransform.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include namespace DB { diff --git a/dbms/src/Functions/tests/number_traits.cpp b/dbms/src/Functions/tests/number_traits.cpp index 22fab20c1855fb20e89f2ecbf06fcbb2608f8b45..efe957f7643671ddb213918382cbe62e3a625c10 100644 --- a/dbms/src/Functions/tests/number_traits.cpp +++ b/dbms/src/Functions/tests/number_traits.cpp @@ -1,6 +1,6 @@ #include -#include +#include void printType(DB::UInt8 x) { std::cout << "UInt8"; } diff --git a/dbms/src/Interpreters/DDLWorker.cpp b/dbms/src/Interpreters/DDLWorker.cpp index 268c9b8664ba9243d8ed39afeda1d5a822bd3e22..bf0fd5c08243b4552793ff822742c4d46be9f424 100644 --- a/dbms/src/Interpreters/DDLWorker.cpp +++ b/dbms/src/Interpreters/DDLWorker.cpp @@ -86,7 +86,7 @@ struct DDLLogEntry rb >> "version: " >> version >> "\n"; if (version != CURRENT_VERSION) - throw Exception("Unknown DDLLogEntry format version: " + version, ErrorCodes::UNKNOWN_FORMAT_VERSION); + throw Exception("Unknown DDLLogEntry format version: " + DB::toString(version), ErrorCodes::UNKNOWN_FORMAT_VERSION); rb >> "query: " >> escape >> query >> "\n"; rb >> "hosts: " >> hosts >> "\n"; diff --git a/dbms/src/Interpreters/DDLWorker.h b/dbms/src/Interpreters/DDLWorker.h index d2fe5edbdd75895967f70ac6b6f9708c4eebd00c..52ec7fabbc5c20ab974e9f6af9bf2b3d92c23ab2 100644 --- a/dbms/src/Interpreters/DDLWorker.h +++ b/dbms/src/Interpreters/DDLWorker.h @@ -13,7 +13,7 @@ namespace DB { -struct ASTAlterQuery; +class ASTAlterQuery; struct DDLLogEntry; diff --git a/dbms/src/Interpreters/Set.cpp b/dbms/src/Interpreters/Set.cpp index 8445050a031ba11a807cea351ed0ae959e4868eb..777da5dfbd9cd2812728dc2813fc24f45ea3017e 100644 --- a/dbms/src/Interpreters/Set.cpp +++ b/dbms/src/Interpreters/Set.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include diff --git a/dbms/src/Interpreters/convertFieldToType.cpp b/dbms/src/Interpreters/convertFieldToType.cpp index 05c68f1c62116b7518976eb0d5d899a73a69f6d0..8b039c3d853a40f79add1b48f2b8a089bd017286 100644 --- a/dbms/src/Interpreters/convertFieldToType.cpp +++ b/dbms/src/Interpreters/convertFieldToType.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include