From 341a9b3b7067afa81a37c6819a259dd40f7ca682 Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Sat, 13 Jan 2024 12:56:27 +0100
Subject: [PATCH] Fix keeper build

---
 programs/keeper/CMakeLists.txt                   |  5 ++++-
 .../ObjectStorages/MetadataStorageFactory.cpp    |  6 ++++++
 .../ObjectStorages/ObjectStorageFactory.cpp      | 16 ++++++++++++++--
 src/Disks/registerDisks.cpp                      |  4 +---
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/programs/keeper/CMakeLists.txt b/programs/keeper/CMakeLists.txt
index 6c4c3e82162..2adab53d092 100644
--- a/programs/keeper/CMakeLists.txt
+++ b/programs/keeper/CMakeLists.txt
@@ -130,10 +130,13 @@ if (BUILD_STANDALONE_KEEPER)
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/ObjectStorageIterator.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/StoredObject.cpp
 
-        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/S3/registerDiskS3.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/S3/S3Capabilities.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/S3/diskSettings.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/S3/DiskS3Utils.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/ObjectStorageFactory.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/MetadataStorageFactory.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/RegisterDiskObjectStorage.cpp
 
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/IO/createReadBufferFromFileBase.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
diff --git a/src/Disks/ObjectStorages/MetadataStorageFactory.cpp b/src/Disks/ObjectStorages/MetadataStorageFactory.cpp
index 7a4d3335f28..52a0b9ec268 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFactory.cpp
+++ b/src/Disks/ObjectStorages/MetadataStorageFactory.cpp
@@ -1,7 +1,9 @@
 #include <Disks/ObjectStorages/MetadataStorageFactory.h>
 #include <Disks/ObjectStorages/MetadataStorageFromDisk.h>
 #include <Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h>
+#ifndef CLICKHOUSE_KEEPER_STANDALONE_BUILD
 #include <Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.h>
+#endif
 #include <Disks/DiskLocal.h>
 #include <Interpreters/Context.h>
 
@@ -92,6 +94,7 @@ void registerPlainMetadataStorage(MetadataStorageFactory & factory)
     });
 }
 
+#ifndef CLICKHOUSE_KEEPER_STANDALONE_BUILD
 void registerMetadataStorageFromStaticFilesWebServer(MetadataStorageFactory & factory)
 {
     factory.registerMetadataStorageType("web", [](
@@ -103,13 +106,16 @@ void registerMetadataStorageFromStaticFilesWebServer(MetadataStorageFactory & fa
         return std::make_shared<MetadataStorageFromStaticFilesWebServer>(assert_cast<const WebObjectStorage &>(*object_storage));
     });
 }
+#endif
 
 void registerMetadataStorages()
 {
     auto & factory = MetadataStorageFactory::instance();
     registerMetadataStorageFromDisk(factory);
     registerPlainMetadataStorage(factory);
+#ifndef CLICKHOUSE_KEEPER_STANDALONE_BUILD
     registerMetadataStorageFromStaticFilesWebServer(factory);
+#endif
 }
 
 }
diff --git a/src/Disks/ObjectStorages/ObjectStorageFactory.cpp b/src/Disks/ObjectStorages/ObjectStorageFactory.cpp
index db230588963..bdae975020d 100644
--- a/src/Disks/ObjectStorages/ObjectStorageFactory.cpp
+++ b/src/Disks/ObjectStorages/ObjectStorageFactory.cpp
@@ -1,15 +1,23 @@
 #include "config.h"
 #include <Disks/ObjectStorages/ObjectStorageFactory.h>
+#if USE_AWS_S3
 #include <Disks/ObjectStorages/S3/S3ObjectStorage.h>
 #include <Disks/ObjectStorages/S3/diskSettings.h>
 #include <Disks/ObjectStorages/S3/DiskS3Utils.h>
+#endif
+#if USE_HDFS
 #include <Disks/ObjectStorages/HDFS/HDFSObjectStorage.h>
+#include <Storages/HDFS/HDFSCommon.h>
+#endif
+#if USE_AZURE_BLOB_STORAGE
 #include <Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h>
 #include <Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.h>
+#endif
+#ifndef CLICKHOUSE_KEEPER_STANDALONE_BUILD
 #include <Disks/ObjectStorages/Web/WebObjectStorage.h>
 #include <Disks/ObjectStorages/Local/LocalObjectStorage.h>
 #include <Disks/loadLocalDiskConfig.h>
-#include <Storages/HDFS/HDFSCommon.h>
+#endif
 #include <Interpreters/Context.h>
 #include <Common/Macros.h>
 
@@ -202,6 +210,7 @@ void registerAzureObjectStorage(ObjectStorageFactory & factory)
 }
 #endif
 
+#ifndef CLICKHOUSE_KEEPER_STANDALONE_BUILD
 void registerWebObjectStorage(ObjectStorageFactory & factory)
 {
     factory.registerObjectStorageType("web", [](
@@ -246,6 +255,7 @@ void registerLocalObjectStorage(ObjectStorageFactory & factory)
         return std::make_shared<LocalObjectStorage>(object_key_prefix);
     });
 }
+#endif
 
 void registerObjectStorages()
 {
@@ -264,8 +274,10 @@ void registerObjectStorages()
     registerAzureObjectStorage(factory);
 #endif
 
-    registerLocalObjectStorage(factory);
+#ifndef CLICKHOUSE_KEEPER_STANDALONE_BUILD
     registerWebObjectStorage(factory);
+    registerLocalObjectStorage(factory);
+#endif
 }
 
 }
diff --git a/src/Disks/registerDisks.cpp b/src/Disks/registerDisks.cpp
index 6cbcd0ba5ff..b8da93ff9f2 100644
--- a/src/Disks/registerDisks.cpp
+++ b/src/Disks/registerDisks.cpp
@@ -42,9 +42,7 @@ void registerDisks(bool global_skip_access_check)
 
     registerDiskLocal(factory, global_skip_access_check);
 
-#if USE_AWS_S3
-    registerDiskS3(factory, global_skip_access_check);
-#endif
+    registerDiskObjectStorage(factory, global_skip_access_check);
 }
 
 #endif