thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 01:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Move BlobStorageLogWriter to Interpreters"

Browse Source 
This reverts commit ca3d80102365e76d931be016638b1ca506dffb86.
This commit is contained in:
vdimir 2024-05-28 16:16:04 +00:00
parent 6d9b2c8f5a
commit 72e7a266e7
No known key found for this signature in database
GPG Key ID: 6EE4CE2BEDC51862
10 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Backups/BackupIO_S3.h
View File

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

2
src/Common/SystemLogBase.cpp
View File

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

2
src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
View File

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

6
src/Interpreters/BlobStorageLogWriter.cpp → src/IO/S3/BlobStorageLogWriter.cpp
View File

@ -1,4 +1,4 @@
#include <Interpreters/BlobStorageLogWriter.h> #include <IO/S3/BlobStorageLogWriter.h>
#if USE_AWS_S3 #if USE_AWS_S3
@ -20,6 +20,9 @@ void BlobStorageLogWriter::addEvent(
const Aws::S3::S3Error * error, const Aws::S3::S3Error * error,
BlobStorageLogElement::EvenTime time_now) 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) if (!log)
return; return;
@ -52,6 +55,7 @@ void BlobStorageLogWriter::addEvent(
element.event_time = time_now; element.event_time = time_now;
log->add(element); log->add(element);
#endif
} }
BlobStorageLogWriterPtr BlobStorageLogWriter::create(const String & disk_name) BlobStorageLogWriterPtr BlobStorageLogWriter::create(const String & disk_name)

0
src/Interpreters/BlobStorageLogWriter.h → src/IO/S3/BlobStorageLogWriter.h
View File

2
src/IO/S3/copyS3File.cpp
View File

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

2
src/IO/S3/copyS3File.h
View File

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

2
src/IO/WriteBufferFromS3.cpp
View File

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

2
src/IO/WriteBufferFromS3.h
View File

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

2
src/Storages/S3Queue/StorageS3Queue.h
View File

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