thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove the method remove in favor of the method removeIfExists

Browse Source
This commit is contained in:
Sema Checherinda 2024-11-06 09:52:25 +01:00
parent bdd18b35b2
commit 338af374d8
15 changed files with 58 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
View File

@ -278,17 +278,17 @@ void AzureObjectStorage::removeObjectImpl(const StoredObject & object, const Sha
}
/// Remove file. Throws exception if file doesn't exists or it's a directory.
void AzureObjectStorage::removeObject(const StoredObject & object)
{
removeObjectImpl(object, client.get(), false);
}
// void AzureObjectStorage::removeObject(const StoredObject & object)
// {
// removeObjectImpl(object, client.get(), false);
// }
void AzureObjectStorage::removeObjects(const StoredObjects & objects)
{
auto client_ptr = client.get();
for (const auto & object : objects)
removeObjectImpl(object, client_ptr, false);
}
// void AzureObjectStorage::removeObjects(const StoredObjects & objects)
// {
// auto client_ptr = client.get();
// for (const auto & object : objects)
// removeObjectImpl(object, client_ptr, false);
// }
void AzureObjectStorage::removeObjectIfExists(const StoredObject & object)
{

4
src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
View File

@ -60,9 +60,9 @@ public:
const WriteSettings & write_settings = {}) override;
/// Remove file. Throws exception if file doesn't exists or it's a directory.
void removeObject(const StoredObject & object) override;
//void removeObject(const StoredObject & object) override;
void removeObjects(const StoredObjects & objects) override;
//void removeObjects(const StoredObjects & objects) override;
void removeObjectIfExists(const StoredObject & object) override;

22
src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp
View File

@ -148,19 +148,19 @@ void CachedObjectStorage::removeCacheIfExists(const std::string & path_key_for_c
cache->removeKeyIfExists(getCacheKey(path_key_for_cache), FileCache::getCommonUser().user_id);
}
void CachedObjectStorage::removeObject(const StoredObject & object)
{
removeCacheIfExists(object.remote_path);
object_storage->removeObject(object);
}
// void CachedObjectStorage::removeObject(const StoredObject & object)
// {
// removeCacheIfExists(object.remote_path);
// object_storage->removeObject(object);
// }
void CachedObjectStorage::removeObjects(const StoredObjects & objects)
{
for (const auto & object : objects)
removeCacheIfExists(object.remote_path);
// void CachedObjectStorage::removeObjects(const StoredObjects & objects)
// {
// for (const auto & object : objects)
// removeCacheIfExists(object.remote_path);
object_storage->removeObjects(objects);
}
// object_storage->removeObjects(objects);
// }
void CachedObjectStorage::removeObjectIfExists(const StoredObject & object)
{

4
src/Disks/ObjectStorages/Cached/CachedObjectStorage.h
View File

@ -45,9 +45,9 @@ public:
size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
const WriteSettings & write_settings = {}) override;
void removeObject(const StoredObject & object) override;
// void removeObject(const StoredObject & object) override;
void removeObjects(const StoredObjects & objects) override;
// void removeObjects(const StoredObjects & objects) override;
void removeObjectIfExists(const StoredObject & object) override;

6
src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp
View File

@ -480,8 +480,7 @@ struct WriteFileObjectStorageOperation final : public IDiskObjectStorageOperatio
void undo() override
{
if (object_storage.exists(object))
object_storage.removeObject(object);
object_storage.removeObjectIfExists(object);
}
void finalize() override
@ -543,8 +542,7 @@ struct CopyFileObjectStorageOperation final : public IDiskObjectStorageOperation
void undo() override
{
for (const auto & object : created_objects)
destination_object_storage.removeObject(object);
destination_object_storage.removeObjectsIfExist(created_objects);
}
void finalize() override

4
src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h
View File

@ -78,9 +78,9 @@ public:
const WriteSettings & write_settings = {}) override;
/// Remove file. Throws exception if file doesn't exists or it's a directory.
void removeObject(const StoredObject & object) override;
void removeObject(const StoredObject & object);
void removeObjects(const StoredObjects & objects) override;
void removeObjects(const StoredObjects & objects);
void removeObjectIfExists(const StoredObject & object) override;

4
src/Disks/ObjectStorages/IObjectStorage.h
View File

@ -161,11 +161,11 @@ public:
virtual bool isRemote() const = 0;
/// Remove object. Throws exception if object doesn't exists.
virtual void removeObject(const StoredObject & object) = 0;
// virtual void removeObject(const StoredObject & object) = 0;
/// Remove multiple objects. Some object storages can do batch remove in a more
/// optimal way.
virtual void removeObjects(const StoredObjects & objects) = 0;
// virtual void removeObjects(const StoredObjects & objects) = 0;
/// Remove object on path if exists
virtual void removeObjectIfExists(const StoredObject & object) = 0;

4
src/Disks/ObjectStorages/Local/LocalObjectStorage.h
View File

@ -42,9 +42,9 @@ public:
size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
const WriteSettings & write_settings = {}) override;
void removeObject(const StoredObject & object) override;
void removeObject(const StoredObject & object);
void removeObjects(const StoredObjects & objects) override;
void removeObjects(const StoredObjects & objects);
void removeObjectIfExists(const StoredObject & object) override;

4
src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp
View File

