Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump duckdb (absorbing patches), and bump extension-ci-tools #90

Merged
merged 3 commits into from
Dec 17, 2024
Merged

Bump duckdb (absorbing patches), and bump extension-ci-tools #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
781ef65
Bump duckdb, extension-ci-tools and apply patch reformat_string_funct…
carlopi Dec 16, 2024
d3d5a12
Adapt MainDistributionPipeline
carlopi Dec 16, 2024
9d37bc9
Adapt to FileHandle change of signature
carlopi Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/MainDistributionPipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,21 @@ concurrency:
jobs:
duckdb-stable-build:
name: Build extension binaries
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.1.2
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
with:
extension_name: azure
duckdb_version: v1.1.2
ci_tools_version: v1.1.2
duckdb_version: main
ci_tools_version: main
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'

duckdb-stable-deploy:
name: Deploy extension binaries
needs: duckdb-stable-build
uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.1.2
uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
secrets: inherit
with:
extension_name: azure
duckdb_version: v1.1.2
duckdb_version: main
ci_tools_version: main
exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
2 changes: 1 addition & 1 deletion duckdb
Open in desktop
Submodule duckdb updated 2585 files
2 changes: 1 addition & 1 deletion extension-ci-tools
Open in desktop
Submodule extension-ci-tools updated 10 files
+27 −3 .github/workflows/TestCITools.yml
+17 −10 .github/workflows/_extension_deploy.yml
+54 −70 .github/workflows/_extension_distribution.yml
+3 −2 README.md
+258 −0 makefiles/c_api_extensions/base.Makefile
+129 −0 makefiles/c_api_extensions/c_cpp.Makefile
+47 −0 makefiles/c_api_extensions/rust.Makefile
+31 −7 makefiles/duckdb_extension.Makefile
+44 −6 scripts/append_extension_metadata.py
+45 −0 scripts/configure_helper.py
4 changes: 2 additions & 2 deletions src/azure_blob_filesystem.cpp
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/azure_filesystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ void AzureContextState::QueryEnd() {

AzureFileHandle::AzureFileHandle(AzureStorageFileSystem &fs, string path, FileOpenFlags flags,
const AzureReadOptions &read_options)
: FileHandle(fs, std::move(path)), flags(flags),
: FileHandle(fs, std::move(path), flags), flags(flags),
// File info
length(0), last_modified(0),
// Read info
Expand Down
Loading