Fix build without nuraft

cmake/find/nuraft.cmake

@@ -1,6 +1,6 @@
 option(ENABLE_NURAFT "Enable NuRaft" ${ENABLE_LIBRARIES})
 
-if (NOT ENABLE_NURAFT)
+ if (NOT ENABLE_NURAFT)
     return()
 endif()
 
@@ -11,7 +11,7 @@ if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/NuRaft/CMakeLists.txt")
     return()
 endif ()
 
-if (NOT OS_FREEBSD)
+if (NOT OS_FREEBSD AND NOT OS_DARWIN)
     set (USE_NURAFT 1)
     set (NURAFT_LIBRARY nuraft)
 
@@ -20,5 +20,5 @@ if (NOT OS_FREEBSD)
     message (STATUS "Using NuRaft=${USE_NURAFT}: ${NURAFT_INCLUDE_DIR} : ${NURAFT_LIBRARY}")
 else()
     set (USE_NURAFT 0)
-    message (STATUS "Using internal NuRaft library on FreeBSD is not supported")
+    message (STATUS "Using internal NuRaft library on FreeBSD and Darwin is not supported")
 endif()

programs/server/Server.cpp

@@ -59,7 +59,6 @@
 #include <Disks/registerDisks.h>
 #include <Common/Config/ConfigReloader.h>
 #include <Server/HTTPHandlerFactory.h>
-#include <Server/TestKeeperTCPHandlerFactory.h>
 #include "MetricsTransmitter.h"
 #include <Common/StatusFile.h>
 #include <Server/TCPHandlerFactory.h>
@@ -94,6 +93,9 @@
 #   include <Server/GRPCServer.h>
 #endif
 
+#if USE_NURAFT
+#   include <Server/TestKeeperTCPHandlerFactory.h>
+#endif
 
 namespace CurrentMetrics
 {
@@ -844,27 +846,31 @@ int Server::main(const std::vector<std::string> & /*args*/)
 
     if (config().has("test_keeper_server"))
     {
+#if USE_NURAFT
         /// Initialize test keeper RAFT. Do nothing if no test_keeper_server in config.
         global_context->initializeTestKeeperStorageDispatcher();
-    }
-
-    for (const auto & listen_host : listen_hosts)
-    {
-        /// TCP TestKeeper
-        const char * port_name = "test_keeper_server.tcp_port";
-        createServer(listen_host, port_name, listen_try, [&](UInt16 port)
+        for (const auto & listen_host : listen_hosts)
         {
-            Poco::Net::ServerSocket socket;
-            auto address = socketBindListen(socket, listen_host, port);
-            socket.setReceiveTimeout(settings.receive_timeout);
-            socket.setSendTimeout(settings.send_timeout);
-            servers_to_start_before_tables->emplace_back(
-                port_name,
-                std::make_unique<Poco::Net::TCPServer>(
-                    new TestKeeperTCPHandlerFactory(*this), server_pool, socket, new Poco::Net::TCPServerParams));
+            /// TCP TestKeeper
+            const char * port_name = "test_keeper_server.tcp_port";
+            createServer(listen_host, port_name, listen_try, [&](UInt16 port)
+            {
+                Poco::Net::ServerSocket socket;
+                auto address = socketBindListen(socket, listen_host, port);
+                socket.setReceiveTimeout(settings.receive_timeout);
+                socket.setSendTimeout(settings.send_timeout);
+                servers_to_start_before_tables->emplace_back(
+                    port_name,
+                    std::make_unique<Poco::Net::TCPServer>(
+                        new TestKeeperTCPHandlerFactory(*this), server_pool, socket, new Poco::Net::TCPServerParams));
+
+                LOG_INFO(log, "Listening for connections to fake zookeeper (tcp): {}", address.toString());
+            });
+        }
+#else
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "ClickHouse server built without NuRaft library. Cannot use internal coordination.");
+#endif
 
-            LOG_INFO(log, "Listening for connections to fake zookeeper (tcp): {}", address.toString());
-        });
     }
 
     for (auto & server : *servers_to_start_before_tables)

