Merge branch 'feature' into query-function

chrisiou · Mar 5, 2024 · 9d5ccba · 9d5ccba
2 parents 68d125b + 2b9772a
commit 9d5ccba
Show file tree

Hide file tree

Showing 543 changed files with 100,204 additions and 29,218 deletions.
diff --git a/.github/actions/build_extensions/action.yml b/.github/actions/build_extensions/action.yml
@@ -116,6 +116,17 @@ runs:
         ls -al
         pwd
 
+    - name: Fix for MSVC issue (see e.g. https://github.com/TileDB-Inc/TileDB/pull/4759)
+      shell: bash
+      if: inputs.deploy_as == 'windows_amd64'
+      env:
+        OVERLAY_TRIPLET_SRC:  ${{ github.workspace }}/vcpkg/triplets/community/x64-windows-static-md.cmake
+        OVERLAY_TRIPLET_DST:  ${{ github.workspace }}/overlay_triplets/x64-windows-static-md.cmake
+      run: |
+        mkdir overlay_triplets
+        cp $OVERLAY_TRIPLET_SRC $OVERLAY_TRIPLET_DST
+        echo "set(VCPKG_PLATFORM_TOOLSET_VERSION "14.38")" >> $OVERLAY_TRIPLET_DST
+
     - name: Set Openssl dir
       if: inputs.openssl_path != ''
       shell: bash
@@ -144,6 +155,7 @@ runs:
         GEN: ${{ inputs.ninja == 1 && 'ninja' || '' }}
         USE_MERGED_VCPKG_MANIFEST: 1
         DUCKDB_PLATFORM: ${{ inputs.duckdb_arch }}
+        VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/overlay_triplets"
       run: |
         ls
         mkdir -p ~/.ssh

diff --git a/.github/config/out_of_tree_extensions.cmake b/.github/config/out_of_tree_extensions.cmake
@@ -19,7 +19,7 @@ if (NOT MINGW)
     duckdb_extension_load(aws
             LOAD_TESTS
             GIT_URL https://github.com/duckdb/duckdb_aws
-            GIT_TAG af729d027e57175c5496a2d7dfef68833e6d6cd3
+            GIT_TAG 043890c2ad83c4a1375417e2d5d085a33f79a217
             )
 endif()
 
@@ -28,7 +28,7 @@ if (NOT MINGW)
     duckdb_extension_load(azure
             LOAD_TESTS
             GIT_URL https://github.com/duckdb/duckdb_azure
-            GIT_TAG 10d4cf6a0ed00ea8aecb9bf1433fdfff166e6c44
+            GIT_TAG 3ad0348334d2a263e5f19ef08fd02311bdae82f3
             )
 endif()
 
@@ -90,5 +90,6 @@ if (NOT WIN32)
             LOAD_TESTS DONT_LINK
             GIT_URL https://github.com/duckdb/substrait
             GIT_TAG 870bab8725d1123905296bfb1f35ce737434e0b3
+            APPLY_PATCHES
             )
 endif()
diff --git a/.github/patches/extensions/substrait/substrait.patch b/.github/patches/extensions/substrait/substrait.patch
@@ -0,0 +1,38 @@
+diff --git a/src/to_substrait.cpp b/src/to_substrait.cpp
+index 03d9778..d2429c6 100644
+--- a/src/to_substrait.cpp
++++ b/src/to_substrait.cpp
+@@ -777,8 +777,31 @@ substrait::Rel *DuckDBToSubstrait::TransformLimit(LogicalOperator &dop) {
+ 	auto stopn = res->mutable_fetch();
+ 	stopn->set_allocated_input(TransformOp(*dop.children[0]));
+
+-	stopn->set_offset(dlimit.offset_val);
+-	stopn->set_count(dlimit.limit_val);
++	idx_t limit_val;
++	idx_t offset_val;
++
++	switch(dlimit.limit_val.Type()) {
++	case LimitNodeType::CONSTANT_VALUE:
++		limit_val = dlimit.limit_val.GetConstantValue();
++		break;
++	case LimitNodeType::UNSET:
++		limit_val = 2ULL << 62ULL;
++		break;
++	default:
++		throw InternalException("Unsupported limit value type");
++	}
++	switch(dlimit.offset_val.Type()) {
++	case LimitNodeType::CONSTANT_VALUE:
++		offset_val = dlimit.offset_val.GetConstantValue();
++		break;
++	case LimitNodeType::UNSET:
++		offset_val = 0;
++		break;
++	default:
++		throw InternalException("Unsupported offset value type");
++	}
++	stopn->set_offset(offset_val);
++	stopn->set_count(limit_val);
+ 	return res;
+ }
+
diff --git a/.github/regression/csv.csv b/.github/regression/csv.csv
@@ -2,4 +2,6 @@ benchmark/micro/csv/sniffer.benchmark
 benchmark/micro/csv/read.benchmark
 benchmark/micro/csv/small_csv.benchmark
 benchmark/micro/csv/null_padding.benchmark
