regex

Author: 0ax1

src/vortex_scan.cpp

@@ -16,6 +16,7 @@
 #else
     #error "No filesystem support available"
 #endif
+#include <regex>
 
 #include "vortex_common.hpp"
 #include "expr/expr.hpp"
@@ -158,7 +159,14 @@ static void ExtractVortexSchema(const vx_dtype *file_dtype, vector<LogicalType>
 	}
 }
 
+const  std::regex schema_prefix = std::regex("^[^/]*:\\/\\/.*$");
+
 std::string EnsureFileProtocol(const std::string &path) {
+	// Check if the path has a schema, if not prepend the file:// schema
+	if (std::regex_match(path, schema_prefix)) {
+			return path;
+	}
+
 	auto absolute_path = path;
 	const std::string prefix = "file://";
 
@@ -171,10 +179,6 @@ std::string EnsureFileProtocol(const std::string &path) {
 		}
 	}
 
-	// Check if the string already starts with "file://"
-	if (absolute_path.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), absolute_path.begin())) {
-		return absolute_path;
-	}
 	return prefix + absolute_path;
 }