Revert "Move BlobStorageLogWriter to Interpreters"

This reverts commit ca3d80102365e76d931be016638b1ca506dffb86.

src/Backups/BackupIO_S3.h

@@ -9,7 +9,7 @@
 #include <IO/S3Common.h>
 #include <Storages/StorageS3Settings.h>
 #include <Interpreters/Context_fwd.h>
-#include <Interpreters/BlobStorageLogWriter.h>
+#include <IO/S3/BlobStorageLogWriter.h>
 
 namespace DB
 {

src/Common/SystemLogBase.cpp

@@ -17,7 +17,7 @@
 #include <Interpreters/TransactionsInfoLog.h>
 #include <Interpreters/AsynchronousInsertLog.h>
 #include <Interpreters/BackupLog.h>
-#include <Interpreters/BlobStorageLogWriter.h>
+#include <IO/S3/BlobStorageLogWriter.h>
 
 #include <Common/MemoryTrackerBlockerInThread.h>
 #include <Common/SystemLogBase.h>

src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp

@@ -15,7 +15,7 @@
 #include <IO/S3/copyS3File.h>
 #include <Interpreters/Context.h>
 #include <Common/threadPoolCallbackRunner.h>
-#include <Interpreters/BlobStorageLogWriter.h>
+#include <IO/S3/BlobStorageLogWriter.h>
 
 #include <Disks/ObjectStorages/S3/diskSettings.h>
 

src/IO/S3/BlobStorageLogWriter.cpp

@@ -1,4 +1,4 @@
-#include <Interpreters/BlobStorageLogWriter.h>
+#include <IO/S3/BlobStorageLogWriter.h>
 
 #if USE_AWS_S3
 
@@ -20,6 +20,9 @@ void BlobStorageLogWriter::addEvent(
     const Aws::S3::S3Error * error,
     BlobStorageLogElement::EvenTime time_now)
 {
+/// Keeper standalone build doesn't build BlobStorageLog
+/// But BlobStorageLogWriterPtr is used in IO, so we need to provide a stub implementation
+#ifndef CLICKHOUSE_KEEPER_STANDALONE_BUILD
     if (!log)
         return;
 
@@ -52,6 +55,7 @@ void BlobStorageLogWriter::addEvent(
     element.event_time = time_now;
 
     log->add(element);
+#endif
 }
 
 BlobStorageLogWriterPtr BlobStorageLogWriter::create(const String & disk_name)

src/IO/S3/copyS3File.cpp

@@ -4,7 +4,7 @@
 
 #include <Common/ProfileEvents.h>
 #include <Common/typeid_cast.h>
-#include <Interpreters/BlobStorageLogWriter.h>
+#include <IO/S3/BlobStorageLogWriter.h>
 #include <Interpreters/Context.h>
 #include <IO/LimitSeekableReadBuffer.h>
 #include <IO/S3/getObjectInfo.h>

src/IO/S3/copyS3File.h

@@ -6,7 +6,7 @@
 
 #include <Storages/StorageS3Settings.h>
 #include <Common/threadPoolCallbackRunner.h>
-#include <Interpreters/BlobStorageLogWriter.h>
+#include <IO/S3/BlobStorageLogWriter.h>
 #include <base/types.h>
 #include <functional>
 #include <memory>

src/IO/WriteBufferFromS3.cpp

@@ -16,7 +16,7 @@
 #include <IO/S3Common.h>
 #include <IO/S3/Requests.h>
 #include <IO/S3/getObjectInfo.h>
-#include <Interpreters/BlobStorageLogWriter.h>
+#include <IO/S3/BlobStorageLogWriter.h>
 
 #include <utility>
 

src/IO/WriteBufferFromS3.h

@@ -11,7 +11,7 @@
 #include <IO/WriteSettings.h>
 #include <Storages/StorageS3Settings.h>
 #include <Common/threadPoolCallbackRunner.h>
-#include <Interpreters/BlobStorageLogWriter.h>
+#include <IO/S3/BlobStorageLogWriter.h>
 #include <Common/BufferAllocationPolicy.h>
 
 #include <memory>

src/Storages/S3Queue/StorageS3Queue.h

@@ -10,7 +10,7 @@
 #include <Storages/S3Queue/S3QueueSource.h>
 #include <Storages/ObjectStorage/StorageObjectStorage.h>
 #include <Interpreters/Context.h>
-#include <Interpreters/BlobStorageLogWriter.h>
+#include <IO/S3/BlobStorageLogWriter.h>
 #include <Storages/StorageFactory.h>