src/CMakeLists.txt

@@ -192,7 +192,10 @@ add_object_library(clickhouse_processors_merges Processors/Merges)
 add_object_library(clickhouse_processors_merges_algorithms Processors/Merges/Algorithms)
 add_object_library(clickhouse_processors_queryplan Processors/QueryPlan)
 add_object_library(clickhouse_processors_queryplan_optimizations Processors/QueryPlan/Optimizations)
-add_object_library(clickhouse_coordination Coordination)
+
+if (USE_NURAFT)
+    add_object_library(clickhouse_coordination Coordination)
+endif()
 
 set (DBMS_COMMON_LIBRARIES)
 # libgcc_s does not provide an implementation of an atomics library. Instead,

src/Coordination/TestKeeperStorageDispatcher.h

@@ -1,11 +1,20 @@
 #pragma once
 
+#if !defined(ARCADIA_BUILD)
+#    include <Common/config.h>
+#    include "config_core.h"
+#endif
+
+#if USE_NURAFT
+
 #include <Common/ThreadPool.h>
 #include <Common/ConcurrentBoundedQueue.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Common/Exception.h>
+#include <common/logger_useful.h>
 #include <functional>
 #include <Coordination/NuKeeperServer.h>
-#include <Poco/Util/AbstractConfiguration.h>
-#include <common/logger_useful.h>
+
 
 namespace DB
 {
@@ -14,6 +23,7 @@ using ZooKeeperResponseCallback = std::function<void(const Coordination::ZooKeep
 
 class TestKeeperStorageDispatcher
 {
+
 private:
     Poco::Timespan operation_timeout{0, Coordination::DEFAULT_OPERATION_TIMEOUT_MS * 1000};
 
@@ -67,6 +77,9 @@ public:
     void registerSession(int64_t session_id, ZooKeeperResponseCallback callback);
     /// Call if we don't need any responses for this session no more (session was expired)
     void finishSession(int64_t session_id);
+
 };
 
 }
+
+#endif

src/Coordination/tests/gtest_for_build.cpp

@@ -1,5 +1,12 @@
 #include <gtest/gtest.h>
 
+#if !defined(ARCADIA_BUILD)
+#    include <Common/config.h>
+#    include "config_core.h"
+#endif
+
+#if USE_NURAFT
+
 #include <Coordination/InMemoryLogStore.h>
 #include <Coordination/InMemoryStateManager.h>
 #include <Coordination/TestKeeperStorageSerializer.h>
@@ -454,5 +461,8 @@ TEST(CoordinationTest, TestNuKeeperRaft)
     s4.launcher.shutdown(5);
 }
 
-#  endif
+# endif
+
+#endif
+
 #endif

src/Core/config_core.h.in

@@ -13,3 +13,4 @@
 #cmakedefine01 USE_LDAP
 #cmakedefine01 USE_ROCKSDB
 #cmakedefine01 USE_LIBPQXX
+#cmakedefine01 USE_NURAFT

src/Interpreters/Context.cpp

@@ -304,8 +304,10 @@ struct ContextShared
     mutable zkutil::ZooKeeperPtr zookeeper;                 /// Client for ZooKeeper.
     ConfigurationPtr zookeeper_config;                      /// Stores zookeeper configs
 
+#if USE_NURAFT
     mutable std::mutex test_keeper_storage_dispatcher_mutex;
     mutable std::shared_ptr<TestKeeperStorageDispatcher> test_keeper_storage_dispatcher;
+#endif
     mutable std::mutex auxiliary_zookeepers_mutex;
     mutable std::map<String, zkutil::ZooKeeperPtr> auxiliary_zookeepers;    /// Map for auxiliary ZooKeeper clients.
     ConfigurationPtr auxiliary_zookeepers_config;           /// Stores auxiliary zookeepers configs
