fix relative paths prefix handling

Author: zvonand

src/Storages/ObjectStorage/Utils.cpp

@@ -264,18 +264,44 @@ std::string normalizePathToStorageRoot(const std::string & table_location, const
         rel_path = rel_path.substr(1);
 
     // Check if the relative path already starts with the table location key (so the key is already relative to storage root)
-    if (!rel_path.empty() && rel_path.starts_with(base.key))
+    // This handles cases where the path in metadata is already relative to storage root, not relative to table location
+    if (!rel_path.empty() && !base.key.empty())
     {
-        std::filesystem::path fs_path(rel_path);
-        std::filesystem::path normalized = fs_path.lexically_normal();
-        
-        std::string result = normalized.string();
-        std::replace(result.begin(), result.end(), '\\', '/');
-        
-        while (!result.empty() && result.front() == '/')
-            result = result.substr(1);
+        // Check if path starts with base.key (exact match or followed by '/')
+        if (rel_path == base.key || rel_path.starts_with(base.key + "/"))
+        {
+            // Path already includes table location prefix, use it as-is
+            std::filesystem::path fs_path(rel_path);
+            std::filesystem::path normalized = fs_path.lexically_normal();
+            
+            std::string result = normalized.string();
+            std::replace(result.begin(), result.end(), '\\', '/');
+            
+            while (!result.empty() && result.front() == '/')
+                result = result.substr(1);
+            
+            return result;
+        }
 
-        return result;
+        std::filesystem::path base_fs_path(base.key);
+        if (base_fs_path.begin() != base_fs_path.end())
+        {
+            std::string first_segment = base_fs_path.begin()->string();
+            if (rel_path.starts_with(first_segment + "/") || rel_path == first_segment)
+            {
+                // Path starts with first segment of table location, likely relative to storage root
+                std::filesystem::path fs_path(rel_path);
+                std::filesystem::path normalized = fs_path.lexically_normal();
+                
+                std::string result = normalized.string();
+                std::replace(result.begin(), result.end(), '\\', '/');
+                
+                while (!result.empty() && result.front() == '/')
+                    result = result.substr(1);
+                
+                return result;
+            }
+        }
     }
 
     std::string combined = base.key;