Fix object_storage_cluster setting and system.iceberg_history table

Author: ianton-ru

src/Databases/DataLake/DatabaseDataLake.cpp

@@ -480,7 +480,7 @@ DatabaseTablesIteratorPtr DatabaseDataLake::getLightweightTablesIterator(
     const FilterByNameFunction & filter_by_table_name,
     bool skip_not_loaded) const
 {
-     Tables tables;
+    Tables tables;
     auto catalog = getCatalog();
     const auto iceberg_tables = catalog->getTables();
 

src/Storages/ObjectStorage/StorageObjectStorageCluster.cpp

@@ -530,4 +530,18 @@ StorageMetadataPtr StorageObjectStorageCluster::getInMemoryMetadataPtr() const
     return IStorageCluster::getInMemoryMetadataPtr();
 }
 
+IDataLakeMetadata * StorageObjectStorageCluster::getExternalMetadata(ContextPtr query_context)
+{
+    if (pure_storage)
+        return pure_storage->getExternalMetadata(query_context);
+
+    configuration->update(
+        object_storage,
+        query_context,
+        /* if_not_updated_before */false,
+        /* check_consistent_with_previous_metadata */false);
+
+    return configuration->getExternalMetadata();
+}
+
 }

src/Storages/ObjectStorage/StorageObjectStorageCluster.h

@@ -50,6 +50,8 @@ class StorageObjectStorageCluster : public IStorageCluster
 
     void addInferredEngineArgsToCreateQuery(ASTs & args, const ContextPtr & context) const override;
 
+    IDataLakeMetadata * getExternalMetadata(ContextPtr query_context);
+
     bool updateExternalDynamicMetadataIfExists(ContextPtr context) override;
 
     StorageMetadataPtr getInMemoryMetadataPtr() const override;

src/Storages/ObjectStorage/registerStorageObjectStorage.cpp

@@ -22,11 +22,6 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-namespace StorageObjectStorageSetting
-{
-    extern const StorageObjectStorageSettingsString object_storage_cluster;
-}
-
 namespace
 {
 
@@ -41,12 +36,14 @@ createStorageObjectStorage(const StorageFactory::Arguments & args, StorageObject
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "External data source must have arguments");
 
     const auto context = args.getLocalContext();
-    auto storage_settings = std::make_shared<StorageObjectStorageSettings>();
+
+    std::string cluster_name = "";
 
     if (args.storage_def->settings)
-        storage_settings->loadFromQuery(*args.storage_def->settings);
-        
-    auto cluster_name = (*storage_settings)[StorageObjectStorageSetting::object_storage_cluster].value;
+    {
+        if (const auto * value = args.storage_def->settings->changes.tryGet("object_storage_cluster"))
+            cluster_name = value->safeGet<std::string>();
+    }
 
     configuration->initialize(args.engine_args, context, false);
 

src/Storages/System/StorageSystemIcebergHistory.cpp

@@ -15,7 +15,7 @@
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ReadFromSystemNumbersStep.h>
 #include <Storages/SelectQueryInfo.h>
-#include <Storages/ObjectStorage/StorageObjectStorage.h>
+#include <Storages/ObjectStorage/StorageObjectStorageCluster.h>
 #include <Access/ContextAccess.h>
 #include <Storages/ObjectStorage/DataLakes/DataLakeConfiguration.h>
 #include <Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadata.h>
@@ -51,7 +51,7 @@ void StorageSystemIcebergHistory::fillData([[maybe_unused]] MutableColumns & res
 #if USE_AVRO
     const auto access = context->getAccess();
 
-    auto add_history_record = [&](const DatabaseTablesIteratorPtr & it, StorageObjectStorage * object_storage)
+    auto add_history_record = [&](const DatabaseTablesIteratorPtr & it, StorageObjectStorageCluster * object_storage)
     {
         if (!access->isGranted(AccessType::SHOW_TABLES, it->databaseName(), it->name()))
             return;
@@ -100,7 +100,7 @@ void StorageSystemIcebergHistory::fillData([[maybe_unused]] MutableColumns & res
                     // Table was dropped while acquiring the lock, skipping table
                     continue;
 
-                if (auto * object_storage_table = dynamic_cast<StorageObjectStorage *>(storage.get()))
+                if (auto * object_storage_table = dynamic_cast<StorageObjectStorageCluster *>(storage.get()))
                 {
                     add_history_record(iterator, object_storage_table);
                 }