From 507d17306210d6f98f1e1e9da25e81bedcde8261 Mon Sep 17 00:00:00 2001 From: Laurens Kuiper Date: Tue, 21 Jan 2025 15:27:25 +0100 Subject: [PATCH 1/4] add jemalloc --- vendor.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/vendor.py b/vendor.py index c34a52e0..c95f2249 100644 --- a/vendor.py +++ b/vendor.py @@ -2,6 +2,7 @@ import sys import json import pickle +import platform import argparse parser = argparse.ArgumentParser(description='Inlines DuckDB Sources') @@ -17,6 +18,15 @@ # list of extensions to bundle extensions = ['core_functions', 'parquet', 'icu', 'json'] +# Conditionally include jemalloc +is_android = hasattr(sys, 'getandroidapilevel') +is_pyodide = 'PYODIDE' in os.environ +use_jemalloc = ( + not is_android and not is_pyodide and platform.system() == 'Linux' and platform.architecture()[0] == '64bit' +) +if use_jemalloc: + extensions.append('jemalloc') + # path to target basedir = os.getcwd() target_dir = os.path.join(basedir, 'src', 'duckdb') From 2a4aafb408e60a5e29a246848630d6a5c8af4702 Mon Sep 17 00:00:00 2001 From: Laurens Kuiper Date: Mon, 27 Jan 2025 12:07:36 +0100 Subject: [PATCH 2/4] set correct clang format version --- .github/workflows/Java.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Java.yml b/.github/workflows/Java.yml index 7db850fa..2f9c247e 100644 --- a/.github/workflows/Java.yml +++ b/.github/workflows/Java.yml @@ -20,7 +20,9 @@ jobs: fetch-depth: 0 ref: ${{ inputs.git_ref }} - - run: make format-check + - run: + python3 -m pip install --user clang_format=11.0.1 + make format-check java-linux-amd64: name: Java Linux (amd64) From 6f96eefe8c1b7c2c6f69c54c25b6dd5105d843c3 Mon Sep 17 00:00:00 2001 From: Laurens Kuiper Date: Mon, 27 Jan 2025 12:08:23 +0100 Subject: [PATCH 3/4] double equals --- .github/workflows/Java.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Java.yml b/.github/workflows/Java.yml index 2f9c247e..ae020337 100644 --- a/.github/workflows/Java.yml +++ b/.github/workflows/Java.yml @@ -21,7 +21,7 @@ jobs: ref: ${{ inputs.git_ref }} - run: - python3 -m pip install --user clang_format=11.0.1 + python3 -m pip install --user clang_format==11.0.1 make format-check java-linux-amd64: From 2be02c147ee9b8907110848c478dec9c2485de07 Mon Sep 17 00:00:00 2001 From: Laurens Kuiper Date: Mon, 27 Jan 2025 12:09:16 +0100 Subject: [PATCH 4/4] multi-line run --- .github/workflows/Java.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Java.yml b/.github/workflows/Java.yml index ae020337..950d109d 100644 --- a/.github/workflows/Java.yml +++ b/.github/workflows/Java.yml @@ -20,7 +20,7 @@ jobs: fetch-depth: 0 ref: ${{ inputs.git_ref }} - - run: + - run: | python3 -m pip install --user clang_format==11.0.1 make format-check