wbtiger
/
ByConity
mirror of https://github.com/ByConity/ByConity
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make separate libs Common/ZooKeeper and Common/ConfigProcessor (#1749) 

* Make separate libs Common/ZooKeeper and Common/ConfigProcessor
renamed:    dbms/src/Common/StringUtils.h -> dbms/src/Common/StringUtils/StringUtils.h

* Fix space

* Fix data in system.build_options

* merge

* merge
This commit is contained in:
proller 2018-01-15 22:07:47 +03:00 committed by alexey-milovidov
parent 6ded1b171c
commit d97b2edc7c
78 changed files with 118 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dbms/CMakeLists.txt
View File

@ -29,13 +29,6 @@ find_package (Threads)
add_subdirectory (src)
# These files are located in separate library, because they are used by Yandex.Metrika code
# in places when no dependency on whole "dbms" library is possible.
add_library(string_utils
src/Common/StringUtils.h
src/Common/StringUtils.cpp)
target_include_directories (string_utils PRIVATE ${DBMS_INCLUDE_DIR})
set(dbms_headers)
set(dbms_sources)
@ -43,7 +36,6 @@ include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
add_headers_and_sources(clickhouse_common_io src/Common)
add_headers_and_sources(clickhouse_common_io src/Common/HashTable)
add_headers_and_sources(clickhouse_common_io src/Common/ZooKeeper)
add_headers_and_sources(clickhouse_common_io src/IO)
add_headers_and_sources(dbms src/Analyzers)
@ -88,12 +80,6 @@ list (APPEND dbms_headers
list (APPEND dbms_sources src/TableFunctions/TableFunctionFactory.cpp)
list (APPEND dbms_headers src/TableFunctions/ITableFunction.h src/TableFunctions/TableFunctionFactory.h)
list(REMOVE_ITEM clickhouse_common_io_sources
src/Common/StringUtils.cpp)
list(REMOVE_ITEM clickhouse_common_io_headers
src/Common/StringUtils.h)
if (APPLE OR CMAKE_SYSTEM MATCHES "FreeBSD")
list(REMOVE_ITEM clickhouse_common_io_headers
src/Common/AIO.h
@ -106,6 +92,9 @@ endif()
add_library(clickhouse_common_io ${SPLIT_SHARED} ${clickhouse_common_io_headers} ${clickhouse_common_io_sources})
add_subdirectory(src/Common/ZooKeeper)
add_subdirectory(src/Common/ConfigProcessor)
if (MAKE_STATIC_LIBRARIES)
add_library(dbms ${dbms_headers} ${dbms_sources})
else ()
@ -157,6 +146,7 @@ target_link_libraries (clickhouse_common_io
target_link_libraries (dbms
clickhouse_parsers
clickhouse_common_configprocessor
clickhouse_common_io
${MYSQLXX_LIBRARY}
${FARMHASH_LIBRARIES}

2
dbms/src/AggregateFunctions/AggregateFunctionCombinatorFactory.cpp
View File

@ -1,4 +1,4 @@
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>

2
dbms/src/AggregateFunctions/AggregateFunctionFactory.cpp
View File

@ -9,7 +9,7 @@
#include <IO/WriteHelpers.h>
#include <Interpreters/Context.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/typeid_cast.h>
#include <Poco/String.h>

5
dbms/src/Common/CMakeLists.txt
View File

@ -1,4 +1,7 @@
add_subdirectory(ZooKeeper)
add_subdirectory(StringUtils)
# after common_io
#add_subdirectory(ZooKeeper)
#add_subdirectory(ConfigProcessor)
if (ENABLE_TESTS)
add_subdirectory (tests)

9
dbms/src/Common/ConfigProcessor/CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
add_headers_and_sources(clickhouse_common_configprocessor .)
add_library(clickhouse_common_configprocessor ${SPLIT_SHARED} ${clickhouse_common_configprocessor_headers} ${clickhouse_common_configprocessor_sources})
target_link_libraries (clickhouse_common_configprocessor clickhouse_common_zookeeper string_utils)
target_include_directories (clickhouse_common_configprocessor PRIVATE ${DBMS_INCLUDE_DIR})

7
dbms/src/Common/ConfigProcessor.cpp → dbms/src/Common/ConfigProcessor/ConfigProcessor.cpp
View File

@ -1,17 +1,16 @@
#include <Common/ConfigProcessor.h>
#include "ConfigProcessor.h"
#include <sys/utsname.h>
#include <cerrno>
#include <cstring>
#include <iostream>
#include <functional>
#include <Poco/DOM/Text.h>
#include <Poco/DOM/Attr.h>
#include <Poco/DOM/Comment.h>
#include <Poco/Util/XMLConfiguration.h>
#include <Common/ZooKeeper/ZooKeeperNodeCache.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#define PREPROCESSED_SUFFIX "-preprocessed"

0
dbms/src/Common/ConfigProcessor.h → dbms/src/Common/ConfigProcessor/ConfigProcessor.h
View File

9
dbms/src/Common/StringUtils/CMakeLists.txt Normal file
View File

@ -0,0 +1,9 @@
# These files are located in separate library, because they are used by Yandex.Metrika code
# in places when no dependency on whole "dbms" library is possible.
include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
add_headers_and_sources(clickhouse_common_stringutils .)
add_library(string_utils ${SPLIT_SHARED} ${clickhouse_common_stringutils_headers} ${clickhouse_common_stringutils_sources})
target_include_directories (string_utils PRIVATE ${DBMS_INCLUDE_DIR})

2
dbms/src/Common/StringUtils.cpp → dbms/src/Common/StringUtils/StringUtils.cpp
View File

@ -1,4 +1,4 @@
#include <Common/StringUtils.h>
#include "StringUtils.h"
namespace detail
{

0
dbms/src/Common/StringUtils.h → dbms/src/Common/StringUtils/StringUtils.h
View File

2
dbms/src/Common/Volnitsky.h
View File

@ -1,7 +1,7 @@
#pragma once
#include <Common/StringSearcher.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Core/Types.h>
#include <Poco/UTF8Encoding.h>
#include <Poco/Unicode.h>

9
dbms/src/Common/ZooKeeper/CMakeLists.txt
View File

@ -1,3 +1,12 @@
include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)
add_headers_and_sources(clickhouse_common_zookeeper .)
add_library(clickhouse_common_zookeeper ${SPLIT_SHARED} ${clickhouse_common_zookeeper_headers} ${clickhouse_common_zookeeper_sources})
target_link_libraries (clickhouse_common_zookeeper clickhouse_common_io)
if (ENABLE_TESTS)
add_subdirectory (tests)
endif ()

2
dbms/src/Common/ZooKeeper/Common.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/ZooKeeper/ZooKeeper.h>
#include "ZooKeeper.h"
#include <functional>
namespace zkutil

2
dbms/src/Common/ZooKeeper/Increment.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/ZooKeeper/ZooKeeperHolder.h>
#include "ZooKeeperHolder.h"
namespace zkutil
{

2
dbms/src/Common/ZooKeeper/KeeperException.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/Exception.h>
#include <Common/ZooKeeper/Types.h>
#include "Types.h"
#include <Common/ProfileEvents.h>

2
dbms/src/Common/ZooKeeper/LeaderElection.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/ZooKeeper/ZooKeeper.h>
#include "ZooKeeper.h"
#include <functional>
#include <memory>
#include <common/logger_useful.h>

2
dbms/src/Common/ZooKeeper/Lock.cpp
View File

@ -1,4 +1,4 @@
#include <Common/ZooKeeper/Lock.h>
#include "Lock.h"
using namespace zkutil;

2
dbms/src/Common/ZooKeeper/Lock.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/ZooKeeper/ZooKeeperHolder.h>
#include "ZooKeeperHolder.h"
#include <common/logger_useful.h>
#include <Common/Exception.h>

5
dbms/src/Common/ZooKeeper/ZooKeeper.cpp
View File

@ -1,10 +1,11 @@
#include "ZooKeeper.h"
#include <random>
#include <pcg_random.hpp>
#include <functional>
#include <Common/ZooKeeper/ZooKeeper.h>
#include <common/logger_useful.h>
#include <Common/ProfileEvents.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/PODArray.h>
#include <Common/randomSeed.h>

4
dbms/src/Common/ZooKeeper/ZooKeeper.h
View File

@ -1,7 +1,7 @@
#pragma once
#include <Common/ZooKeeper/Types.h>
#include <Common/ZooKeeper/KeeperException.h>
#include "Types.h"
#include "KeeperException.h"
#include <Poco/Util/LayeredConfiguration.h>
#include <unordered_set>
#include <future>

2
dbms/src/Common/ZooKeeper/ZooKeeperHolder.cpp
View File

@ -1,4 +1,4 @@
#include <Common/ZooKeeper/ZooKeeperHolder.h>
#include "ZooKeeperHolder.h"
using namespace zkutil;

2
dbms/src/Common/ZooKeeper/ZooKeeperHolder.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/ZooKeeper/ZooKeeper.h>
#include "ZooKeeper.h"
#include <mutex>
#include <boost/noncopyable.hpp>

2
dbms/src/Common/ZooKeeper/ZooKeeperNodeCache.cpp
View File

@ -1,4 +1,4 @@
#include <Common/ZooKeeper/ZooKeeperNodeCache.h>
#include "ZooKeeperNodeCache.h"
namespace zkutil
{

4
dbms/src/Common/ZooKeeper/ZooKeeperNodeCache.h
View File

@ -6,8 +6,8 @@
#include <memory>
#include <optional>
#include <Poco/Event.h>
#include <Common/ZooKeeper/ZooKeeper.h>
#include <Common/ZooKeeper/Common.h>
#include "ZooKeeper.h"
#include "Common.h"
namespace DB
{

14
dbms/src/Common/ZooKeeper/tests/CMakeLists.txt
View File

@ -1,20 +1,20 @@
add_executable(zkutil_test_commands zkutil_test_commands.cpp)
target_link_libraries(zkutil_test_commands clickhouse_common_io)
target_link_libraries(zkutil_test_commands clickhouse_common_zookeeper)
add_executable(zkutil_test_lock zkutil_test_lock.cpp)
target_link_libraries(zkutil_test_lock clickhouse_common_io)
target_link_libraries(zkutil_test_lock clickhouse_common_zookeeper)
add_executable(zkutil_expiration_test zkutil_expiration_test.cpp)
target_link_libraries(zkutil_expiration_test clickhouse_common_io)
target_link_libraries(zkutil_expiration_test clickhouse_common_zookeeper)
add_executable(zkutil_test_async zkutil_test_async.cpp)
target_link_libraries(zkutil_test_async clickhouse_common_io)
target_link_libraries(zkutil_test_async clickhouse_common_zookeeper)
add_executable(zkutil_zookeeper_holder zkutil_zookeeper_holder.cpp)
target_link_libraries(zkutil_zookeeper_holder clickhouse_common_io)
target_link_libraries(zkutil_zookeeper_holder clickhouse_common_zookeeper)
add_executable (zk_many_watches_reconnect zk_many_watches_reconnect.cpp)
target_link_libraries (zk_many_watches_reconnect clickhouse_common_io)
target_link_libraries (zk_many_watches_reconnect clickhouse_common_zookeeper clickhouse_common_configprocessor)
add_executable (zkutil_test_multi_exception zkutil_test_multi_exception.cpp)
target_link_libraries (zkutil_test_multi_exception clickhouse_common_io gtest_main)
target_link_libraries (zkutil_test_multi_exception clickhouse_common_zookeeper gtest_main)

2
dbms/src/Common/ZooKeeper/tests/zk_many_watches_reconnect.cpp
View File

@ -1,4 +1,4 @@
#include <Common/ConfigProcessor.h>
#include <Common/ConfigProcessor/ConfigProcessor.h>
#include <Common/ZooKeeper/ZooKeeper.h>
#include <Poco/Event.h>
#include <iostream>

2
dbms/src/Common/escapeForFileName.cpp
View File

@ -1,5 +1,5 @@
#include <Common/hex.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/escapeForFileName.h>
namespace DB

2
dbms/src/Common/getMultipleKeysFromConfig.cpp
View File

@ -1,7 +1,7 @@
#include <Common/getMultipleKeysFromConfig.h>
#include <Poco/Util/AbstractConfiguration.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
namespace DB
{

2
dbms/src/DataStreams/AggregatingSortedBlockInputStream.cpp
View File

@ -1,6 +1,6 @@
#include <DataStreams/AggregatingSortedBlockInputStream.h>
#include <Common/typeid_cast.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
namespace DB

2
dbms/src/DataStreams/SummingSortedBlockInputStream.cpp
View File

@ -4,7 +4,7 @@
#include <DataTypes/DataTypeTuple.h>
#include <DataTypes/DataTypeArray.h>
#include <Columns/ColumnTuple.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/FieldVisitors.h>
#include <common/logger_useful.h>
#include <Common/typeid_cast.h>

2
dbms/src/DataTypes/DataTypeTuple.cpp
View File

@ -1,4 +1,4 @@
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Columns/ColumnTuple.h>
#include <DataTypes/DataTypeTuple.h>
#include <DataTypes/DataTypeArray.h>

2
dbms/src/DataTypes/NestedUtils.cpp
View File

@ -1,7 +1,7 @@
#include <string.h>
#include <Common/typeid_cast.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <DataTypes/DataTypeArray.h>
#include <DataTypes/DataTypeTuple.h>

2
dbms/src/Databases/DatabaseOrdinary.cpp
View File

@ -5,7 +5,7 @@
#include <Databases/DatabaseMemory.h>
#include <Databases/DatabasesCommon.h>
#include <Common/escapeForFileName.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/Stopwatch.h>
#include <common/ThreadPool.h>
#include <Parsers/ASTCreateQuery.h>

2
dbms/src/Dictionaries/DictionaryStructure.cpp
View File

@ -1,7 +1,7 @@
#include <Dictionaries/DictionaryStructure.h>
#include <DataTypes/DataTypeFactory.h>
#include <Columns/IColumn.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <IO/WriteHelpers.h>
#include <ext/range.h>

2
dbms/src/Functions/FunctionsArray.h
View File

@ -17,7 +17,7 @@
#include <Functions/IFunction.h>
#include <Functions/ObjectPool.h>
#include <Functions/FunctionHelpers.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <ext/range.h>

2
dbms/src/Functions/FunctionsStringArray.h
View File

@ -5,7 +5,7 @@
#include <Columns/ColumnFixedString.h>
#include <Columns/ColumnConst.h>
#include <Columns/ColumnArray.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/typeid_cast.h>
#include <Functions/IFunction.h>
#include <Functions/Regexps.h>

2
dbms/src/Functions/FunctionsURL.h
View File

@ -2,7 +2,7 @@
#include <DataTypes/DataTypeString.h>
#include <Columns/ColumnString.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/StringView.h>
#include <Common/typeid_cast.h>
#include <Functions/FunctionHelpers.h>

2
dbms/src/IO/ReadHelpers.cpp
View File

@ -1,7 +1,7 @@
#include <Core/Defines.h>
#include <Common/hex.h>
#include <Common/PODArray.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <IO/WriteHelpers.h>
#include <IO/WriteBufferFromString.h>
#include <IO/readFloatText.h>

2
dbms/src/IO/ReadHelpers.h
View File

@ -16,7 +16,7 @@
#include <Core/UUID.h>
#include <common/StringRef.h>
#include <Common/Exception.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/Arena.h>
#include <Common/UInt128.h>

2
dbms/src/IO/WriteHelpers.h
View File

@ -14,7 +14,7 @@
#include <Core/Types.h>
#include <Core/UUID.h>
#include <Common/Exception.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/UInt128.h>
#include <common/StringRef.h>

2
dbms/src/Interpreters/Cluster.cpp
View File

@ -3,7 +3,7 @@
#include <Common/escapeForFileName.h>
#include <Common/isLocalAddress.h>
#include <Common/SimpleCache.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/parseAddress.h>
#include <IO/HexWriteBuffer.h>
#include <IO/WriteHelpers.h>

2
dbms/src/Interpreters/Compiler.cpp
View File

@ -4,7 +4,7 @@
#include <Common/SipHash.h>
#include <Common/ShellCommand.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <IO/Operators.h>
#include <IO/ReadBufferFromString.h>

2
dbms/src/Interpreters/Context.cpp
View File

@ -45,7 +45,7 @@
#include <Parsers/ParserCreateQuery.h>
#include <Parsers/parseQuery.h>
#include <Common/ConfigProcessor.h>
#include <Common/ConfigProcessor/ConfigProcessor.h>
#include <Common/ZooKeeper/ZooKeeper.h>
#include <common/logger_useful.h>

2
dbms/src/Interpreters/ExpressionAnalyzer.cpp
View File

@ -48,7 +48,7 @@
#include <Dictionaries/IDictionary.h>
#include <Common/typeid_cast.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Parsers/formatAST.h>

2
dbms/src/Interpreters/ExternalLoader.cpp
View File

@ -1,5 +1,5 @@
#include <Interpreters/ExternalLoader.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/MemoryTracker.h>
#include <Common/Exception.h>
#include <Common/setThreadName.h>

4
dbms/src/Interpreters/ExternalLoaderConfigRepository.cpp
View File

@ -1,7 +1,7 @@
#include <Interpreters/ExternalLoaderConfigRepository.h>
#include <Common/StringUtils.h>
#include <Common/ConfigProcessor.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/ConfigProcessor/ConfigProcessor.h>
#include <Common/getMultipleKeysFromConfig.h>
#include <Poco/Glob.h>

2
dbms/src/Interpreters/Quota.cpp
View File

@ -3,7 +3,7 @@
#include <common/logger_useful.h>
#include <Common/SipHash.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <IO/ReadHelpers.h>
#include <Interpreters/Quota.h>

2
dbms/src/Interpreters/Users.cpp
View File

@ -14,7 +14,7 @@
#include <IO/WriteBufferFromString.h>
#include <IO/WriteHelpers.h>
#include <Common/SimpleCache.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Interpreters/Users.h>
#include <openssl/sha.h>

2
dbms/src/Interpreters/tests/users.cpp
View File

@ -1,4 +1,4 @@
#include <Common/ConfigProcessor.h>
#include <Common/ConfigProcessor/ConfigProcessor.h>
#include <Interpreters/SecurityManager.h>
#include <boost/filesystem.hpp>

2
dbms/src/Parsers/CommonParsers.cpp
View File

@ -1,4 +1,4 @@
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Parsers/CommonParsers.h>
#include <common/find_first_symbols.h>

2
dbms/src/Parsers/ExpressionListParsers.cpp
View File

@ -8,7 +8,7 @@
#include <Parsers/ExpressionListParsers.h>
#include <Parsers/ParserCreateQuery.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
namespace DB

2
dbms/src/Parsers/Lexer.cpp
View File

@ -1,5 +1,5 @@
#include <Parsers/Lexer.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <common/find_first_symbols.h>

2
dbms/src/Parsers/parseQuery.cpp
View File

@ -3,7 +3,7 @@
#include <Parsers/ASTInsertQuery.h>
#include <Parsers/Lexer.h>
#include <Parsers/TokenIterator.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/typeid_cast.h>
#include <Common/UTF8Helpers.h>
#include <IO/WriteHelpers.h>

2
dbms/src/Server/CMakeLists.txt
View File

@ -23,7 +23,7 @@ add_library (clickhouse-local-lib LocalServer.cpp)
target_link_libraries (clickhouse-local-lib clickhouse-server-lib clickhouse_functions clickhouse_aggregate_functions clickhouse_table_functions)
add_library (clickhouse-extract-from-config-lib ${SPLIT_SHARED} ExtractFromConfig.cpp)
target_link_libraries (clickhouse-extract-from-config-lib clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})
target_link_libraries (clickhouse-extract-from-config-lib clickhouse_common_configprocessor clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})
add_library (clickhouse-client-lib Client.cpp)
target_link_libraries (clickhouse-client-lib clickhouse_functions clickhouse_aggregate_functions clickhouse_table_functions ${LINE_EDITING_LIBS} ${Boost_PROGRAM_OPTIONS_LIBRARY})

2
dbms/src/Server/ConfigReloader.cpp
View File

@ -7,7 +7,7 @@
#include <Interpreters/Context.h>
#include <Common/setThreadName.h>
#include <Common/ConfigProcessor.h>
#include <Common/ConfigProcessor/ConfigProcessor.h>
namespace DB

2
dbms/src/Server/ConfigReloader.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <Common/ConfigProcessor.h>
#include <Common/ConfigProcessor/ConfigProcessor.h>
#include <Common/ZooKeeper/Common.h>
#include <Common/ZooKeeper/ZooKeeperNodeCache.h>

2
dbms/src/Server/ExtractFromConfig.cpp
View File

@ -9,7 +9,7 @@
#include <Poco/Util/XMLConfiguration.h>
#include <Common/ZooKeeper/ZooKeeperNodeCache.h>
#include <Common/ConfigProcessor.h>
#include <Common/ConfigProcessor/ConfigProcessor.h>
#include <Common/Exception.h>

2
dbms/src/Server/HTTPHandler.cpp
View File

@ -10,7 +10,7 @@
#include <ext/scope_guard.h>
#include <Common/ExternalTable.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/escapeForFileName.h>
#include <IO/ReadBufferFromIStream.h>

2
dbms/src/Server/LocalServer.cpp
View File

@ -12,7 +12,7 @@
#include <Interpreters/loadMetadata.h>
#include <Common/Exception.h>
#include <Common/Macros.h>
#include <Common/ConfigProcessor.h>
#include <Common/ConfigProcessor/ConfigProcessor.h>
#include <Common/escapeForFileName.h>
#include <IO/ReadBufferFromString.h>
#include <IO/WriteBufferFromString.h>

2
dbms/src/Server/Server.cpp
View File

@ -15,7 +15,7 @@
#include <Common/ClickHouseRevision.h>
#include <Common/CurrentMetrics.h>
#include <Common/Macros.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/ZooKeeper/ZooKeeper.h>
#include <Common/ZooKeeper/ZooKeeperNodeCache.h>
#include <Common/config.h>

2
dbms/src/Server/main.cpp
View File

@ -7,7 +7,7 @@
#include "Server.h"
#include "LocalServer.h"
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
/// Universal executable for various clickhouse applications
int mainEntryClickHouseServer(int argc, char ** argv);

2
dbms/src/Storages/CompressionSettingsSelector.h
View File

@ -2,7 +2,7 @@
#include <IO/CompressionSettings.h>
#include <IO/ReadHelpers.h>
#include <Common/Exception.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Poco/Util/AbstractConfiguration.h>
namespace DB

2
dbms/src/Storages/Distributed/DirectoryMonitor.cpp
View File

@ -3,7 +3,7 @@
#include <Common/escapeForFileName.h>
#include <Common/setThreadName.h>
#include <Common/CurrentMetrics.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/ClickHouseRevision.h>
#include <Common/SipHash.h>
#include <Interpreters/Context.h>

2
dbms/src/Storages/MergeTree/MergeTreeData.cpp
View File

@ -32,7 +32,7 @@
#include <Common/Increment.h>
#include <Common/SimpleIncrement.h>
#include <Common/escapeForFileName.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/Stopwatch.h>
#include <Common/typeid_cast.h>
#include <Common/localBackup.h>

2
dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp
View File

@ -10,7 +10,7 @@
#include <Core/Defines.h>
#include <Common/SipHash.h>
#include <Common/escapeForFileName.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Storages/MergeTree/MergeTreeDataPart.h>
#include <Storages/MergeTree/MergeTreeData.h>

2
dbms/src/Storages/MergeTree/MergedBlockOutputStream.cpp
View File

@ -2,7 +2,7 @@
#include <IO/createWriteBufferFromFileBase.h>
#include <Common/escapeForFileName.h>
#include <DataTypes/NestedUtils.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/typeid_cast.h>
#include <Common/MemoryTracker.h>
#include <Poco/File.h>

2
dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
View File

@ -3,7 +3,7 @@
#include <IO/WriteHelpers.h>
#include <Storages/MergeTree/MergeTreeDataPart.h>
#include <Storages/MergeTree/MergeTreeDataMerger.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
namespace DB

2
dbms/src/Storages/StorageLog.cpp
View File

@ -2,7 +2,7 @@
#include <Storages/StorageFactory.h>
#include <Common/Exception.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <IO/ReadBufferFromFile.h>
#include <IO/WriteBufferFromFile.h>

3
dbms/src/Storages/StorageMergeTree.cpp
View File

@ -182,9 +182,6 @@ void StorageMergeTree::alter(
}
}
if (primary_key_is_modified && data.merging_params.mode == MergeTreeData::MergingParams::Unsorted)
throw Exception("UnsortedMergeTree cannot have primary key", ErrorCodes::BAD_ARGUMENTS);
if (primary_key_is_modified && supportsSampling())
throw Exception("MODIFY PRIMARY KEY only supported for tables without sampling key", ErrorCodes::BAD_ARGUMENTS);

2
dbms/src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -34,7 +34,7 @@
#include <Common/formatReadable.h>
#include <Common/setThreadName.h>
#include <Common/escapeForFileName.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Common/typeid_cast.h>
#include <Poco/DirectoryIterator.h>

2
dbms/src/Storages/StorageSet.cpp
View File

@ -7,7 +7,7 @@
#include <DataStreams/NativeBlockOutputStream.h>
#include <DataStreams/NativeBlockInputStream.h>
#include <Common/escapeForFileName.h>
#include <Common/StringUtils.h>
#include <Common/StringUtils/StringUtils.h>
#include <Interpreters/Set.h>
#include <Poco/DirectoryIterator.h>

2
libs/libdaemon/include/daemon/BaseDaemon.h
View File

@ -23,7 +23,7 @@
#include <common/Types.h>
#include <common/logger_useful.h>
#include <daemon/GraphiteWriter.h>
#include <Common/ConfigProcessor.h>
#include <Common/ConfigProcessor/ConfigProcessor.h>
namespace Poco { class TaskManager; }

2
libs/libdaemon/src/BaseDaemon.cpp
View File

@ -1,6 +1,6 @@
#include <daemon/BaseDaemon.h>
#include <Common/ConfigProcessor.h>
#include <Common/ConfigProcessor/ConfigProcessor.h>
#include <sys/stat.h>
#include <sys/types.h>

2
utils/config-processor/CMakeLists.txt
View File

@ -1,4 +1,4 @@
add_executable (config-processor config-processor.cpp)
target_link_libraries (config-processor clickhouse_common_io)
target_link_libraries (config-processor clickhouse_common_configprocessor)
INSTALL(TARGETS config-processor RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT config-processor)

2
utils/config-processor/config-processor.cpp
View File

@ -1,4 +1,4 @@
#include <Common/ConfigProcessor.h>
#include <Common/ConfigProcessor/ConfigProcessor.h>
#include <iostream>
int main(int argc, char ** argv)

2
utils/zookeeper-cli/CMakeLists.txt
View File

@ -1,3 +1,3 @@
add_executable(clickhouse-zookeeper-cli zookeeper-cli.cpp)
target_link_libraries(clickhouse-zookeeper-cli clickhouse_common_io ${LINE_EDITING_LIBS})
target_link_libraries(clickhouse-zookeeper-cli clickhouse_common_zookeeper ${LINE_EDITING_LIBS})
INSTALL(TARGETS clickhouse-zookeeper-cli RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse-utils)

2
utils/zookeeper-dump-tree/CMakeLists.txt
View File

@ -1,2 +1,2 @@
add_executable (zookeeper-dump-tree main.cpp ${SRCS})
target_link_libraries (zookeeper-dump-tree clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})
target_link_libraries (zookeeper-dump-tree clickhouse_common_zookeeper ${Boost_PROGRAM_OPTIONS_LIBRARY})

2
utils/zookeeper-remove-by-list/CMakeLists.txt
View File

@ -1,2 +1,2 @@
add_executable (zookeeper-remove-by-list main.cpp ${SRCS})
target_link_libraries (zookeeper-remove-by-list clickhouse_common_io ${Boost_PROGRAM_OPTIONS_LIBRARY})
target_link_libraries (zookeeper-remove-by-list clickhouse_common_zookeeper ${Boost_PROGRAM_OPTIONS_LIBRARY})