@@ -1579,8 +1581,10 @@ zkutil::ZooKeeperPtr Context::getZooKeeper() const
     return shared->zookeeper;
 }
 
+
 void Context::initializeTestKeeperStorageDispatcher() const
 {
+#if USE_NURAFT
     std::lock_guard lock(shared->test_keeper_storage_dispatcher_mutex);
 
     if (shared->test_keeper_storage_dispatcher)
@@ -1592,8 +1596,10 @@ void Context::initializeTestKeeperStorageDispatcher() const
         shared->test_keeper_storage_dispatcher = std::make_shared<TestKeeperStorageDispatcher>();
         shared->test_keeper_storage_dispatcher->initialize(config);
     }
+#endif
 }
 
+#if USE_NURAFT
 std::shared_ptr<TestKeeperStorageDispatcher> & Context::getTestKeeperStorageDispatcher() const
 {
     std::lock_guard lock(shared->test_keeper_storage_dispatcher_mutex);
@@ -1602,17 +1608,21 @@ std::shared_ptr<TestKeeperStorageDispatcher> & Context::getTestKeeperStorageDisp
 
     return shared->test_keeper_storage_dispatcher;
 }
+#endif
 
 void Context::shutdownTestKeeperStorageDispatcher() const
 {
+#if USE_NURAFT
     std::lock_guard lock(shared->test_keeper_storage_dispatcher_mutex);
     if (shared->test_keeper_storage_dispatcher)
     {
         shared->test_keeper_storage_dispatcher->shutdown();
         shared->test_keeper_storage_dispatcher.reset();
     }
+#endif
 }
 
+
 zkutil::ZooKeeperPtr Context::getAuxiliaryZooKeeper(const String & name) const
 {
     std::lock_guard lock(shared->auxiliary_zookeepers_mutex);

src/Interpreters/Context.h

@@ -573,9 +573,10 @@ public:
     /// Same as above but return a zookeeper connection from auxiliary_zookeepers configuration entry.
     std::shared_ptr<zkutil::ZooKeeper> getAuxiliaryZooKeeper(const String & name) const;
 
-
-    void initializeTestKeeperStorageDispatcher() const;
+#if USE_NURAFT
     std::shared_ptr<TestKeeperStorageDispatcher> & getTestKeeperStorageDispatcher() const;
+#endif
+    void initializeTestKeeperStorageDispatcher() const;
     void shutdownTestKeeperStorageDispatcher() const;
 
     /// Set auxiliary zookeepers configuration at server starting or configuration reloading.

src/Server/TestKeeperTCPHandler.cpp

@@ -1,4 +1,7 @@
 #include <Server/TestKeeperTCPHandler.h>
+
+#if USE_NURAFT
+
 #include <Common/ZooKeeper/ZooKeeperIO.h>
 #include <Core/Types.h>
 #include <IO/WriteBufferFromPocoSocket.h>
@@ -22,9 +25,11 @@
     #include <poll.h>
 #endif
 
+
 namespace DB
 {
 
+
 namespace ErrorCodes
 {
     extern const int SYSTEM_ERROR;
@@ -454,3 +459,5 @@ std::pair<Coordination::OpNum, Coordination::XID> TestKeeperTCPHandler::receiveR
 }
 
 }
+
+#endif

src/Server/TestKeeperTCPHandler.h

@@ -1,5 +1,12 @@
 #pragma once
 
+#if !defined(ARCADIA_BUILD)
+#    include <Common/config.h>
+#    include "config_core.h"
+#endif
+
+#if USE_NURAFT
+
 #include <Poco/Net/TCPServerConnection.h>
 #include "IServer.h"
 #include <Common/Stopwatch.h>
@@ -53,3 +60,4 @@ private:
 };
 
 }
+#endif

src/Server/TestKeeperTCPHandlerFactory.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <Server/TestKeeperTCPHandler.h>
 #include <Poco/Net/TCPServerConnectionFactory.h>
 #include <Poco/Net/NetException.h>