Skip to content

Commit

Permalink
merge with feature
Browse files Browse the repository at this point in the history
  • Loading branch information
lnkuiper committed Oct 31, 2024
2 parents 5e4f2e1 + de91c64 commit 2065545
Show file tree
Hide file tree
Showing 859 changed files with 345,838 additions and 489,097 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ body:
* [duckdb-odbc](https://github.com/duckdb/duckdb-odbc/issues/new)
* [duckdb-r](https://github.com/duckdb/duckdb-r/issues/new)
* [duckdb-rs](https://github.com/duckdb/duckdb-rs/issues/new)
* [duckdb-swift](https://github.com/duckdb/duckdb-swift/issues/new)
* [duckdb-wasm](https://github.com/duckdb/duckdb-wasm/issues/new)
* [go-duckdb](https://github.com/marcboeker/go-duckdb/issues/new)
* Extensions:
Expand Down
2 changes: 1 addition & 1 deletion .github/config/extensions.csv
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ aws,https://github.com/duckdb/duckdb_aws,f7b8729f1cce5ada5d4add70e1486de50763fb9
azure,https://github.com/duckdb/duckdb_azure,09623777a366572bfb8fa53e47acdf72133a360e,
spatial,https://github.com/duckdb/duckdb_spatial,bb9c829693965f029eb5a312aefed4c538fad781,
iceberg,https://github.com/duckdb/duckdb_iceberg,d89423c2ff90a0b98a093a133c8dfe2a55b9e092,
vss,https://github.com/duckdb/duckdb_vss,9ff608f1edc6a1da2e41ee41b1ef42ba3169e71c,
vss,https://github.com/duckdb/duckdb_vss,74137d802e0867966a604ba7dc49eefc18d1ee7f,
3 changes: 2 additions & 1 deletion .github/config/out_of_tree_extensions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ if (NOT MINGW)
LOAD_TESTS
GIT_URL https://github.com/duckdb/duckdb_aws
GIT_TAG e738b4cc07a86d323db8b38220323752cd183a04
APPLY_PATCHES
)
endif()

Expand Down Expand Up @@ -149,7 +150,7 @@ duckdb_extension_load(vss
LOAD_TESTS
DONT_LINK
GIT_URL https://github.com/duckdb/duckdb_vss
GIT_TAG dd880d6121c0f3dff27131e54e057c9db0f1c710
GIT_TAG 74137d802e0867966a604ba7dc49eefc18d1ee7f
TEST_DIR test/sql
APPLY_PATCHES
)
Expand Down
10 changes: 10 additions & 0 deletions .github/patches/extensions/aws/test_fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
diff --git a/test/sql/aws_secret_gcs.test b/test/sql/aws_secret_gcs.test
index cbed048..bcc274e 100644
--- a/test/sql/aws_secret_gcs.test
+++ b/test/sql/aws_secret_gcs.test
@@ -25,5 +25,4 @@ s1
statement error
from "gcs://a/b.csv"
----
-https://storage.googleapis.com/a/b.csv

53 changes: 53 additions & 0 deletions .github/patches/extensions/azure/reformat_string_functions.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
diff --git a/src/azure_blob_filesystem.cpp b/src/azure_blob_filesystem.cpp
index 4050960..714ab58 100644
--- a/src/azure_blob_filesystem.cpp
+++ b/src/azure_blob_filesystem.cpp
@@ -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"
@@ -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++;
diff --git a/src/azure_dfs_filesystem.cpp b/src/azure_dfs_filesystem.cpp
index 27966e3..3f9e5e7 100644
--- a/src/azure_dfs_filesystem.cpp
+++ b/src/azure_dfs_filesystem.cpp
@@ -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>
@@ -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;
@@ -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);
}
}
26 changes: 24 additions & 2 deletions .github/patches/extensions/spatial/random_test_fix.patch
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ index 465cb87..5aa49dd 100644

ExtensionUtil::RegisterFunction(db, read);
diff --git a/spatial/src/spatial/gdal/functions/st_read.cpp b/spatial/src/spatial/gdal/functions/st_read.cpp
index 177548c..42d2df7 100644
index b730baa..8d08898 100644
--- a/spatial/src/spatial/gdal/functions/st_read.cpp
+++ b/spatial/src/spatial/gdal/functions/st_read.cpp
@@ -675,7 +675,7 @@ void GdalTableFunction::Register(DatabaseInstance &db) {
@@ -676,7 +676,7 @@ void GdalTableFunction::Register(DatabaseInstance &db) {
GdalTableFunction::InitGlobal, GdalTableFunction::InitLocal);

scan.cardinality = GdalTableFunction::Cardinality;
Expand All @@ -68,3 +68,25 @@ index 177548c..42d2df7 100644

scan.projection_pushdown = true;
scan.filter_pushdown = true;
diff --git a/spatial/src/spatial/geos/functions/aggregate.cpp b/spatial/src/spatial/geos/functions/aggregate.cpp
index aacc668..c478786 100644
--- a/spatial/src/spatial/geos/functions/aggregate.cpp
+++ b/spatial/src/spatial/geos/functions/aggregate.cpp
@@ -197,7 +197,7 @@ void GeosAggregateFunctions::Register(DatabaseInstance &db) {

AggregateFunctionSet st_intersection_agg("ST_Intersection_Agg");
st_intersection_agg.AddFunction(
- AggregateFunction::UnaryAggregateDestructor<GEOSAggState, geometry_t, geometry_t, IntersectionAggFunction>(
+ AggregateFunction::UnaryAggregateDestructor<GEOSAggState, geometry_t, geometry_t, IntersectionAggFunction, AggregateDestructorType::LEGACY>(
core::GeoTypes::GEOMETRY(), core::GeoTypes::GEOMETRY()));

ExtensionUtil::RegisterFunction(db, st_intersection_agg);
@@ -206,7 +206,7 @@ void GeosAggregateFunctions::Register(DatabaseInstance &db) {

AggregateFunctionSet st_union_agg("ST_Union_Agg");
st_union_agg.AddFunction(
- AggregateFunction::UnaryAggregateDestructor<GEOSAggState, geometry_t, geometry_t, UnionAggFunction>(
+ AggregateFunction::UnaryAggregateDestructor<GEOSAggState, geometry_t, geometry_t, UnionAggFunction, AggregateDestructorType::LEGACY>(
core::GeoTypes::GEOMETRY(), core::GeoTypes::GEOMETRY()));

ExtensionUtil::RegisterFunction(db, st_union_agg);
8 changes: 4 additions & 4 deletions .github/workflows/CodeQuality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,14 @@ jobs:
run: sudo apt-get update -y -qq && sudo apt-get install -y -qq ninja-build clang-tidy && sudo pip3 install pybind11[global] --break-system-packages

- name: Setup Ccache
if: ${{ github.ref == 'refs/heads/main' }}
if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/feature' }}
uses: hendrikmuhs/ccache-action@main
with:
key: ${{ github.job }}
save: ${{ github.ref == 'refs/heads/main' || github.repository != 'duckdb/duckdb' }}

- name: Download clang-tidy-cache
if: ${{ github.ref == 'refs/heads/main' }}
if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/feature' }}
shell: bash
run: |
set -e
Expand All @@ -134,10 +134,10 @@ jobs:
- name: Tidy Check
shell: bash
if: ${{ github.ref == 'refs/heads/main' }}
if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/feature' }}
run: make tidy-check TIDY_BINARY=/tmp/clang-tidy-cache

- name: Tidy Check Diff
shell: bash
if: ${{ github.ref != 'refs/heads/main' }}
if: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/feature' }}
run: make tidy-check-diff
Loading

0 comments on commit 2065545

Please sign in to comment.