Merge pull request ClickHouse#83599 from ClickHouse/move_configuration_to_separate_class

Move object storage configuration to separate class

Author: alesapin

src/Databases/DataLake/DatabaseDataLake.cpp

@@ -176,7 +176,7 @@ std::shared_ptr<DataLake::ICatalog> DatabaseDataLake::getCatalog() const
     return catalog_impl;
 }
 
-std::shared_ptr<StorageObjectStorage::Configuration> DatabaseDataLake::getConfiguration(
+std::shared_ptr<StorageObjectStorageConfiguration> DatabaseDataLake::getConfiguration(
     DatabaseDataLakeStorageType type,
     DataLakeStorageSettingsPtr storage_settings) const
 {
@@ -428,7 +428,7 @@ StoragePtr DatabaseDataLake::tryGetTableImpl(const String & name, ContextPtr con
 
     /// with_table_structure = false: because there will be
     /// no table structure in table definition AST.
-    StorageObjectStorage::Configuration::initialize(*configuration, args, context_copy, /* with_table_structure */false);
+    StorageObjectStorageConfiguration::initialize(*configuration, args, context_copy, /* with_table_structure */false);
 
     return std::make_shared<StorageObjectStorage>(
         configuration,

src/Databases/DataLake/DatabaseDataLake.h

@@ -72,7 +72,7 @@ class DatabaseDataLake final : public IDatabase, WithContext
     void validateSettings();
     std::shared_ptr<DataLake::ICatalog> getCatalog() const;
 
-    std::shared_ptr<StorageObjectStorage::Configuration> getConfiguration(
+    std::shared_ptr<StorageObjectStorageConfiguration> getConfiguration(
         DatabaseDataLakeStorageType type,
         DataLakeStorageSettingsPtr storage_settings) const;
 

src/Databases/DataLake/GlueCatalog.cpp

@@ -441,7 +441,7 @@ bool GlueCatalog::classifyTimestampTZ(const String & column_name, const TableMet
         auto storage_settings = std::make_shared<DB::DataLakeStorageSettings>();
         storage_settings->loadFromSettingsChanges(settings.allChanged());
         auto configuration = std::make_shared<DB::StorageS3IcebergConfiguration>(storage_settings);
-        DB::StorageObjectStorage::Configuration::initialize(*configuration, args, getContext(), false);
+        DB::StorageObjectStorageConfiguration::initialize(*configuration, args, getContext(), false);
 
         auto object_storage = configuration->createObjectStorage(getContext(), true);
         const auto & read_settings = getContext()->getReadSettings();

src/Processors/QueryPlan/ReadFromObjectStorageStep.cpp

@@ -28,7 +28,7 @@ namespace Setting
 
 ReadFromObjectStorageStep::ReadFromObjectStorageStep(
     ObjectStoragePtr object_storage_,
-    ConfigurationPtr configuration_,
+    StorageObjectStorageConfigurationPtr configuration_,
     const String & name_,
     const Names & columns_to_read,
     const NamesAndTypesList & virtual_columns_,

src/Processors/QueryPlan/ReadFromObjectStorageStep.h

@@ -10,11 +10,9 @@ namespace DB
 class ReadFromObjectStorageStep : public SourceStepWithFilter
 {
 public:
-    using ConfigurationPtr = StorageObjectStorage::ConfigurationPtr;
-
     ReadFromObjectStorageStep(
         ObjectStoragePtr object_storage_,
-        ConfigurationPtr configuration_,
+        StorageObjectStorageConfigurationPtr configuration_,
         const String & name_,
         const Names & columns_to_read,
         const NamesAndTypesList & virtual_columns_,
@@ -36,7 +34,7 @@ class ReadFromObjectStorageStep : public SourceStepWithFilter
 
 private:
     ObjectStoragePtr object_storage;
-    ConfigurationPtr configuration;
+    StorageObjectStorageConfigurationPtr configuration;
     std::shared_ptr<IObjectIterator> iterator_wrapper;
 
     const ReadFromFormatInfo info;

src/Storages/ObjectStorage/Azure/Configuration.cpp

@@ -63,13 +63,13 @@ void StorageAzureConfiguration::check(ContextPtr context) const
 {
     auto url = Poco::URI(connection_params.getConnectionURL());
     context->getGlobalContext()->getRemoteHostFilter().checkURL(url);
-    Configuration::check(context);
+    StorageObjectStorageConfiguration::check(context);
 }
 
-StorageObjectStorage::QuerySettings StorageAzureConfiguration::getQuerySettings(const ContextPtr & context) const
+StorageObjectStorageQuerySettings StorageAzureConfiguration::getQuerySettings(const ContextPtr & context) const
 {
     const auto & settings = context->getSettingsRef();
-    return StorageObjectStorage::QuerySettings{
+    return StorageObjectStorageQuerySettings{
         .truncate_on_insert = settings[Setting::azure_truncate_on_insert],
         .create_new_file_on_insert = settings[Setting::azure_create_new_file_on_insert],
         .schema_inference_use_cache = settings[Setting::schema_inference_use_cache_for_azure],

src/Storages/ObjectStorage/Azure/Configuration.h

@@ -12,15 +12,13 @@ namespace DB
 {
 class BackupFactory;
 
-class StorageAzureConfiguration : public StorageObjectStorage::Configuration
+class StorageAzureConfiguration : public StorageObjectStorageConfiguration
 {
     friend class BackupReaderAzureBlobStorage;
     friend class BackupWriterAzureBlobStorage;
     friend void registerBackupEngineAzureBlobStorage(BackupFactory & factory);
 
 public:
-    using ConfigurationPtr = StorageObjectStorage::ConfigurationPtr;
-
     static constexpr auto type = ObjectStorageType::Azure;
     static constexpr auto type_name = "azure";
     static constexpr auto engine_name = "Azure";
@@ -74,7 +72,7 @@ class StorageAzureConfiguration : public StorageObjectStorage::Configuration
 
     String getNamespace() const override { return connection_params.getContainer(); }
     String getDataSourceDescription() const override { return std::filesystem::path(connection_params.getConnectionURL()) / connection_params.getContainer(); }
-    StorageObjectStorage::QuerySettings getQuerySettings(const ContextPtr &) const override;
+    StorageObjectStorageQuerySettings getQuerySettings(const ContextPtr &) const override;
 
     void check(ContextPtr context) const override;
 

src/Storages/ObjectStorage/DataLakes/Common.cpp

@@ -10,7 +10,7 @@ namespace DB
 
 std::vector<String> listFiles(
     const IObjectStorage & object_storage,
-    const StorageObjectStorage::Configuration & configuration,
+    const StorageObjectStorageConfiguration & configuration,
     const String & prefix, const String & suffix)
 {
     auto key = std::filesystem::path(configuration.getPathForRead().path) / prefix;

src/Storages/ObjectStorage/DataLakes/Common.h

@@ -9,7 +9,7 @@ class IObjectStorage;
 
 std::vector<String> listFiles(
     const IObjectStorage & object_storage,
-    const StorageObjectStorage::Configuration & configuration,
+    const StorageObjectStorageConfiguration & configuration,
     const String & prefix, const String & suffix);
 
 }

src/Storages/ObjectStorage/DataLakes/DataLakeConfiguration.h

@@ -39,14 +39,12 @@ namespace DataLakeStorageSetting
 
 
 template <typename T>
-concept StorageConfiguration = std::derived_from<T, StorageObjectStorage::Configuration>;
+concept StorageConfiguration = std::derived_from<T, StorageObjectStorageConfiguration>;
 
 template <StorageConfiguration BaseStorageConfiguration, typename DataLakeMetadata>
-class DataLakeConfiguration : public BaseStorageConfiguration, public std::enable_shared_from_this<StorageObjectStorage::Configuration>
+class DataLakeConfiguration : public BaseStorageConfiguration, public std::enable_shared_from_this<StorageObjectStorageConfiguration>
 {
 public:
-    using Configuration = StorageObjectStorage::Configuration;
-
     explicit DataLakeConfiguration(DataLakeStorageSettingsPtr settings_) : settings(settings_) {}
 
     bool isDataLakeConfiguration() const override { return true; }