thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:yandex/ClickHouse

Browse Source
This commit is contained in:
Alexey Milovidov 2018-08-20 22:24:45 +03:00
commit 21cedbe46f
12 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/CMakeLists.txt vendored
View File

@ -151,7 +151,7 @@ endif ()
if (USE_INTERNAL_LLVM_LIBRARY)
# ld: unknown option: --color-diagnostics
if (APPLE AND COMPILER_GCC)
if (APPLE)
set (LINKER_SUPPORTS_COLOR_DIAGNOSTICS 0 CACHE INTERNAL "")
endif ()
add_subdirectory (llvm/llvm)

1
dbms/CMakeLists.txt
View File

@ -157,6 +157,7 @@ target_link_libraries (dbms
${RE2_LIBRARY}
${RE2_ST_LIBRARY}
${BTRIE_LIBRARIES}
${Boost_PROGRAM_OPTIONS_LIBRARY}
)
if (NOT USE_INTERNAL_RE2_LIBRARY)

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

@ -6,7 +6,7 @@
#include <memory>
#include <common/logger_useful.h>
#include <Common/CurrentMetrics.h>
#include <Common/BackgroundSchedulePool.h>
#include <Core/BackgroundSchedulePool.h>
namespace ProfileEvents

2
dbms/src/Common/BackgroundSchedulePool.cpp → dbms/src/Core/BackgroundSchedulePool.cpp
View File

@ -1,4 +1,4 @@
#include <Common/BackgroundSchedulePool.h>
#include "BackgroundSchedulePool.h"
#include <Common/MemoryTracker.h>
#include <Common/CurrentMetrics.h>
#include <Common/Exception.h>

0
dbms/src/Common/BackgroundSchedulePool.h → dbms/src/Core/BackgroundSchedulePool.h
View File

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

@ -1,21 +1,18 @@
#include <map>
#include <set>
#include <boost/functional/hash/hash.hpp>
#include <Poco/Mutex.h>
#include <Poco/File.h>
#include <Poco/UUID.h>
#include <Poco/Net/IPAddress.h>
#include <common/logger_useful.h>
#include <pcg_random.hpp>
#include <Common/Macros.h>
#include <Common/escapeForFileName.h>
#include <Common/setThreadName.h>
#include <Common/Stopwatch.h>
#include <Common/formatReadable.h>
#include <Common/BackgroundSchedulePool.h>
#include <Core/BackgroundSchedulePool.h>
#include <Formats/FormatFactory.h>
#include <Databases/IDatabase.h>
#include <Storages/IStorage.h>

2
dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.h
View File

@ -1,7 +1,7 @@
#pragma once
#include <thread>
#include <Common/BackgroundSchedulePool.h>
#include <Core/BackgroundSchedulePool.h>
#include <Common/ZooKeeper/Types.h>
#include <Core/Types.h>
#include <common/logger_useful.h>

3
dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
View File

@ -4,10 +4,9 @@
#include <Common/ZooKeeper/Types.h>
#include <Common/ZooKeeper/ZooKeeper.h>
#include <common/logger_useful.h>
#include <Common/BackgroundSchedulePool.h>
#include <Core/BackgroundSchedulePool.h>
#include <thread>
#include <map>
#include <pcg_random.hpp>

2
dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
View File

@ -10,7 +10,7 @@
#include <Poco/Event.h>
#include <Core/Types.h>
#include <common/logger_useful.h>
#include <Common/BackgroundSchedulePool.h>
#include <Core/BackgroundSchedulePool.h>
namespace DB
{

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

@ -10,7 +10,7 @@
#include <Storages/MergeTree/MergeTreeMutationStatus.h>
#include <Common/ZooKeeper/ZooKeeper.h>
#include <Common/BackgroundSchedulePool.h>
#include <Core/BackgroundSchedulePool.h>
namespace DB

2
dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
View File

@ -2,7 +2,7 @@
#include <Poco/Event.h>
#include <common/logger_useful.h>
#include <Common/BackgroundSchedulePool.h>
#include <Core/BackgroundSchedulePool.h>
#include <Core/Types.h>
#include <thread>
#include <atomic>

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

@ -23,7 +23,7 @@
#include <Common/randomSeed.h>
#include <Common/ZooKeeper/ZooKeeper.h>
#include <Common/ZooKeeper/LeaderElection.h>
#include <Common/BackgroundSchedulePool.h>
#include <Core/BackgroundSchedulePool.h>
namespace DB