duckdb · Mytherin · Mar 21, 2025 · Mar 12, 2025 · Mar 12, 2025 · Mar 13, 2025
diff --git a/.github/workflows/BundleStaticLibs.yml b/.github/workflows/BundleStaticLibs.yml
@@ -80,7 +80,8 @@ jobs:
 
       - name: Bundle static library
         shell: bash
-        run: make bundle-library-o
+        run: |
+          make gather-libs
 
       - name: Print platform
         shell: bash
@@ -93,14 +94,14 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_DUCKDB_STAGING_KEY }}
         run: |
           python3 scripts/amalgamation.py
-          zip -j static-lib-osx-${{ matrix.architecture }}.zip src/include/duckdb.h build/release/libduckdb_bundle.a
-          ./scripts/upload-assets-to-staging.sh github_release static-lib-osx-${{ matrix.architecture }}.zip
+          zip -r -j static-libs-osx-${{ matrix.architecture }}.zip src/include/duckdb.h build/release/libs/
+          ./scripts/upload-assets-to-staging.sh github_release static-libs-osx-${{ matrix.architecture }}.zip
 
       - uses: actions/upload-artifact@v4
         with:
-          name: duckdb-static-lib-osx-${{ matrix.architecture }}
+          name: duckdb-static-libs-osx-${{ matrix.architecture }}
           path: |
-            static-lib-osx-${{ matrix.architecture }}.zip
+            static-libs-osx-${{ matrix.architecture }}.zip
 
   bundle-mingw-static-lib:
     name: Windows MingW static libs
@@ -142,22 +143,22 @@ jobs:
       - name: Bundle static library
         shell: bash
         run: |
-          make bundle-library-obj
+          make gather-libs
 
       - name: Deploy
         shell: bash
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.S3_DUCKDB_STAGING_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_DUCKDB_STAGING_KEY }}
         run: |
-          zip -j static-lib-windows-mingw.zip src/include/duckdb.h build/release/libduckdb_bundle.a
-          ./scripts/upload-assets-to-staging.sh github_release static-lib-windows-mingw.zip
+          zip -r -j static-libs-windows-mingw.zip src/include/duckdb.h build/release/libs/
+          ./scripts/upload-assets-to-staging.sh github_release static-libs-windows-mingw.zip
 
       - uses: actions/upload-artifact@v4
         with:
-          name: duckdb-static-lib-windows-mingw
+          name: duckdb-static-libs-windows-mingw
           path: |
-            static-lib-windows-mingw.zip
+            static-libs-windows-mingw.zip
   bundle-linux-arm64-static-libs:
     name: Linux arm64 static libs
     runs-on: ubuntu-latest
@@ -183,21 +184,21 @@ jobs:
           -e FORCE_WARN_UNUSED=1                                                 \
           -e DUCKDB_PLATFORM=linux_arm64                                         \
           ubuntu:18.04                                                           \
-          bash -c "/duckdb/scripts/setup_ubuntu1804.sh && git config --global --add safe.directory /duckdb && make bundle-library -C /duckdb"
+          bash -c "/duckdb/scripts/setup_ubuntu1804.sh && git config --global --add safe.directory /duckdb && make gather-libs -C /duckdb"
       - name: Deploy
         shell: bash
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.S3_DUCKDB_STAGING_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_DUCKDB_STAGING_KEY }}
         run: |
           python3 scripts/amalgamation.py
-          zip -j static-lib-linux-arm64.zip src/include/duckdb.h build/release/libduckdb_bundle.a
-          ./scripts/upload-assets-to-staging.sh github_release static-lib-linux-arm64.zip
+          zip -r -j static-libs-linux-arm64.zip src/include/duckdb.h build/release/libs/
+          ./scripts/upload-assets-to-staging.sh github_release static-libs-linux-arm64.zip
       - uses: actions/upload-artifact@v4
         with:
-          name: duckdb-static-lib-linux-arm64
+          name: duckdb-static-libs-linux-arm64
           path: |
-            static-lib-linux-arm64.zip
+            static-libs-linux-arm64.zip
   bundle-linux-amd64-static-libs:
     name: Linux amd64 static libs
     runs-on: ubuntu-latest
