From 930ac5b2cebeea5ea3815b2e63b05dc1eb5fcb01 Mon Sep 17 00:00:00 2001 From: proller Date: Tue, 14 Mar 2017 17:32:48 +0300 Subject: [PATCH] move ClickHouseRevision to dbms --- .../common => dbms/include/DB/Common}/ClickHouseRevision.h | 0 dbms/src/Client/Client.cpp | 2 +- dbms/src/Client/Connection.cpp | 2 +- dbms/src/Common/ClickHouseRevision.cpp | 7 +++++++ dbms/src/DataStreams/AggregatingBlockInputStream.cpp | 2 +- .../DataStreams/ParallelAggregatingBlockInputStream.cpp | 2 +- dbms/src/DataStreams/tests/native_streams.cpp | 2 +- dbms/src/Functions/FunctionsMiscellaneous.cpp | 2 +- dbms/src/Interpreters/Aggregator.cpp | 2 +- dbms/src/Interpreters/ClientInfo.cpp | 2 +- dbms/src/Interpreters/Compiler.cpp | 2 +- dbms/src/Interpreters/PartLog.cpp | 2 +- dbms/src/Interpreters/QueryLog.cpp | 2 +- dbms/src/Server/StatusFile.cpp | 2 +- dbms/src/Server/TCPHandler.cpp | 2 +- .../Storages/Distributed/DistributedBlockOutputStream.cpp | 2 +- libs/libcommon/CMakeLists.txt | 2 -- libs/libcommon/src/ClickHouseRevision.cpp | 7 ------- libs/libdaemon/src/BaseDaemon.cpp | 2 +- 19 files changed, 22 insertions(+), 24 deletions(-) rename {libs/libcommon/include/common => dbms/include/DB/Common}/ClickHouseRevision.h (100%) create mode 100644 dbms/src/Common/ClickHouseRevision.cpp delete mode 100644 libs/libcommon/src/ClickHouseRevision.cpp diff --git a/libs/libcommon/include/common/ClickHouseRevision.h b/dbms/include/DB/Common/ClickHouseRevision.h similarity index 100% rename from libs/libcommon/include/common/ClickHouseRevision.h rename to dbms/include/DB/Common/ClickHouseRevision.h diff --git a/dbms/src/Client/Client.cpp b/dbms/src/Client/Client.cpp index 44dea2510e9..cddfdd1ec56 100644 --- a/dbms/src/Client/Client.cpp +++ b/dbms/src/Client/Client.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/dbms/src/Client/Connection.cpp b/dbms/src/Client/Connection.cpp index ca7ac97fbd8..2a0018b345c 100644 --- a/dbms/src/Client/Connection.cpp +++ b/dbms/src/Client/Connection.cpp @@ -2,7 +2,7 @@ #include -#include +#include #include #include diff --git a/dbms/src/Common/ClickHouseRevision.cpp b/dbms/src/Common/ClickHouseRevision.cpp new file mode 100644 index 00000000000..ff79b43d983 --- /dev/null +++ b/dbms/src/Common/ClickHouseRevision.cpp @@ -0,0 +1,7 @@ +#include +#include + +namespace ClickHouseRevision +{ + unsigned get() { return VERSION_REVISION; } +} diff --git a/dbms/src/DataStreams/AggregatingBlockInputStream.cpp b/dbms/src/DataStreams/AggregatingBlockInputStream.cpp index b45f4332b26..5fc601c8324 100644 --- a/dbms/src/DataStreams/AggregatingBlockInputStream.cpp +++ b/dbms/src/DataStreams/AggregatingBlockInputStream.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.cpp b/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.cpp index 5bfdcb23564..66bcdef70c4 100644 --- a/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.cpp +++ b/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include namespace ProfileEvents diff --git a/dbms/src/DataStreams/tests/native_streams.cpp b/dbms/src/DataStreams/tests/native_streams.cpp index 0debb08bdcc..02550e483b3 100644 --- a/dbms/src/DataStreams/tests/native_streams.cpp +++ b/dbms/src/DataStreams/tests/native_streams.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include int main(int argc, char ** argv) diff --git a/dbms/src/Functions/FunctionsMiscellaneous.cpp b/dbms/src/Functions/FunctionsMiscellaneous.cpp index 58b1f069deb..c313dede2a5 100644 --- a/dbms/src/Functions/FunctionsMiscellaneous.cpp +++ b/dbms/src/Functions/FunctionsMiscellaneous.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/dbms/src/Interpreters/Aggregator.cpp b/dbms/src/Interpreters/Aggregator.cpp index cda35b9adba..698d672352b 100644 --- a/dbms/src/Interpreters/Aggregator.cpp +++ b/dbms/src/Interpreters/Aggregator.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include diff --git a/dbms/src/Interpreters/ClientInfo.cpp b/dbms/src/Interpreters/ClientInfo.cpp index 98035d87eee..41fc81c2ccd 100644 --- a/dbms/src/Interpreters/ClientInfo.cpp +++ b/dbms/src/Interpreters/ClientInfo.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include namespace DB diff --git a/dbms/src/Interpreters/Compiler.cpp b/dbms/src/Interpreters/Compiler.cpp index 0a2f65e0a25..45815f2d9af 100644 --- a/dbms/src/Interpreters/Compiler.cpp +++ b/dbms/src/Interpreters/Compiler.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/dbms/src/Interpreters/PartLog.cpp b/dbms/src/Interpreters/PartLog.cpp index 981e93ea378..e732198b6d9 100644 --- a/dbms/src/Interpreters/PartLog.cpp +++ b/dbms/src/Interpreters/PartLog.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/dbms/src/Interpreters/QueryLog.cpp b/dbms/src/Interpreters/QueryLog.cpp index 360a7fb40c7..574736fc61f 100644 --- a/dbms/src/Interpreters/QueryLog.cpp +++ b/dbms/src/Interpreters/QueryLog.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/dbms/src/Server/StatusFile.cpp b/dbms/src/Server/StatusFile.cpp index 141f52ef372..fd8d1688d78 100644 --- a/dbms/src/Server/StatusFile.cpp +++ b/dbms/src/Server/StatusFile.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/dbms/src/Server/TCPHandler.cpp b/dbms/src/Server/TCPHandler.cpp index 4bfd87bdd00..140b049025e 100644 --- a/dbms/src/Server/TCPHandler.cpp +++ b/dbms/src/Server/TCPHandler.cpp @@ -2,7 +2,7 @@ #include -#include +#include #include diff --git a/dbms/src/Storages/Distributed/DistributedBlockOutputStream.cpp b/dbms/src/Storages/Distributed/DistributedBlockOutputStream.cpp index 188793f19de..ded4e89932d 100644 --- a/dbms/src/Storages/Distributed/DistributedBlockOutputStream.cpp +++ b/dbms/src/Storages/Distributed/DistributedBlockOutputStream.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include diff --git a/libs/libcommon/CMakeLists.txt b/libs/libcommon/CMakeLists.txt index b4c303b9d93..ac819ab12bf 100644 --- a/libs/libcommon/CMakeLists.txt +++ b/libs/libcommon/CMakeLists.txt @@ -25,7 +25,6 @@ add_library (common src/DateLUT.cpp src/DateLUTImpl.cpp src/exp10.cpp - src/ClickHouseRevision.cpp src/JSON.cpp include/common/ApplicationServerExt.h @@ -39,7 +38,6 @@ add_library (common include/common/likely.h include/common/logger_useful.h include/common/MultiVersion.h - include/common/ClickHouseRevision.h include/common/singleton.h include/common/strong_typedef.h include/common/JSON.h diff --git a/libs/libcommon/src/ClickHouseRevision.cpp b/libs/libcommon/src/ClickHouseRevision.cpp deleted file mode 100644 index fd2abf8ae71..00000000000 --- a/libs/libcommon/src/ClickHouseRevision.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include "common/config_version.h" - -namespace ClickHouseRevision -{ - unsigned get() { return VERSION_REVISION; } -} diff --git a/libs/libdaemon/src/BaseDaemon.cpp b/libs/libdaemon/src/BaseDaemon.cpp index 533d2abf4f0..da4bbc96d44 100644 --- a/libs/libdaemon/src/BaseDaemon.cpp +++ b/libs/libdaemon/src/BaseDaemon.cpp @@ -55,7 +55,7 @@ #include #include -#include +#include #include using Poco::Logger;