Better function name

Author: Avogar

src/Storages/HDFS/StorageHDFS.cpp

@@ -873,7 +873,7 @@ class HDFSSink : public SinkToStorage
 
 namespace
 {
-    std::optional<String> checkFileExistsAndCreateNewKeyIfNeeded(const ContextPtr & context, const String & uri, size_t sequence_number)
+    std::optional<String> checkAndGetNewFileOnInsertIfNeeded(const ContextPtr & context, const String & uri, size_t sequence_number)
     {
         const auto [path_from_uri, uri_without_path] = getPathFromUriAndUriWithoutPath(uri);
 
@@ -928,7 +928,7 @@ class PartitionedHDFSSink : public PartitionedSink
     {
         auto path = PartitionedSink::replaceWildcards(uri, partition_id);
         PartitionedSink::validatePartitionKey(path, true);
-        if (auto new_path = checkFileExistsAndCreateNewKeyIfNeeded(context, path, 1))
+        if (auto new_path = checkAndGetNewFileOnInsertIfNeeded(context, path, 1))
             path = *new_path;
         return std::make_shared<HDFSSink>(path, format, sample_block, context, compression_method);
     }
@@ -1114,7 +1114,7 @@ SinkToStoragePtr StorageHDFS::write(const ASTPtr & query, const StorageMetadataP
         if (is_path_with_globs)
             throw Exception(ErrorCodes::DATABASE_ACCESS_DENIED, "URI '{}' contains globs, so the table is in readonly mode", uris.back());
 
-        if (auto new_uri = checkFileExistsAndCreateNewKeyIfNeeded(context_, uris.front(), uris.size()))
+        if (auto new_uri = checkAndGetNewFileOnInsertIfNeeded(context_, uris.front(), uris.size()))
         {
             uris.push_back(*new_uri);
             current_uri = *new_uri;

src/Storages/StorageAzureBlob.cpp

@@ -635,7 +635,7 @@ class StorageAzureBlobSink : public SinkToStorage
 
 namespace
 {
-    std::optional<String> checkFileExistsAndCreateNewKeyIfNeeded(const ContextPtr & context, AzureObjectStorage * object_storage, const String & path, size_t sequence_number)
+    std::optional<String> checkAndGetNewFileOnInsertIfNeeded(const ContextPtr & context, AzureObjectStorage * object_storage, const String & path, size_t sequence_number)
     {
         if (context->getSettingsRef().azure_truncate_on_insert || !object_storage->exists(StoredObject(path)))
             return std::nullopt;
@@ -689,7 +689,7 @@ class PartitionedStorageAzureBlobSink : public PartitionedSink, WithContext
     {
         auto partition_key = replaceWildcards(blob, partition_id);
         validateKey(partition_key);
-        if (auto new_path = checkFileExistsAndCreateNewKeyIfNeeded(getContext(), object_storage, partition_key, 1))
+        if (auto new_path = checkAndGetNewFileOnInsertIfNeeded(getContext(), object_storage, partition_key, 1))
             partition_key = *new_path;
 
         return std::make_shared<StorageAzureBlobSink>(
@@ -894,7 +894,7 @@ SinkToStoragePtr StorageAzureBlob::write(const ASTPtr & query, const StorageMeta
             throw Exception(ErrorCodes::DATABASE_ACCESS_DENIED,
                             "AzureBlobStorage key '{}' contains globs, so the table is in readonly mode", configuration.blob_path);
 
-        if (auto new_path = checkFileExistsAndCreateNewKeyIfNeeded(local_context, object_storage.get(), path, configuration.blobs_paths.size()))
+        if (auto new_path = checkAndGetNewFileOnInsertIfNeeded(local_context, object_storage.get(), path, configuration.blobs_paths.size()))
         {
             configuration.blobs_paths.push_back(*new_path);
             path = *new_path;

src/Storages/StorageS3.cpp

@@ -957,7 +957,7 @@ class StorageS3Sink : public SinkToStorage
 
 namespace
 {
-    std::optional<String> checkFileExistsAndCreateNewKeyIfNeeded(const ContextPtr & context, const StorageS3::Configuration & configuration, const String & key, size_t sequence_number)
+    std::optional<String> checkAndGetNewFileOnInsertIfNeeded(const ContextPtr & context, const StorageS3::Configuration & configuration, const String & key, size_t sequence_number)
     {
         if (context->getSettingsRef().s3_truncate_on_insert || !S3::objectExists(*configuration.client, configuration.url.bucket, key, configuration.url.version_id, configuration.request_settings))
             return std::nullopt;
@@ -1018,7 +1018,7 @@ class PartitionedStorageS3Sink : public PartitionedSink, WithContext
         auto partition_key = replaceWildcards(key, partition_id);
         validateKey(partition_key);
 
-        if (auto new_key = checkFileExistsAndCreateNewKeyIfNeeded(getContext(), configuration, partition_key, /* sequence_number */1))
+        if (auto new_key = checkAndGetNewFileOnInsertIfNeeded(getContext(), configuration, partition_key, /* sequence_number */1))
             partition_key = *new_key;
 
         return std::make_shared<StorageS3Sink>(
@@ -1309,7 +1309,7 @@ SinkToStoragePtr StorageS3::write(const ASTPtr & query, const StorageMetadataPtr
             throw Exception(ErrorCodes::DATABASE_ACCESS_DENIED,
                             "S3 key '{}' contains globs, so the table is in readonly mode", query_configuration.url.key);
 
-        if (auto new_key = checkFileExistsAndCreateNewKeyIfNeeded(local_context, configuration, query_configuration.keys.front(), query_configuration.keys.size()))
+        if (auto new_key = checkAndGetNewFileOnInsertIfNeeded(local_context, configuration, query_configuration.keys.front(), query_configuration.keys.size()))
         {
             query_configuration.keys.push_back(*new_key);
             configuration.keys.push_back(*new_key);