diff --git a/src/Backups/BackupIO_S3.h b/src/Backups/BackupIO_S3.h index db5217960f9..f81eb975df3 100644 --- a/src/Backups/BackupIO_S3.h +++ b/src/Backups/BackupIO_S3.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include namespace DB { diff --git a/src/Common/SystemLogBase.cpp b/src/Common/SystemLogBase.cpp index 950f4e40d62..15803db4929 100644 --- a/src/Common/SystemLogBase.cpp +++ b/src/Common/SystemLogBase.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp index 056fed04a8a..ae719f5cde4 100644 --- a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp +++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include diff --git a/src/Interpreters/BlobStorageLogWriter.cpp b/src/IO/S3/BlobStorageLogWriter.cpp similarity index 89% rename from src/Interpreters/BlobStorageLogWriter.cpp rename to src/IO/S3/BlobStorageLogWriter.cpp index dcbbfb48a2d..aa480932d7c 100644 --- a/src/Interpreters/BlobStorageLogWriter.cpp +++ b/src/IO/S3/BlobStorageLogWriter.cpp @@ -1,4 +1,4 @@ -#include +#include #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) diff --git a/src/Interpreters/BlobStorageLogWriter.h b/src/IO/S3/BlobStorageLogWriter.h similarity index 100% rename from src/Interpreters/BlobStorageLogWriter.h rename to src/IO/S3/BlobStorageLogWriter.h diff --git a/src/IO/S3/copyS3File.cpp b/src/IO/S3/copyS3File.cpp index 4bddda70f10..d3968d883e8 100644 --- a/src/IO/S3/copyS3File.cpp +++ b/src/IO/S3/copyS3File.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/IO/S3/copyS3File.h b/src/IO/S3/copyS3File.h index f3bc5106857..85b3870ddbf 100644 --- a/src/IO/S3/copyS3File.h +++ b/src/IO/S3/copyS3File.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/IO/WriteBufferFromS3.cpp b/src/IO/WriteBufferFromS3.cpp index 58a4ccc10eb..b796c029051 100644 --- a/src/IO/WriteBufferFromS3.cpp +++ b/src/IO/WriteBufferFromS3.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include diff --git a/src/IO/WriteBufferFromS3.h b/src/IO/WriteBufferFromS3.h index 529de309ae5..fbfec3588fa 100644 --- a/src/IO/WriteBufferFromS3.h +++ b/src/IO/WriteBufferFromS3.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/Storages/S3Queue/StorageS3Queue.h b/src/Storages/S3Queue/StorageS3Queue.h index 45c7dd2a100..83b7bc6667b 100644 --- a/src/Storages/S3Queue/StorageS3Queue.h +++ b/src/Storages/S3Queue/StorageS3Queue.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include