@@ -225,7 +226,7 @@ jobs:
           -e BUILD_BENCHMARK=1                                                   \
           -e FORCE_WARN_UNUSED=1                                                 \
           quay.io/pypa/manylinux2014_x86_64                                      \
-          bash -c "yum install -y perl-IPC-Cmd && git config --global --add safe.directory $PWD && make bundle-library -C $PWD"
+          bash -c "yum install -y perl-IPC-Cmd && git config --global --add safe.directory $PWD && make gather-libs -C $PWD"
       - name: Print platform
         shell: bash
         run: ./build/release/duckdb -c "PRAGMA platform;"
@@ -237,10 +238,10 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_DUCKDB_STAGING_KEY }}
         run: |
           python3 scripts/amalgamation.py
-          zip -j static-lib-linux-amd64.zip src/include/duckdb.h build/release/libduckdb_bundle.a
-          ./scripts/upload-assets-to-staging.sh github_release static-lib-linux-amd64.zip
+          zip -r -j static-libs-linux-amd64.zip src/include/duckdb.h build/release/libs/
+          ./scripts/upload-assets-to-staging.sh github_release static-libs-linux-amd64.zip
       - uses: actions/upload-artifact@v4
         with:
-          name: duckdb-static-lib-linux-amd64
+          name: duckdb-static-libs-linux-amd64
           path: |
-            static-lib-linux-amd64.zip
+            static-libs-linux-amd64.zip
diff --git a/Makefile b/Makefile
@@ -524,3 +524,11 @@ bundle-library-obj: bundle-setup
 
 bundle-library: release
 	make bundle-library-o