@ -203,7 +203,7 @@ void MetadataStorageFromPlainObjectStorageTransaction::unlinkFile(const std::str
{
auto object_key = metadata_storage.object_storage->generateObjectKeyForPath(path, std::nullopt /* key_prefix */);
auto object = StoredObject(object_key.serialize());
metadata_storage.object_storage->removeObject(object);
metadata_storage.object_storage->removeObjectIfExists(object);
}
void MetadataStorageFromPlainObjectStorageTransaction::removeDirectory(const std::string & path)
@ -211,7 +211,7 @@ void MetadataStorageFromPlainObjectStorageTransaction::removeDirectory(const std
if (metadata_storage.object_storage->isWriteOnce())
{
for (auto it = metadata_storage.iterateDirectory(path); it->isValid(); it->next())
metadata_storage.object_storage->removeObject(StoredObject(it->path()));
metadata_storage.object_storage->removeObjectIfExists(StoredObject(it->path()));
}
else
{

4
src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorageOperations.cpp
View File

@ -107,7 +107,7 @@ void MetadataStorageFromPlainObjectStorageCreateDirectoryOperation::undo(std::un
auto metric = object_storage->getMetadataStorageMetrics().directory_map_size;
CurrentMetrics::sub(metric, 1);
object_storage->removeObject(StoredObject(metadata_object_key.serialize(), path / PREFIX_PATH_FILE_NAME));
object_storage->removeObjectIfExists(StoredObject(metadata_object_key.serialize(), path / PREFIX_PATH_FILE_NAME));
}
else if (write_created)
object_storage->removeObjectIfExists(StoredObject(metadata_object_key.serialize(), path / PREFIX_PATH_FILE_NAME));
@ -247,7 +247,7 @@ void MetadataStorageFromPlainObjectStorageRemoveDirectoryOperation::execute(std:
auto metadata_object_key = createMetadataObjectKey(key_prefix, metadata_key_prefix);
auto metadata_object = StoredObject(/*remote_path*/ metadata_object_key.serialize(), /*local_path*/ path / PREFIX_PATH_FILE_NAME);
object_storage->removeObject(metadata_object);
object_storage->removeObjectIfExists(metadata_object);
{
std::lock_guard lock(path_map.mutex);

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

@ -326,20 +326,20 @@ void S3ObjectStorage::removeObjectsImpl(const StoredObjects & objects, bool if_e
ProfileEvents::DiskS3DeleteObjects);
}
void S3ObjectStorage::removeObject(const StoredObject & object)
{
removeObjectImpl(object, false);
}
// void S3ObjectStorage::removeObject(const StoredObject & object)
// {
// removeObjectImpl(object, false);
// }
void S3ObjectStorage::removeObjectIfExists(const StoredObject & object)
{
removeObjectImpl(object, true);
}
void S3ObjectStorage::removeObjects(const StoredObjects & objects)
{
removeObjectsImpl(objects, false);
}
// void S3ObjectStorage::removeObjects(const StoredObjects & objects)
// {
// removeObjectsImpl(objects, false);
// }
void S3ObjectStorage::removeObjectsIfExist(const StoredObjects & objects)
{

4
src/Disks/ObjectStorages/S3/S3ObjectStorage.h
View File

@ -102,11 +102,11 @@ public:
ObjectStorageIteratorPtr iterate(const std::string & path_prefix, size_t max_keys) const override;
/// Uses `DeleteObjectRequest`.
void removeObject(const StoredObject & object) override;
//void removeObject(const StoredObject & object) override;
/// Uses `DeleteObjectsRequest` if it is allowed by `s3_capabilities`, otherwise `DeleteObjectRequest`.
/// `DeleteObjectsRequest` is not supported on GCS, see https://issuetracker.google.com/issues/162653700 .
void removeObjects(const StoredObjects & objects) override;
//void removeObjects(const StoredObjects & objects) override;
/// Uses `DeleteObjectRequest`.
void removeObjectIfExists(const StoredObject & object) override;

16
src/Disks/ObjectStorages/Web/WebObjectStorage.cpp
View File

@ -254,15 +254,15 @@ std::unique_ptr<WriteBufferFromFileBase> WebObjectStorage::writeObject( /// NOLI
throwNotAllowed();
}
void WebObjectStorage::removeObject(const StoredObject &)
{
throwNotAllowed();
}
// void WebObjectStorage::removeObject(const StoredObject &)
// {
// throwNotAllowed();
// }
void WebObjectStorage::removeObjects(const StoredObjects &)
{
throwNotAllowed();
}
// void WebObjectStorage::removeObjects(const StoredObjects &)
// {
// throwNotAllowed();
// }
void WebObjectStorage::removeObjectIfExists(const StoredObject &)
{

4
src/Disks/ObjectStorages/Web/WebObjectStorage.h
View File

@ -47,9 +47,9 @@ public:
size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
const WriteSettings & write_settings = {}) override;
void removeObject(const StoredObject & object) override;
// void removeObject(const StoredObject & object) override;
void removeObjects(const StoredObjects & objects) override;
// void removeObjects(const StoredObjects & objects) override;
void removeObjectIfExists(const StoredObject & object) override;

2
src/Storages/ObjectStorageQueue/ObjectStorageQueueSource.cpp
View File

@ -659,7 +659,7 @@ void ObjectStorageQueueSource::applyActionAfterProcessing(const String & path)
{
if (files_metadata->getTableMetadata().after_processing == ObjectStorageQueueAction::DELETE)
{
object_storage->removeObject(StoredObject(path));
object_storage->removeObjectIfExists(StoredObject(path));
}
}