Merge branch 'main' into cte_regression

kryonix · May 14, 2024 · fa9f5ca · fa9f5ca
2 parents 8e6349b + 5bd8716
commit fa9f5ca
Show file tree

Hide file tree

Showing 888 changed files with 74,982 additions and 35,325 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -46,7 +46,7 @@ CheckOptions:
   - key:             readability-identifier-naming.VariableCase
     value:           lower_case
   - key:             modernize-use-emplace.SmartPointers
-    value:           '::std::shared_ptr;::duckdb::unique_ptr;::std::auto_ptr;::std::weak_ptr'
+    value:           '::duckdb::shared_ptr;::duckdb::unique_ptr;::std::auto_ptr;::duckdb::weak_ptr'
   - key:             cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreUnnamedParams
     value:           true
 
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -10,6 +10,7 @@ body:
 
           * [Documentation/website](https://github.com/duckdb/duckdb-web/issues/new)
           * APIs:
+            * [duckdb-java](https://github.com/duckdb/duckdb-java/issues/new)
             * [duckdb-node](https://github.com/duckdb/duckdb-node/issues/new)
             * [duckdb-r](https://github.com/duckdb/duckdb-r/issues/new)
             * [duckdb-rs](https://github.com/duckdb/duckdb-rs/issues/new)

diff --git a/.github/config/extensions.csv b/.github/config/extensions.csv
@@ -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,8ac803e986ccda34f32dee82a7faae95b72b3492,
 iceberg,https://github.com/duckdb/duckdb_iceberg,d89423c2ff90a0b98a093a133c8dfe2a55b9e092,
-vss,https://github.com/duckdb/duckdb_vss,8145f41d97178e82bed3376215eb8d02bcf1eec5,
+vss,https://github.com/duckdb/duckdb_vss,dbf5b74298384a9dc8e78353e628259b020cd4eb,
diff --git a/.github/config/out_of_tree_extensions.cmake b/.github/config/out_of_tree_extensions.cmake
@@ -21,6 +21,7 @@ if (NOT MINGW)
             LOAD_TESTS DONT_LINK
             GIT_URL https://github.com/duckdb/arrow
             GIT_TAG 9e10240da11f61ea7fbfe3fc9988ffe672ccd40f
+            APPLY_PATCHES
             )
 endif()
 
@@ -30,6 +31,7 @@ if (NOT MINGW)
             LOAD_TESTS
             GIT_URL https://github.com/duckdb/duckdb_aws
             GIT_TAG f7b8729f1cce5ada5d4add70e1486de50763fb97
+            APPLY_PATCHES
             )
 endif()
 
@@ -39,6 +41,7 @@ if (NOT MINGW)
             LOAD_TESTS
             GIT_URL https://github.com/duckdb/duckdb_azure
             GIT_TAG 09623777a366572bfb8fa53e47acdf72133a360e
+			APPLY_PATCHES
             )
 endif()
 
@@ -66,15 +69,17 @@ if (NOT MINGW)
             DONT_LINK
             GIT_URL https://github.com/duckdb/postgres_scanner
             GIT_TAG 96206f41d5ca7015920a66b54e936c986fe0b0f8
+            APPLY_PATCHES
             )
 endif()
 
 ################# SPATIAL
 duckdb_extension_load(spatial
-    DONT_LINK LOAD_TESTS
+    DONT_LINK LOAD_TESTS APPLY_PATCHES
     GIT_URL https://github.com/duckdb/duckdb_spatial.git
     GIT_TAG 8ac803e986ccda34f32dee82a7faae95b72b3492
     INCLUDE_DIR spatial/include
+    APPLY_PATCHES
     TEST_DIR test/sql
     )
 
@@ -90,6 +95,7 @@ duckdb_extension_load(sqlite_scanner
         ${STATIC_LINK_SQLITE} LOAD_TESTS
         GIT_URL https://github.com/duckdb/sqlite_scanner
         GIT_TAG 091197efb34579c7195afa43dfb5925023c915c0
+        APPLY_PATCHES
         )
 
 ################# SUBSTRAIT
@@ -98,14 +104,28 @@ if (NOT WIN32)
             LOAD_TESTS DONT_LINK
             GIT_URL https://github.com/duckdb/substrait
             GIT_TAG 1116fb580edd3e26e675436dbdbdf4a0aa5e456e
+            APPLY_PATCHES
             )
 endif()
 
 
 ################# VSS
 duckdb_extension_load(vss
         LOAD_TESTS
+        DONT_LINK
         GIT_URL https://github.com/duckdb/duckdb_vss
-        GIT_TAG 8145f41d97178e82bed3376215eb8d02bcf1eec5
+        GIT_TAG dbf5b74298384a9dc8e78353e628259b020cd4eb
         TEST_DIR test/sql
+        APPLY_PATCHES
     )
+
+################# MYSQL
+if (NOT MINGW)
+    duckdb_extension_load(mysql_scanner
+            DONT_LINK
+            LOAD_TESTS
+            GIT_URL https://github.com/duckdb/duckdb_mysql
+            GIT_TAG 655a003f7d405e0c8437e24e0bd47dfd63b7fb07
+            APPLY_PATCHES
+            )
+endif()
diff --git a/.github/config/uncovered_files.csv b/.github/config/uncovered_files.csv
@@ -435,7 +435,6 @@ include/duckdb/main/query_result.hpp	12
 include/duckdb/main/relation.hpp	3
 include/duckdb/main/relation/subquery_relation.hpp	3
 include/duckdb/main/relation/write_parquet_relation.hpp	3
-include/duckdb/optimizer/join_order/estimated_properties.hpp	1
 include/duckdb/optimizer/matcher/function_matcher.hpp	2
 include/duckdb/optimizer/matcher/set_matcher.hpp	2
 include/duckdb/parallel/base_pipeline_event.hpp	2
@@ -543,7 +542,6 @@ optimizer/join_order/join_order_optimizer.cpp	96
 optimizer/join_order/query_graph.cpp	2
 optimizer/join_order/relation_manager.cpp	4
 optimizer/join_order/query_graph_manager.cpp	3
-optimizer/join_order/estimated_properties.cpp	16
 optimizer/join_order/plan_enumerator.cpp	11
 optimizer/join_order/relation_statistics_helper.cpp	2
 optimizer/matcher/expression_matcher.cpp	2