tmp1

Author: zvonand

src/Storages/ObjectStorage/Utils.cpp

@@ -33,7 +33,7 @@ namespace ErrorCodes
 namespace
 {
 
-inline std::string normalizeSchema(const std::string & schema)
+std::string normalizeSchema(const std::string & schema)
 {
     auto schema_lowercase = Poco::toLower(schema);
 
@@ -45,12 +45,12 @@ inline std::string normalizeSchema(const std::string & schema)
     return schema_lowercase;
 }
 
-inline std::string endpoint_cache_key(const std::string & normalized_scheme, const std::string & authority)
+std::string endpoint_cache_key(const std::string & normalized_scheme, const std::string & authority)
 {
     return normalized_scheme + "://" + authority;
 }
 
-static std::string factoryTypeForScheme(const std::string & normalized_scheme)
+std::string factoryTypeForScheme(const std::string & normalized_scheme)
 {
     if (normalized_scheme == "s3") return "s3";
     if (normalized_scheme == "abfs") return "azure";
@@ -59,6 +59,14 @@ static std::string factoryTypeForScheme(const std::string & normalized_scheme)
     return "";
 }
 
+bool isAbsolutePath(const std::string & path)
+{
+    if (!path.empty() && (path.front() == '/' || path.find("://") != std::string_view::npos))
+        return true;
+
+    return false;
+}
+
 }
 
 // TODO: handle https://s3.amazonaws.com/bucketname/... properly
@@ -196,54 +204,6 @@ void validateSupportedColumns(
     }
 }
 
-inline bool isSameStorageSchema(const std::string & schema1, const std::string & schema2)
-{
-    return normalizeSchema(schema1) == normalizeSchema(schema2);
-}
-
-std::string extractStorageType(const std::string & path)
-{
-    if (path.empty())
-        return "";
-
-    // Absolute POSIX path -> file
-    if (path.front() == '/')
-        return "file";
-
-    // Look for "scheme://..."
-    if (auto pos = path.find("://"); pos != std::string_view::npos && pos > 0)
-        return Poco::toLower(path.substr(0, pos));
-
-    // Tolerant: "scheme:..." with no slash before colon (avoid Windows drive letters like "C:\")
-    {
-        auto colon_pos = path.find(':');
-        auto slash_pos = path.find('/');
-        if (colon_pos != std::string_view::npos && (slash_pos == std::string_view::npos || colon_pos < slash_pos))
-        {
-            auto maybe_scheme = path.substr(0, colon_pos);
-            // Heuristic: treat single-letter prefix followed by ":\\" as Windows drive, not a scheme
-            if (!(maybe_scheme.size() == 1 && colon_pos + 1 < path.size() && (path[colon_pos + 1] == '\\' || path[colon_pos + 1] == '/')))
-                return Poco::toLower(maybe_scheme);
-        }
-    }
-
-    // Relative path or unknown
-    return "";
-}
-
-bool isRelativePath(const std::string & path)
-{
-    if (path.empty())
-        return true;
-
-    // Non-relative if it has a scheme (e.g., s3://, file://)
-    if (!extractStorageType(path).empty())
-        return false;
-
-    return true;
-}
-
-
 std::string normalizePathToStorageRoot(const std::string & table_location, const std::string & path)
 {
     if (table_location.empty())
@@ -255,7 +215,7 @@ std::string normalizePathToStorageRoot(const std::string & table_location, const
         return result;
     }
 
-    if (!isRelativePath(path))
+    if (isAbsolutePath(path))
     {
         SchemeAuthorityKey target{path};
         return target.key;
@@ -326,7 +286,7 @@ std::string normalizePathToStorageRoot(const std::string & table_location, const
 
 std::string makeAbsolutePath(const std::string & table_location, const std::string & path)
 {
-    if (!isRelativePath(path))
+    if (isAbsolutePath(path))
         return path;
 
     auto base = SchemeAuthorityKey(table_location);
@@ -348,7 +308,7 @@ std::pair<DB::ObjectStoragePtr, std::string> resolveObjectStorageForPath(
     std::map<std::string, DB::ObjectStoragePtr> & secondary_storages,
     const DB::ContextPtr & context)
 {
-    if (isRelativePath(path))
+    if (!isAbsolutePath(path))
     {
         // For relative paths, normalize to storage root
         std::string normalized_key = normalizePathToStorageRoot(table_location, path);

src/Storages/ObjectStorage/Utils.h

@@ -47,13 +47,6 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBuffer(
     const LoggerPtr & log,
     const std::optional<ReadSettings> & read_settings = std::nullopt);
 
-bool isRelativePath(const std::string & path);
-
-bool isSameStorageSchema(const std::string & schema1, const std::string & schema2);
-
-// Returns lowercased and normalized schema / storage type (e.g. s3:// -> "s3")
-std::string extractStorageType(const std::string & path);
-
 std::string makeAbsolutePath(const std::string & table_location, const std::string & path);
 
 // Normalize a path that may be relative to table location to be relative to storage root