+
+gather-libs: release
+	cd build/release && \
+	rm -rf libs && \
+	mkdir -p libs && \
+	cp src/libduckdb_static.a libs/. && \
+	cp third_party/*/libduckdb_*.a libs/. && \
+	cp extension/*/lib*_extension.a libs/.
diff --git a/data/csv/afl/4086/case_1.csv b/data/csv/afl/4086/case_1.csv
@@ -0,0 +1,2 @@
+Ë
+Ì
diff --git a/data/csv/afl/4086/case_2.csv b/data/csv/afl/4086/case_2.csv
@@ -0,0 +1,149 @@
+
+>
+?
+@
+A
+B
+C
+D
+E
+F
+G
+H
+I
+J
+K
+L
+M
+N
+O
+P
+Q
+R
+S
+T
+U
+V
+W
+X
+Y
+Z
+[
+\
+]
+^
+_
+`
+a
+b
+c
+j
+k
+l
+
+Ë
+Ì
+
+F
+G
+H
+I
+J
+K
+L
+M
+N
+O
+Í
+Î
+Ï
+Ð
+Ñ
+Ò
+Ó
+Ôw
+x
+y
+z
+{
+|
+}
+~
+Ÿ
+¡
+¢
+£
+¤
+¥
+¦
+§
+¨
+©
+ª
+«
+¬
+
+®
+¯
+°
+±
+²
+³
+´
+µ
+¶
+·
+¸
+¹
+º
+»
+¼
+½
+¾
+¿
+À
+Á
+Â
+Ã
+Ä
+Å
+ÿ}}}}}}}}}}}}}}}}}}}}}}
+Ç
+È
+É
+Ê
+Ë
+Ì
+Í
+Î
+Ï
+Ð
+Ñ
+Ò
+Ó
+Ô
+2
+3
+4
+5
+Õ
+Ö
+×
+Ø
+Ù
+Ú
+Û
+Ü
+Ý
+Þ
+ß
+à
+á
+â
+ã
+ä
+å
+æ
+ç
+è
+é
diff --git a/data/csv/afl/4086/case_3.csv b/data/csv/afl/4086/case_3.csv
diff --git a/extension/core_functions/include/core_functions/aggregate/quantile_sort_tree.hpp b/extension/core_functions/include/core_functions/aggregate/quantile_sort_tree.hpp
@@ -8,17 +8,13 @@
 
 #pragma once
 
-#include "duckdb/common/sort/sort.hpp"
 #include "duckdb/common/types/column/column_data_collection.hpp"
-#include "duckdb/common/types/row/row_layout.hpp"
 #include "core_functions/aggregate/quantile_helpers.hpp"
-#include "duckdb/execution/merge_sort_tree.hpp"
 #include "duckdb/common/operator/cast_operators.hpp"
 #include "duckdb/common/operator/multiply.hpp"
 #include "duckdb/planner/expression/bound_constant_expression.hpp"
 #include "duckdb/function/window/window_index_tree.hpp"
 #include <algorithm>
-#include <numeric>
 #include <stdlib.h>
 #include <utility>
 
@@ -89,7 +85,7 @@ struct QuantileDirect {
 	using RESULT_TYPE = T;
 
 	inline const INPUT_TYPE &operator()(const INPUT_TYPE &x) const {
-		return x;
+		return x; // NOLINT
 	}
 };
 
@@ -365,7 +361,7 @@ struct QuantileSortTree {
 	}
 
 	inline idx_t SelectNth(const SubFrames &frames, size_t n) const {
-		return index_tree->SelectNth(frames, n);
+		return index_tree->SelectNth(frames, n).first;
 	}
 
 	template <typename INPUT_TYPE, typename RESULT_TYPE, bool DISCRETE>

diff --git a/extension/core_functions/include/core_functions/aggregate/quantile_state.hpp b/extension/core_functions/include/core_functions/aggregate/quantile_state.hpp
@@ -207,6 +207,9 @@ struct WindowQuantileState {
 				dest[0] = skips[0].second;
 				if (skips.size() > 1) {
 					dest[1] = skips[1].second;
+				} else {
+					// Avoid UMA
+					dest[1] = skips[0].second;
 				}
 				return interp.template Extract<INPUT_TYPE, RESULT_TYPE>(dest.data(), result);
 			} catch (const duckdb_skiplistlib::skip_list::IndexError &idx_err) {

diff --git a/scripts/generate_extensions_function.py b/scripts/generate_extensions_function.py
@@ -742,6 +742,7 @@ def write_header(data: ExtensionData):
 }; // EXTENSION_SECRET_PROVIDERS
 
 static constexpr const char *AUTOLOADABLE_EXTENSIONS[] = {
+    "avro",
     "aws",
     "azure",
     "autocomplete",

diff --git a/src/common/types/row/tuple_data_segment.cpp b/src/common/types/row/tuple_data_segment.cpp
@@ -15,23 +15,23 @@ void TupleDataChunkPart::SetHeapEmpty() {
 	base_heap_ptr = nullptr;
 }
 
-void SwapTupleDataChunkPart(TupleDataChunkPart &a, TupleDataChunkPart &b) {
-	std::swap(a.row_block_index, b.row_block_index);
-	std::swap(a.row_block_offset, b.row_block_offset);
-	std::swap(a.heap_block_index, b.heap_block_index);
-	std::swap(a.heap_block_offset, b.heap_block_offset);
-	std::swap(a.base_heap_ptr, b.base_heap_ptr);
-	std::swap(a.total_heap_size, b.total_heap_size);
-	std::swap(a.count, b.count);
+void MoveTupleDataChunkPart(TupleDataChunkPart &a, TupleDataChunkPart &b) {
+	a.row_block_index = b.row_block_index;
+	a.row_block_offset = b.row_block_offset;
+	a.heap_block_index = b.heap_block_index;
+	a.heap_block_offset = b.heap_block_offset;
+	a.base_heap_ptr = b.base_heap_ptr;
+	a.total_heap_size = b.total_heap_size;
+	a.count = b.count;
 	std::swap(a.lock, b.lock);
 }
 
 TupleDataChunkPart::TupleDataChunkPart(TupleDataChunkPart &&other) noexcept : lock((other.lock)) {
-	SwapTupleDataChunkPart(*this, other);
+	MoveTupleDataChunkPart(*this, other);
 }
 
 TupleDataChunkPart &TupleDataChunkPart::operator=(TupleDataChunkPart &&other) noexcept {
-	SwapTupleDataChunkPart(*this, other);
+	MoveTupleDataChunkPart(*this, other);
 	return *this;
 }