Skip to content

Commit 1ddb04b

Browse files
alexey-milovidovalexey-milovidov
authored
Merge pull request #36715 from amosbird/refactorbase
Reorganize source files so that base won't depend on Common
2 parents 03dc4f6 + 20f63a6 commit 1ddb04b

File tree

350 files changed

+367
-377
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

350 files changed

+367
-377
lines changed

‎base/CMakeLists.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ if (USE_CLANG_TIDY)
33
endif ()
44

55
add_subdirectory (base)
6-
add_subdirectory (daemon)
7-
add_subdirectory (loggers)
86
add_subdirectory (pcg-random)
97
add_subdirectory (widechar_width)
108
add_subdirectory (readpassphrase)
11-
add_subdirectory (bridge)

‎base/bridge/CMakeLists.txt‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎programs/client/Client.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <iostream>
55
#include <iomanip>
66
#include <optional>
7-
#include <base/scope_guard_safe.h>
7+
#include <Common/scope_guard_safe.h>
88
#include <boost/program_options.hpp>
99
#include <boost/algorithm/string/replace.hpp>
1010
#include <filesystem>

‎programs/copier/ClusterCopierApp.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <Common/TerminalSize.h>
44
#include <IO/ConnectionTimeoutsContext.h>
55
#include <Formats/registerFormats.h>
6-
#include <base/scope_guard_safe.h>
6+
#include <Common/scope_guard_safe.h>
77
#include <unistd.h>
88
#include <filesystem>
99

‎programs/copier/ClusterCopierApp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include <Poco/Util/ServerApplication.h>
4-
#include <daemon/BaseDaemon.h>
4+
#include <Daemon/BaseDaemon.h>
55

66
#include "ClusterCopier.h"
77

‎programs/copier/Internals.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <Poco/SplitterChannel.h>
1414
#include <Poco/Util/HelpFormatter.h>
1515
#include <boost/algorithm/string.hpp>
16-
#include <base/logger_useful.h>
16+
#include <Common/logger_useful.h>
1717
#include <Common/ThreadPool.h>
1818
#include <Common/Exception.h>
1919
#include <Common/ZooKeeper/ZooKeeper.h>

‎programs/keeper-converter/KeeperConverter.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <Poco/ConsoleChannel.h>
99
#include <Poco/AutoPtr.h>
1010
#include <Poco/Logger.h>
11-
#include <base/logger_useful.h>
11+
#include <Common/logger_useful.h>
1212

1313

1414
int mainEntryClickHouseKeeperConverter(int argc, char ** argv)

‎programs/keeper/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ if (BUILD_STANDALONE_KEEPER)
8989
${CMAKE_CURRENT_SOURCE_DIR}/../../src/Common/ZooKeeper/ZooKeeperLock.cpp
9090
${CMAKE_CURRENT_SOURCE_DIR}/../../src/Common/ZooKeeper/ZooKeeperNodeCache.cpp
9191

92-
${CMAKE_CURRENT_SOURCE_DIR}/../../base/daemon/BaseDaemon.cpp
93-
${CMAKE_CURRENT_SOURCE_DIR}/../../base/daemon/SentryWriter.cpp
94-
${CMAKE_CURRENT_SOURCE_DIR}/../../base/daemon/GraphiteWriter.cpp
92+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/Daemon/BaseDaemon.cpp
93+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/Daemon/SentryWriter.cpp
94+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/Daemon/GraphiteWriter.cpp
9595

9696
Keeper.cpp
9797
TinyContext.cpp

‎programs/keeper/Keeper.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#include <filesystem>
1111
#include <IO/UseSSL.h>
1212
#include <Core/ServerUUID.h>
13-
#include <base/logger_useful.h>
14-
#include <base/ErrorHandlers.h>
13+
#include <Common/logger_useful.h>
14+
#include <Common/ErrorHandlers.h>
1515
#include <base/scope_guard.h>
1616
#include <base/safeExit.h>
1717
#include <Poco/Net/NetException.h>

‎programs/keeper/Keeper.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include <Server/IServer.h>
4-
#include <daemon/BaseDaemon.h>
4+
#include <Daemon/BaseDaemon.h>
55
#include "TinyContext.h"
66

77
namespace Poco

0 commit comments

Comments
 (0)