Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bundle jemalloc #133

Merged
merged 5 commits into from
Jan 31, 2025
Merged

Bundle jemalloc #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
507d173
add jemalloc
lnkuiper Jan 21, 2025
e8acd91
Merge branch 'main' into jemalloc
lnkuiper Jan 27, 2025
2a4aafb
set correct clang format version
lnkuiper Jan 27, 2025
6f96eef
double equals
lnkuiper Jan 27, 2025
2be02c1
multi-line run
lnkuiper Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/Java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 10 additions & 0 deletions vendor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import sys
import json
import pickle
import platform
import argparse

parser = argparse.ArgumentParser(description='Inlines DuckDB Sources')
Expand All @@ -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')
Expand Down
Loading