-benchmark/micro/csv/projection_pushdown.benchmark
+benchmark/micro/csv/projection_pushdown.benchmark
+benchmark/micro/csv/1_byte_values.benchmark
+benchmark/micro/csv/16_byte_values.benchmark
diff --git a/.github/regression/large.csv b/.github/regression/large.csv
@@ -0,0 +1,23 @@
+benchmark/large/tpch-sf100/q01.benchmark
+benchmark/large/tpch-sf100/q02.benchmark
+benchmark/large/tpch-sf100/q03.benchmark
+benchmark/large/tpch-sf100/q04.benchmark
+benchmark/large/tpch-sf100/q05.benchmark
+benchmark/large/tpch-sf100/q06.benchmark
+benchmark/large/tpch-sf100/q07.benchmark
+benchmark/large/tpch-sf100/q08.benchmark
+benchmark/large/tpch-sf100/q09.benchmark
+benchmark/large/tpch-sf100/q10.benchmark
+benchmark/large/tpch-sf100/q11.benchmark
+benchmark/large/tpch-sf100/q12.benchmark
+benchmark/large/tpch-sf100/q13.benchmark
+benchmark/large/tpch-sf100/q14.benchmark
+benchmark/large/tpch-sf100/q15.benchmark
+benchmark/large/tpch-sf100/q16.benchmark
+benchmark/large/tpch-sf100/q17.benchmark
+benchmark/large/tpch-sf100/q18.benchmark
+benchmark/large/tpch-sf100/q19.benchmark
+benchmark/large/tpch-sf100/q20.benchmark
+benchmark/large/tpch-sf100/q21.benchmark
+benchmark/large/tpch-sf100/q22.benchmark
+
diff --git a/.github/workflows/CheckIssueForCodeFormatting.yml b/.github/workflows/CheckIssueForCodeFormatting.yml
@@ -15,7 +15,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up Python 3.11
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
       - name: Check issue for code formatting

diff --git a/.github/workflows/ExtendedTests.yml b/.github/workflows/ExtendedTests.yml
@@ -43,7 +43,7 @@ jobs:
        with:
          fetch-depth: 0
 
-     - uses: actions/setup-python@v4
+     - uses: actions/setup-python@v5
        with:
          python-version: '3.7'
 
@@ -125,7 +125,7 @@ jobs:
        with:
          fetch-depth: 0
 
-     - uses: actions/setup-python@v4
+     - uses: actions/setup-python@v5
        with:
          python-version: '3.7'
 
@@ -207,7 +207,7 @@ jobs:
          with:
            fetch-depth: 0
 
-       - uses: actions/setup-python@v4
+       - uses: actions/setup-python@v5
          with:
            python-version: '3.7'
 
@@ -294,7 +294,7 @@ jobs:
          with:
            fetch-depth: 0
 
-       - uses: actions/setup-python@v4
+       - uses: actions/setup-python@v5
          with:
            python-version: '3.7'
 

diff --git a/.github/workflows/ExtraTests.yml b/.github/workflows/ExtraTests.yml
@@ -28,9 +28,9 @@ jobs:
       with:
         fetch-depth: 0
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
-        python-version: '3.7'
+        python-version: '3.12'
 
     - name: Install
       shell: bash

