forked from duckdb/duckdb
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move back to main branch of httpfs extension
- Loading branch information
Showing
2 changed files
with
46 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
diff --git a/extension/httpfs/hffs.cpp b/extension/httpfs/hffs.cpp | ||
index 2fe028d..0273141 100644 | ||
--- a/extension/httpfs/hffs.cpp | ||
+++ b/extension/httpfs/hffs.cpp | ||
@@ -7,7 +7,7 @@ | ||
#include "duckdb/common/types/hash.hpp" | ||
#include "duckdb/main/database.hpp" | ||
#include "duckdb/main/secret/secret_manager.hpp" | ||
-#include "duckdb/function/scalar/string_functions.hpp" | ||
+#include "duckdb/function/scalar/string_common.hpp" | ||
|
||
#include <chrono> | ||
#include <string> | ||
@@ -117,7 +117,7 @@ static bool Match(vector<string>::const_iterator key, vector<string>::const_iter | ||
} | ||
return false; | ||
} | ||
- if (!LikeFun::Glob(key->data(), key->length(), pattern->data(), pattern->length())) { | ||
+ if (!Glob(key->data(), key->length(), pattern->data(), pattern->length())) { | ||
return false; | ||
} | ||
key++; | ||
diff --git a/extension/httpfs/s3fs.cpp b/extension/httpfs/s3fs.cpp | ||
index 01260b9..82d1eca 100644 | ||
--- a/extension/httpfs/s3fs.cpp | ||
+++ b/extension/httpfs/s3fs.cpp | ||
@@ -12,7 +12,7 @@ | ||
#endif | ||
|
||
#include "duckdb/common/string_util.hpp" | ||
-#include "duckdb/function/scalar/string_functions.hpp" | ||
+#include "duckdb/function/scalar/string_common.hpp" | ||
#include "duckdb/main/secret/secret_manager.hpp" | ||
#include "duckdb/storage/buffer_manager.hpp" | ||
|
||
@@ -869,7 +869,7 @@ static bool Match(vector<string>::const_iterator key, vector<string>::const_iter | ||
} | ||
return false; | ||
} | ||
- if (!LikeFun::Glob(key->data(), key->length(), pattern->data(), pattern->length())) { | ||
+ if (!Glob(key->data(), key->length(), pattern->data(), pattern->length())) { | ||
return false; | ||
} | ||
key++; |