try to fix

try to fix(2)

Author: zvonand

src/Storages/ObjectStorage/DataLakes/Iceberg/IcebergMetadataFilesCache.h

@@ -31,7 +31,6 @@ namespace DB
 /// And we can get `ManifestFileContent` from cache by ManifestFileEntry.
 struct ManifestFileCacheKey
 {
-    String manifest_file_path;
     String manifest_file_absolute_path;
     Int64 added_sequence_number;
     Int64 added_snapshot_id;
@@ -74,7 +73,7 @@ struct IcebergMetadataFilesCacheCell : private boost::noncopyable
          size_t total_size = 0;
          for (const auto & entry: manifest_file_cache_keys)
          {
-             total_size += sizeof(ManifestFileCacheKey) + entry.manifest_file_path.capacity() + entry.manifest_file_absolute_path.capacity();
+             total_size += sizeof(ManifestFileCacheKey) + entry.manifest_file_absolute_path.capacity();
          }
          return total_size;
     }

src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFile.cpp

@@ -285,11 +285,9 @@ ManifestFileContent::ManifestFileContent(
         }
         const auto schema_id = schema_id_opt.has_value() ? schema_id_opt.value() : manifest_schema_id;
 
-        const auto file_path_key
-            = manifest_file_deserializer.getValueFromRowByName(i, c_data_file_file_path, TypeIndex::String).safeGet<String>();
-        const auto file_path = makeAbsolutePath(
-            table_location,
-            manifest_file_deserializer.getValueFromRowByName(i, c_data_file_file_path, TypeIndex::String).safeGet<String>());
+        const auto file_path_key_field = manifest_file_deserializer.getValueFromRowByName(i, c_data_file_file_path, TypeIndex::String);
+        const auto file_path_key = file_path_key_field.safeGet<String>();
+        const auto file_path = makeAbsolutePath(table_location, file_path_key);
 
         /// NOTE: This is weird, because in manifest file partition looks like this:
         /// {

src/Storages/ObjectStorage/DataLakes/Iceberg/StatelessMetadataFileGetter.cpp

@@ -165,7 +165,7 @@ ManifestFileCacheKeys getManifestList(
         {
             const std::string file_path
                 = manifest_list_deserializer.getValueFromRowByName(i, f_manifest_path, TypeIndex::String).safeGet<std::string>();
-            const auto manifest_file_name = makeAbsolutePath(persistent_table_components.table_location, file_path);
+            const auto manifest_absolute_path = makeAbsolutePath(persistent_table_components.table_location, file_path);
             Int64 added_sequence_number = 0;
             auto added_snapshot_id = manifest_list_deserializer.getValueFromRowByName(i, f_added_snapshot_id);
             if (added_snapshot_id.isNull())
@@ -184,7 +184,7 @@ ManifestFileCacheKeys getManifestList(
                     manifest_list_deserializer.getValueFromRowByName(i, f_content, TypeIndex::Int32).safeGet<Int32>());
             }
             manifest_file_cache_keys.emplace_back(
-                file_path, manifest_file_name, added_sequence_number, added_snapshot_id.safeGet<Int64>(), content_type);
+                manifest_absolute_path, added_sequence_number, added_snapshot_id.safeGet<Int64>(), content_type);
 
             auto dump_row_metadata = [&]()->String { return manifest_list_deserializer.getContent(i); };
             insertRowToLogTable(

src/Storages/ObjectStorage/StorageObjectStorageSource.cpp

@@ -1291,6 +1291,10 @@ StorageObjectStorageSource::ReadTaskIterator::ReadTaskIterator(
                     object->relative_path = key;
                 }
             }
+            else
+            {
+                object->object_storage_to_use = object_storage;
+            }
             buffer.push_back(object);
         }
     }
@@ -1315,17 +1319,20 @@ StorageObjectStorage::ObjectInfoPtr StorageObjectStorageSource::ReadTaskIterator
 
         object_info = raw->getObjectInfo();
 
-        if (object_info->getObjectStorage().has_value())
-        {
-
-        }
-        else if (raw->absolute_path.has_value())
+        if (raw->absolute_path.has_value())
         {
             auto [storage_to_use, key]
                 = resolveObjectStorageForPath("", raw->absolute_path.value(), object_storage, secondary_storages, getContext());
 
-            if (!key.empty()) /// Not a valid key/path, maybe it is "retry_after_us". Store as is.
+            if (!key.empty()) /// Otherwise not a valid key/path, maybe it is "retry_after_us". Store as is.
+            {
                 object_info->object_storage_to_use = storage_to_use;
+                object_info->relative_path = key;
+            }
+        }
+        else
+        {
+            object_info->object_storage_to_use = object_storage;
         }
     }
     else