diff --git a/src/IO/S3/copyS3File.cpp b/src/IO/S3/copyS3File.cpp index b8b3cbbc54e..3d99a584933 100644 --- a/src/IO/S3/copyS3File.cpp +++ b/src/IO/S3/copyS3File.cpp @@ -239,11 +239,11 @@ namespace // Multipart upload failed because it wasn't possible to schedule all the tasks. // To avoid execution of already scheduled tasks we abort MultipartUpload. abortMultipartUpload(); - waitForAllBackGroundTasks(); + waitForAllBackgroundTasks(); throw; } - waitForAllBackGroundTasks(); + waitForAllBackgroundTasks(); completeMultipartUpload(); } @@ -381,7 +381,7 @@ namespace virtual std::unique_ptr fillUploadPartRequest(size_t part_number, size_t part_offset, size_t part_size) = 0; virtual String processUploadPartRequest(Aws::AmazonWebServiceRequest & request) = 0; - void waitForAllBackGroundTasks() + void waitForAllBackgroundTasks() { if (!schedule) return; diff --git a/src/IO/WriteBufferFromS3.cpp b/src/IO/WriteBufferFromS3.cpp index dde19c37e29..5a25cb89107 100644 --- a/src/IO/WriteBufferFromS3.cpp +++ b/src/IO/WriteBufferFromS3.cpp @@ -109,7 +109,7 @@ void WriteBufferFromS3::nextImpl() else processWithDynamicParts(); - waitForReadyBackGroundTasks(); + waitForReadyBackgroundTasks(); } void WriteBufferFromS3::processWithStrictParts() @@ -225,7 +225,7 @@ void WriteBufferFromS3::finalizeImpl() if (!is_prefinalized) preFinalize(); - waitForAllBackGroundTasks(); + waitForAllBackgroundTasks(); if (!multipart_upload_id.empty()) completeMultipartUpload(); @@ -632,7 +632,7 @@ void WriteBufferFromS3::processPutRequest(const PutObjectTask & task) max_retry, key, bucket); } -void WriteBufferFromS3::waitForReadyBackGroundTasks() +void WriteBufferFromS3::waitForReadyBackgroundTasks() { if (schedule) { @@ -650,7 +650,7 @@ void WriteBufferFromS3::waitForReadyBackGroundTasks() if (exception) { - waitForAllBackGroundTasksUnlocked(lock); + waitForAllBackgroundTasksUnlocked(lock); std::rethrow_exception(exception); } @@ -659,16 +659,16 @@ void WriteBufferFromS3::waitForReadyBackGroundTasks() } } -void WriteBufferFromS3::waitForAllBackGroundTasks() +void WriteBufferFromS3::waitForAllBackgroundTasks() { if (schedule) { std::unique_lock lock(bg_tasks_mutex); - waitForAllBackGroundTasksUnlocked(lock); + waitForAllBackgroundTasksUnlocked(lock); } } -void WriteBufferFromS3::waitForAllBackGroundTasksUnlocked(std::unique_lock & bg_tasks_lock) +void WriteBufferFromS3::waitForAllBackgroundTasksUnlocked(std::unique_lock & bg_tasks_lock) { if (schedule) { diff --git a/src/IO/WriteBufferFromS3.h b/src/IO/WriteBufferFromS3.h index d3c7cdf2407..2374f1502f5 100644 --- a/src/IO/WriteBufferFromS3.h +++ b/src/IO/WriteBufferFromS3.h @@ -79,9 +79,9 @@ private: void fillPutRequest(S3::PutObjectRequest & req); void processPutRequest(const PutObjectTask & task); - void waitForReadyBackGroundTasks(); - void waitForAllBackGroundTasks(); - void waitForAllBackGroundTasksUnlocked(std::unique_lock & bg_tasks_lock); + void waitForReadyBackgroundTasks(); + void waitForAllBackgroundTasks(); + void waitForAllBackgroundTasksUnlocked(std::unique_lock & bg_tasks_lock); const String bucket; const String key;