Skip to content

Commit

Permalink
Bump duckdb, extension-ci-tools and apply patch reformat_string_funct…
Browse files Browse the repository at this point in the history
…ions.patch
  • Loading branch information
carlopi committed Dec 16, 2024
1 parent 8d70765 commit 781ef65
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion duckdb
Submodule duckdb updated 2585 files
4 changes: 2 additions & 2 deletions src/azure_blob_filesystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "duckdb/common/string_util.hpp"
#include "duckdb/main/secret/secret.hpp"
#include "duckdb/main/secret/secret_manager.hpp"
#include "duckdb/function/scalar/string_functions.hpp"
#include "duckdb/function/scalar/string_common.hpp"
#include "duckdb/function/scalar_function.hpp"
#include "duckdb/main/extension_util.hpp"
#include "duckdb/main/client_data.hpp"
Expand Down Expand Up @@ -47,7 +47,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++;
Expand Down
6 changes: 3 additions & 3 deletions src/azure_dfs_filesystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "duckdb/common/exception.hpp"
#include "duckdb/common/helper.hpp"
#include "duckdb/common/shared_ptr.hpp"
#include "duckdb/function/scalar/string_functions.hpp"
#include "duckdb/function/scalar/string_common.hpp"
#include <algorithm>
#include <azure/storage/blobs/blob_options.hpp>
#include <azure/storage/common/storage_exception.hpp>
Expand Down Expand Up @@ -50,7 +50,7 @@ static void Walk(const Azure::Storage::Files::DataLake::DataLakeFileSystemClient
for (const auto &elt : res.Paths) {
if (elt.IsDirectory) {
if (!recursive) { // Only perform recursive call if we are not already processing recursive result
if (LikeFun::Glob(elt.Name.data(), elt.Name.length(), path_pattern.data(), end_match)) {
if (Glob(elt.Name.data(), elt.Name.length(), path_pattern.data(), end_match)) {
if (end_match >= path_pattern.length()) {
// Skip, no way there will be matches anymore
continue;
Expand All @@ -61,7 +61,7 @@ static void Walk(const Azure::Storage::Files::DataLake::DataLakeFileSystemClient
}
} else {
// File
if (LikeFun::Glob(elt.Name.data(), elt.Name.length(), path_pattern.data(), path_pattern.length())) {
if (Glob(elt.Name.data(), elt.Name.length(), path_pattern.data(), path_pattern.length())) {
out_result->push_back(elt.Name);
}
}
Expand Down

0 comments on commit 781ef65

Please sign in to comment.