diff --git a/.github/workflows/Java.yml b/.github/workflows/Java.yml
@@ -138,9 +138,9 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
-          python-version: "3.7"
+          python-version: "3.12"
       - name: Setup Ccache
         uses: hendrikmuhs/ccache-action@main
         with:
@@ -174,7 +174,7 @@ jobs:
 
   java-osx-universal:
     name: Java OSX (Universal)
-    runs-on: macos-latest
+    runs-on: macos-14
     needs: java-linux-amd64
     env:
       BUILD_JDBC: 1
@@ -186,9 +186,9 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
-          python-version: "3.7"
+          python-version: "3.12"
       - name: Setup Ccache
         uses: hendrikmuhs/ccache-action@main
         with:

diff --git a/.github/workflows/Julia.yml b/.github/workflows/Julia.yml
@@ -69,7 +69,6 @@ jobs:
           - '1.6'
           - '1.7'
           - '1'
-          - 'nightly'
         os:
           - ubuntu-latest
         arch:

diff --git a/.github/workflows/LinuxRelease.yml b/.github/workflows/LinuxRelease.yml
@@ -107,7 +107,7 @@ jobs:
         zip -j duckdb_cli-linux-amd64.zip build/release/duckdb
         zip -j libduckdb-linux-amd64.zip build/release/src/libduckdb*.* src/amalgamation/duckdb.hpp src/include/duckdb.h
         zip -j libduckdb-src.zip src/amalgamation/duckdb.hpp src/amalgamation/duckdb.cpp src/include/duckdb.h
-        zip -j duckdb_odbc-linux-amd64.zip build/release/tools/odbc/libduckdb_odbc.so tools/odbc/linux_setup/unixodbc_setup.sh
+        zip -j duckdb_odbc-linux-amd64.zip build/release/tools/odbc/libduckdb_odbc.so tools/odbc/linux_setup/unixodbc_setup.sh tools/odbc/linux_setup/update_odbc_path.py
         python3 scripts/asset-upload-gha.py libduckdb-src.zip libduckdb-linux-amd64.zip duckdb_cli-linux-amd64.zip duckdb_odbc-linux-amd64.zip
 
     - uses: actions/upload-artifact@v3
@@ -271,7 +271,7 @@ jobs:
       with:
         fetch-depth: 0
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.9'
 
@@ -316,9 +316,9 @@ jobs:
       with:
         fetch-depth: 0
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
-        python-version: '3.7'
+        python-version: '3.12'
 
     - name: Setup Ccache
       uses: hendrikmuhs/ccache-action@main
@@ -359,9 +359,9 @@ jobs:
       with:
         fetch-depth: 0
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
-        python-version: '3.7'
+        python-version: '3.12'
 
     - name: Install Ninja
       shell: bash
@@ -406,9 +406,9 @@ jobs:
       with:
         fetch-depth: 0
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
-        python-version: '3.7'
+        python-version: '3.12'
 
     - name: Install LLVM and Clang
       uses: KyleMayes/install-llvm-action@v1

diff --git a/.github/workflows/Main.yml b/.github/workflows/Main.yml
@@ -214,7 +214,7 @@ jobs:
       run: git clone https://github.com/duckdb/duckdb-web
 
     - name: Set up Python 3.9
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.9'
 
@@ -238,9 +238,9 @@ jobs:
       with:
         fetch-depth: 0
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
-        python-version: '3.7'
+        python-version: '3.12'
 
     - name: Dependencies
       shell: bash
@@ -276,7 +276,14 @@ jobs:
 
     - name: Test Standard ODBC tests
       shell: bash
-      run: build/debug/tools/odbc/test/test_odbc
+      run:  build/debug/tools/odbc/test/test_odbc
+
+    - name: Test Connection ODBC tests
+      shell: bash
+      run: |
+        chmod +x tools/odbc/scripts/create_ini_file.sh
+        tools/odbc/scripts/create_ini_file.sh
+        build/debug/tools/odbc/test/test_connection_odbc
 
     - name: Test nanodbc
       shell: bash
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,7 +69,6 @@ jobs: @@
               - '1.6'
               - '1.7'
               - '1'
-              - 'nightly'
             os:
               - ubuntu-latest
             arch:
@@ Expand Down @@