Skip to content

Update vendor script disabling jemalloc (main) #699

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

Merged
staticlibs merged 1 commit into from
Jun 10, 2026
Merged

Update vendor script disabling jemalloc (main) #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 0 additions & 14 deletions CMakeLists.txt.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,12 @@ endif()
set(DUCKDB_INCLUDE_DIRS
${INCLUDES})

set(JEMALLOC_INCLUDE_DIRS
${JEMALLOC_INCLUDES})

set(DUCKDB_DEFINITIONS
${DEFINES})

set(DUCKDB_SRC_FILES
${SOURCES})

set(JEMALLOC_SRC_FILES
${JEMALLOC_SOURCES})


# a few OS-specific variables

Expand Down Expand Up @@ -102,10 +96,7 @@ add_jar(duckdb_jdbc_tests ${JAVA_TEST_FILES} INCLUDE_JARS duckdb_jdbc_nolib)
# main shared lib compilation

if(MSVC OR ZOS)
list(APPEND DUCKDB_INCLUDE_DIRS src/stubs)
list(APPEND DUCKDB_SRC_FILES duckdb_java.def)
else()
list(APPEND DUCKDB_SRC_FILES ${JEMALLOC_SRC_FILES})
endif()

add_library(duckdb_java SHARED
Expand Down Expand Up @@ -135,11 +126,6 @@ target_include_directories(duckdb_java PRIVATE
${JAVA_INCLUDE_PATH2}
${DUCKDB_INCLUDE_DIRS})

if (NOT MSVC AND NOT ZOS)
target_include_directories(duckdb_java PRIVATE
${JEMALLOC_INCLUDE_DIRS})
endif()

target_link_libraries(duckdb_java PRIVATE
duckdb-native
${CMAKE_DL_LIBS})
Expand Down
18 changes: 0 additions & 18 deletions src/stubs/jemalloc_extension.hpp
View file
Open in desktop

This file was deleted.

23 changes: 4 additions & 19 deletions vendor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

# list of extensions to bundle, we include jemalloc here to have its
# files copied along with all other sources
extensions = ['core_functions', 'parquet', 'icu', 'json', 'jemalloc']
extensions = ['core_functions', 'parquet', 'icu', 'json']

# path to target
basedir = os.getcwd()
Expand All @@ -27,33 +27,20 @@
sys.path.append(scripts_dir)
import package_build

defines = ['DUCKDB_EXTENSION_{}_LINKED'.format(ext.upper()) for ext in extensions if ext != 'jemalloc']
defines = ['DUCKDB_EXTENSION_{}_LINKED'.format(ext.upper()) for ext in extensions]

# fresh build - copy over all of the files
(source_list, include_list, original_sources) = package_build.build_package(target_dir, extensions, False)

# process jemalloc separately with its own CMake vars
jemalloc_include_files = []
jemalloc_include_list = []
jemalloc_source_list = []
jemalloc_dir = os.path.join(args.duckdb, 'extension', 'jemalloc')
package_build.include_package('jemalloc', jemalloc_dir, jemalloc_include_files, jemalloc_include_list, jemalloc_source_list)
jemalloc_source_list = [os.path.join('duckdb', x) for x in jemalloc_source_list]

source_list = [os.path.relpath(x, basedir) if os.path.isabs(x) else os.path.join('src', x)
for x in source_list if x not in jemalloc_source_list]
jemalloc_source_list = [os.path.relpath(x, basedir) if os.path.isabs(x) else os.path.join('src', x)
for x in jemalloc_source_list]
include_list = [os.path.join('src', 'duckdb', x) for x in include_list if x not in jemalloc_include_list]
jemalloc_include_list = [os.path.join('src', 'duckdb', x) for x in jemalloc_include_list]
for x in source_list]
include_list = [os.path.join('src', 'duckdb', x) for x in include_list]

def sanitize_path(x):
return x.replace('\\', '/')

source_list = [sanitize_path(x) for x in source_list]
jemalloc_source_list = [sanitize_path(x) for x in jemalloc_source_list]
include_list = [sanitize_path(x) for x in include_list]
jemalloc_include_list = [sanitize_path(x) for x in jemalloc_include_list]

os.chdir(basedir)

Expand All @@ -64,9 +51,7 @@ def replace_entries(cmake, replacement_map):
cmake.replace()

cmake = cmake.replace('${SOURCES}', '\n '.join(source_list))
cmake = cmake.replace('${JEMALLOC_SOURCES}', '\n '.join(jemalloc_source_list))
cmake = cmake.replace('${INCLUDES}', '\n '.join(include_list))
cmake = cmake.replace('${JEMALLOC_INCLUDES}', '\n '.join(jemalloc_include_list))
cmake = cmake.replace('${DEFINES}', '\n '.join(['-D'+x for x in defines]))

with open('CMakeLists.txt', 'w+') as f:
Expand Down
Loading