small polish

Author: zvonand

src/Disks/ObjectStorages/IObjectStorage.cpp

@@ -148,10 +148,7 @@ void PathWithMetadata::loadMetadata(ObjectStoragePtr object_storage, bool ignore
     {
         const auto & path = isArchive() ? getPathToArchive() : getPath();
 
-        auto storage_to_use = object_storage;
-
-        if (auto storage_for_file = getObjectStorage(); storage_for_file.has_value())
-            storage_to_use = storage_for_file.value();
+        auto storage_to_use = object_storage_to_use.value_or(object_storage);
 
         if (ignore_non_existent_file)
             metadata = storage_to_use->tryGetObjectMetadata(path);

src/Storages/ObjectStorage/StorageObjectStorageSource.cpp

@@ -484,8 +484,6 @@ StorageObjectStorageSource::ReaderHolder StorageObjectStorageSource::createReade
     ObjectInfoPtr object_info;
     auto query_settings = configuration->getQuerySettings(context_);
 
-    ObjectStoragePtr storage_to_use = object_storage;
-
     bool not_a_path = false;
 
     do
@@ -516,6 +514,8 @@ StorageObjectStorageSource::ReaderHolder StorageObjectStorageSource::createReade
         object_info->loadMetadata(object_storage, query_settings.ignore_non_existent_file);
     }
     while (not_a_path || (query_settings.skip_empty_files && object_info->metadata->size_bytes == 0));
+    
+    ObjectStoragePtr storage_to_use = object_info->getObjectStorage().value_or(object_storage);
 
     QueryPipelineBuilder builder;
     std::shared_ptr<ISource> source;