Fix clang tidy build

This commit is contained in:
Smita Kulkarni 2024-01-07 16:33:48 +01:00
parent b250acff78
commit fd92c1961e
3 changed files with 14 additions and 14 deletions

View File

@ -305,21 +305,21 @@ void BackupWriterAzureBlobStorage::removeFile(const String & file_name)
object_storage->removeObjectIfExists(object); object_storage->removeObjectIfExists(object);
} }
void BackupWriterAzureBlobStorage::removeFiles(const Strings & keys) void BackupWriterAzureBlobStorage::removeFiles(const Strings & file_names)
{ {
StoredObjects objects; StoredObjects objects;
for (const auto & key : keys) for (const auto & file_name : file_names)
objects.emplace_back(key); objects.emplace_back(file_name);
object_storage->removeObjectsIfExist(objects); object_storage->removeObjectsIfExist(objects);
} }
void BackupWriterAzureBlobStorage::removeFilesBatch(const Strings & keys) void BackupWriterAzureBlobStorage::removeFilesBatch(const Strings & file_names)
{ {
StoredObjects objects; StoredObjects objects;
for (const auto & key : keys) for (const auto & file_name : file_names)
objects.emplace_back(key); objects.emplace_back(file_name);
object_storage->removeObjectsIfExist(objects); object_storage->removeObjectsIfExist(objects);
} }

View File

@ -65,11 +65,11 @@ namespace
, schedule(schedule_) , schedule(schedule_)
, for_disk_azure_blob_storage(for_disk_azure_blob_storage_) , for_disk_azure_blob_storage(for_disk_azure_blob_storage_)
, log(log_) , log(log_)
, max_single_part_upload_size(settings_.get()->max_single_part_upload_size) , max_single_part_upload_size(settings_->max_single_part_upload_size)
{ {
} }
~UploadHelper() {} virtual ~UploadHelper() = default;
protected: protected:
std::function<std::unique_ptr<SeekableReadBuffer>()> create_read_buffer; std::function<std::unique_ptr<SeekableReadBuffer>()> create_read_buffer;
@ -114,9 +114,9 @@ namespace
if (!total_size) if (!total_size)
throw Exception(ErrorCodes::LOGICAL_ERROR, "Chosen multipart upload for an empty file. This must not happen"); throw Exception(ErrorCodes::LOGICAL_ERROR, "Chosen multipart upload for an empty file. This must not happen");
auto max_part_number = settings.get()->max_part_number; auto max_part_number = settings->max_part_number;
auto min_upload_part_size = settings.get()->min_upload_part_size; auto min_upload_part_size = settings->min_upload_part_size;
auto max_upload_part_size = settings.get()->max_upload_part_size; auto max_upload_part_size = settings->max_upload_part_size;
if (!max_part_number) if (!max_part_number)
throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "max_part_number must not be 0"); throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "max_part_number must not be 0");

View File

@ -24,11 +24,11 @@ void copyAzureBlobStorageFile(
MultiVersion<Azure::Storage::Blobs::BlobContainerClient> & src_client, MultiVersion<Azure::Storage::Blobs::BlobContainerClient> & src_client,
MultiVersion<Azure::Storage::Blobs::BlobContainerClient> & dest_client, MultiVersion<Azure::Storage::Blobs::BlobContainerClient> & dest_client,
const String & src_container, const String & src_container,
const String & src_path, const String & src_blob,
size_t src_offset, size_t src_offset,
size_t src_size, size_t src_size,
const String & dest_container, const String & dest_container,
const String & dest_path, const String & dest_blob,
std::shared_ptr<AzureObjectStorageSettings> settings, std::shared_ptr<AzureObjectStorageSettings> settings,
const ReadSettings & read_settings, const ReadSettings & read_settings,
const std::optional<std::map<String, String>> & object_metadata = std::nullopt, const std::optional<std::map<String, String>> & object_metadata = std::nullopt,
@ -47,7 +47,7 @@ void copyDataToAzureBlobStorageFile(
size_t size, size_t size,
MultiVersion<Azure::Storage::Blobs::BlobContainerClient> & client, MultiVersion<Azure::Storage::Blobs::BlobContainerClient> & client,
const String & dest_container, const String & dest_container,
const String & dest_bucket, const String & dest_blob,
std::shared_ptr<AzureObjectStorageSettings> settings, std::shared_ptr<AzureObjectStorageSettings> settings,
const std::optional<std::map<String, String>> & object_metadata = std::nullopt, const std::optional<std::map<String, String>> & object_metadata = std::nullopt,
ThreadPoolCallbackRunner<void> schedule_ = {}, ThreadPoolCallbackRunner<void> schedule_ = {},