thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 16:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
proller 2017-11-17 22:40:27 +03:00
parent aa3dd03389
commit 5ba7e20c03
8 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dbms/CMakeLists.txt
View File

@ -94,6 +94,8 @@ list (APPEND dbms_headers src/TableFunctions/ITableFunction.h src/TableFunctions
list(REMOVE_ITEM dbms_common_io_sources list(REMOVE_ITEM dbms_common_io_sources
src/Common/StringUtils.cpp) src/Common/StringUtils.cpp)
list(REMOVE_ITEM dbms_common_io_headers
src/Common/StringUtils.h)
if (APPLE OR CMAKE_SYSTEM MATCHES "FreeBSD") if (APPLE OR CMAKE_SYSTEM MATCHES "FreeBSD")
list(REMOVE_ITEM dbms_common_io_headers list(REMOVE_ITEM dbms_common_io_headers
@ -149,11 +151,13 @@ endif()
target_link_libraries (dbms_common_io target_link_libraries (dbms_common_io
common common
string_utils
${LINK_LIBRARIES_ONLY_ON_X86_64} ${LINK_LIBRARIES_ONLY_ON_X86_64}
${LZ4_LIBRARY} ${LZ4_LIBRARY}
${ZSTD_LIBRARY} ${ZSTD_LIBRARY}
${ZOOKEEPER_LIBRARY} ${ZOOKEEPER_LIBRARY}
${DOUBLE_CONVERSION_LIBRARIES} ${DOUBLE_CONVERSION_LIBRARIES}
${Poco_Net_LIBRARY}
) )
target_link_libraries (dbms target_link_libraries (dbms
@ -161,7 +165,6 @@ target_link_libraries (dbms
${MYSQLXX_LIBRARY} ${MYSQLXX_LIBRARY}
${FARMHASH_LIBRARIES} ${FARMHASH_LIBRARIES}
${METROHASH_LIBRARIES} ${METROHASH_LIBRARIES}
string_utils
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${RE2_LIBRARY} ${RE2_LIBRARY}
${RE2_ST_LIBRARY} ${RE2_ST_LIBRARY}

0
dbms/src/Interpreters/DNSCache.cpp → dbms/src/Common/DNSCache.cpp
View File

0
dbms/src/Interpreters/DNSCache.h → dbms/src/Common/DNSCache.h
View File

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

@ -4,7 +4,7 @@
#include <Common/config.h> #include <Common/config.h>
#include <Core/Types.h> #include <Core/Types.h>
#include <IO/ReadBufferFromIStream.h> #include <IO/ReadBufferFromIStream.h>
#include <Interpreters/DNSCache.h> #include <Common/DNSCache.h>
#include <Poco/Net/HTTPRequest.h> #include <Poco/Net/HTTPRequest.h>
#include <Poco/Net/HTTPResponse.h> #include <Poco/Net/HTTPResponse.h>
#include <Poco/Version.h> #include <Poco/Version.h>

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

@ -1,5 +1,5 @@
#include <Interpreters/Cluster.h> #include <Interpreters/Cluster.h>
#include <Interpreters/DNSCache.h> #include <Common/DNSCache.h>
#include <Common/escapeForFileName.h> #include <Common/escapeForFileName.h>
#include <Common/isLocalAddress.h> #include <Common/isLocalAddress.h>
#include <Common/SimpleCache.h> #include <Common/SimpleCache.h>

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

@ -38,7 +38,7 @@
#include <Interpreters/QueryLog.h> #include <Interpreters/QueryLog.h>
#include <Interpreters/PartLog.h> #include <Interpreters/PartLog.h>
#include <Interpreters/Context.h> #include <Interpreters/Context.h>
#include <Interpreters/DNSCache.h> #include <Common/DNSCache.h>
#include <IO/ReadBufferFromFile.h> #include <IO/ReadBufferFromFile.h>
#include <IO/UncompressedCache.h> #include <IO/UncompressedCache.h>
#include <Parsers/ASTCreateQuery.h> #include <Parsers/ASTCreateQuery.h>

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

@ -16,7 +16,7 @@
#include <Interpreters/executeQuery.h> #include <Interpreters/executeQuery.h>
#include <Interpreters/Cluster.h> #include <Interpreters/Cluster.h>
#include <Interpreters/DNSCache.h> #include <Common/DNSCache.h>
#include <Common/getFQDNOrHostName.h> #include <Common/getFQDNOrHostName.h>
#include <Common/setThreadName.h> #include <Common/setThreadName.h>

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

@ -1,5 +1,5 @@
#include <Interpreters/InterpreterSystemQuery.h> #include <Interpreters/InterpreterSystemQuery.h>
#include <Interpreters/DNSCache.h> #include <Common/DNSCache.h>
#include <Interpreters/Context.h> #include <Interpreters/Context.h>
#include <Interpreters/ExternalDictionaries.h> #include <Interpreters/ExternalDictionaries.h>
#include <Interpreters/EmbeddedDictionaries.h> #include <Interpreters/EmbeddedDictionaries.h>