Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@
[submodule "storage/columnstore/columnstore"]
path = storage/columnstore/columnstore
url = https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
[submodule "storage/duckdb/duckdb"]
path = storage/duckdb/duckdb
url = https://github.com/drrtuy/duckdb-engine
8 changes: 8 additions & 0 deletions cmake/make_dist.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,14 @@ IF(GIT_EXECUTABLE)
IF(NOT RESULT EQUAL 0)
SET(GIT_EXECUTABLE)
ENDIF()
EXECUTE_PROCESS(
COMMAND "${GIT_EXECUTABLE}" submodule foreach "${GIT_EXECUTABLE} checkout-index --all --prefix=${PACKAGE_DIR}/storage/duckdb/duckdb/$path/"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/storage/duckdb/duckdb
RESULT_VARIABLE RESULT
)
IF(NOT RESULT EQUAL 0)
SET(GIT_EXECUTABLE)
ENDIF()
ENDIF()

CONFIGURE_FILE(${CMAKE_BINARY_DIR}/include/source_revision.h
Expand Down
11 changes: 11 additions & 0 deletions debian/autobake-deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,17 @@ then
fi
fi

# Enable DuckDB storage engine plugin packaging
if [[ -d storage/duckdb/duckdb/debian ]]
then
if [[ ! -f debian/mariadb-plugin-duckdb.install ]]
then
cp -v storage/duckdb/duckdb/debian/mariadb-plugin-duckdb.* debian/
echo >> debian/control
cat storage/duckdb/duckdb/debian/control >> debian/control
fi
fi

if [ -n "${AUTOBAKE_PREP_CONTROL_RULES_ONLY:-}" ]
then
exit 0
Expand Down
27 changes: 27 additions & 0 deletions storage/duckdb/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
IF(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/duckdb/CMakeLists.txt)
return()
ENDIF()

IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
return()
ENDIF()

IF(NOT (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR
CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64"))
return()
ENDIF()

# libduckdb_bundle.a is built without debug STL wrappers.
# Mismatched _GLIBCXX_DEBUG changes sizeof(std::vector) → SIGSEGV.
SET(CMAKE_CXX_FLAGS_DEBUG
"${CMAKE_CXX_FLAGS_DEBUG} -U_GLIBCXX_DEBUG -U_GLIBCXX_ASSERTIONS")

add_subdirectory(duckdb)

IF(TARGET duckdb)
# MTR discovers plugins at storage/<name>/, not storage/<name>/<submodule>/
SET_TARGET_PROPERTIES(duckdb PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
INSTALL_MYSQL_TEST("${CMAKE_CURRENT_SOURCE_DIR}/duckdb/mysql-test/"
"plugin/duckdb")
ENDIF()
Loading
Loading