Skip to content

Converge #146

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

Closed
liunyl wants to merge 10 commits into from
Closed

Converge #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bf028d7
converge restructure
liunyl Oct 18, 2025
c2cb84d
fix incorrect compile macro
liunyl Oct 20, 2025
e0265af
move data substrate init after mysql init
liunyl Oct 21, 2025
f0a77a2
rename eloq files, add build as lib option
liunyl Oct 22, 2025
ca5aab8
Override cmake source dir with my source dir
liunyl Oct 22, 2025
8f7b657
update latest submodule
liunyl Oct 23, 2025
302c4ce
fix shutdown crash
liunyl Oct 23, 2025
0be9c6a
rename tx service to data_substrate
liunyl Oct 24, 2025
9a8370c
update build and pr script
liunyl Oct 24, 2025
f5fb5aa
fix mtr compatible issue
liunyl Nov 4, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,7 @@ compile_commands.json

# Visual Studio Code workspace
.vscode/
.cursor/

# Clion && other JetBrains ides
/.idea/
Expand Down
16 changes: 8 additions & 8 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
[submodule "storage/columnstore/columnstore"]
path = storage/columnstore/columnstore
url = https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
[submodule "storage/eloq/eloq_metrics"]
path = storage/eloq/eloq_metrics
[submodule "data_substrate/eloq_metrics"]
path = data_substrate/eloq_metrics
url = https://github.com/eloqdata/eloq-metrics.git
[submodule "storage/eloq/tx_service"]
path = storage/eloq/tx_service
[submodule "data_substrate/tx_service"]
path = data_substrate
Comment on lines +23 to +24
Copy link

@coderabbitai coderabbitai bot Oct 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

Critical: Submodule path mismatch.

The submodule is named data_substrate/tx_service but the path is set to just data_substrate. This inconsistency will cause the tx_service repository to be checked out at the data_substrate directory root, which conflicts with other submodules (eloq_metrics, store_handler, log_service) that use data_substrate/* as their paths.

Apply this diff to fix the path:

 [submodule "data_substrate/tx_service"]
-	path = data_substrate
+	path = data_substrate/tx_service
 	url = https://github.com/eloqdata/tx_service.git
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
[submodule "data_substrate/tx_service"]
path = data_substrate
[submodule "data_substrate/tx_service"]
path = data_substrate/tx_service
🤖 Prompt for AI Agents 
In .gitmodules around lines 23-24, the submodule declaration name is
"data_substrate/tx_service" but the path is incorrectly set to "data_substrate";
update the path to "data_substrate/tx_service" so the submodule is checked out
into its own directory (data_substrate/tx_service) and no longer conflicts with
other data_substrate/* submodules; ensure the path value exactly matches the
submodule name.

url = https://github.com/eloqdata/tx_service.git
[submodule "storage/eloq/store_handler"]
path = storage/eloq/store_handler
[submodule "data_substrate/store_handler"]
path = data_substrate/store_handler
url = https://github.com/eloqdata/store_handler.git
[submodule "storage/eloq/log_service"]
path = storage/eloq/log_service
[submodule "data_substrate/log_service"]
path = data_substrate/log_service
url = https://github.com/eloqdata/log_service.git
Comment on lines +20 to 31
Copy link

@coderabbitai coderabbitai bot Oct 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

Verify submodule paths are correctly initialized.

After fixing the tx_service path issue, ensure all submodules are properly initialized and checked out to the correct locations.

Run the following script to verify submodule configuration:

🏁 Script executed:

#!/bin/bash
# Verify that submodule paths don't conflict and exist in the expected locations

echo "=== Checking submodule configuration ==="
git config --file .gitmodules --get-regexp 'submodule\.data_substrate.*\.(path|url)'

echo ""
echo "=== Verifying no path conflicts ==="
# Check if any two submodules share the same path
git config --file .gitmodules --get-regexp 'submodule\..*\.path' | \
  awk '{print $2}' | sort | uniq -d | \
  while read -r duplicate; do
    echo "ERROR: Duplicate path found: $duplicate"
  done

echo ""
echo "=== Checking if submodule directories exist ==="
for submodule in data_substrate/eloq_metrics data_substrate/tx_service data_substrate/store_handler data_substrate/log_service; do
  if [ -d "$submodule" ]; then
    echo "✓ $submodule exists"
  else
    echo "✗ $submodule does not exist"
  fi
done

Length of output: 917

Fix tx_service submodule path configuration.

The verification confirms a critical submodule path conflict:

  • data_substrate/tx_service submodule is configured with path data_substrate (the parent directory)
  • Other submodules (eloq_metrics, store_handler, log_service) are configured as subdirectories of data_substrate

This creates a structural conflict. The tx_service path should be data_substrate/tx_service to match the naming convention and avoid conflicts with sibling submodules.

Update .gitmodules line 25 to:

path = data_substrate/tx_service
🤖 Prompt for AI Agents 
In .gitmodules around lines 20 to 31, the tx_service submodule is incorrectly
set with path = data_substrate which conflicts with sibling submodules; change
that entry so the tx_service submodule's path is data_substrate/tx_service
(i.e., update line 25 to path = data_substrate/tx_service), then run git
submodule sync and git submodule update --init --recursive to apply and fetch
the corrected submodule mapping.

66 changes: 42 additions & 24 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,16 @@ FOREACH(p CMP0022 CMP0046 CMP0040 CMP0048 CMP0054 CMP0075 CMP0069 CMP0135)
ENDFOREACH()

MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
# Option to build as library for converged binary
option(BUILD_ELOQSQL_AS_LIBRARY "Build eloqsql as library instead of executable" OFF)

# IF(BUILD_ELOQSQL_AS_LIBRARY)
SET(ELOQSQL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
SET(ELOQSQL_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
# ENDIF()

SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR}/cmake/Internal/CPack)
${ELOQSQL_SOURCE_DIR}/cmake ${ELOQSQL_SOURCE_DIR}/cmake/Internal/CPack)

# Use a default manufacturer if no manufacturer was identified.
IF(NOT DEFINED MANUFACTURER)
Expand Down Expand Up @@ -98,9 +105,10 @@ SET(CPACK_PACKAGE_NAME "MariaDB")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MariaDB: a very fast and robust SQL database server")
SET(CPACK_PACKAGE_URL "http://mariadb.org")

option(WITH_DYNAMO_DB "With DynamoDB" OFF)
IF(BUILD_CONFIG)
INCLUDE(
${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake)
${ELOQSQL_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake)
ENDIF()

# Include the platform-specific file. To allow exceptions, this code
Expand All @@ -113,7 +121,7 @@ FOREACH(_base
${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_VERSION}-${CMAKE_SYSTEM_PROCESSOR}
${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_VERSION}
${CMAKE_SYSTEM_NAME})
SET(_file ${CMAKE_SOURCE_DIR}/cmake/os/${_base}.cmake)
SET(_file ${ELOQSQL_SOURCE_DIR}/cmake/os/${_base}.cmake)
IF(EXISTS ${_file})
INCLUDE(${_file})
BREAK()
Expand Down Expand Up @@ -450,10 +458,21 @@ INCLUDE(cpack_deb)

SET(PYTHON_SHEBANG "/usr/bin/env python3" CACHE STRING "python shebang")
MARK_AS_ADVANCED(PYTHON_SHEBANG)

# Add storage engines and plugins.
CONFIGURE_PLUGINS()

add_compile_definitions(ELOQ_MODULE_ELOQSQL)
# Build data substrate library first (before sql/ and storage/)
if(NOT BUILD_ELOQSQL_AS_LIBRARY)
# Build data substrate library first (standalone mode)
ADD_SUBDIRECTORY(data_substrate)
else()
# Use parent data_substrate (converged mode)
message(STATUS "EloqSQL: Using parent data_substrate")
# When building as library, mysqld will NOT initialize data substrate
# It will use synchronization with converged main instead
add_compile_definitions(MYSQLD_LIBRARY_MODE)
endif()
ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(dbug)
ADD_SUBDIRECTORY(strings)
Expand Down Expand Up @@ -505,15 +524,15 @@ IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
ENDIF()
# minimal target to build only binaries for export
ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED})
EXPORT(TARGETS ${EXPORTED} FILE ${CMAKE_BINARY_DIR}/import_executables.cmake)
EXPORT(TARGETS ${EXPORTED} FILE ${ELOQSQL_BINARY_DIR}/import_executables.cmake)
ENDIF()

CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h)
CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h)
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in
${CMAKE_BINARY_DIR}/include/mysql_version.h )
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in
${CMAKE_BINARY_DIR}/sql/sql_builtin.cc)
CONFIGURE_FILE(config.h.cmake ${ELOQSQL_BINARY_DIR}/include/my_config.h)
CONFIGURE_FILE(config.h.cmake ${ELOQSQL_BINARY_DIR}/include/config.h)
CONFIGURE_FILE(${ELOQSQL_SOURCE_DIR}/include/mysql_version.h.in
${ELOQSQL_BINARY_DIR}/include/mysql_version.h )
CONFIGURE_FILE(${ELOQSQL_SOURCE_DIR}/sql/sql_builtin.cc.in
${ELOQSQL_BINARY_DIR}/sql/sql_builtin.cc)

IF(GIT_EXECUTABLE AND EXISTS ${PROJECT_SOURCE_DIR}/.git)
EXECUTE_PROCESS(
Expand All @@ -531,30 +550,30 @@ IF(SOURCE_REVISION OR
ENDIF()

CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in
${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
${ELOQSQL_SOURCE_DIR}/cmake/info_macros.cmake.in
${ELOQSQL_BINARY_DIR}/info_macros.cmake @ONLY)

# Handle the "INFO_*" files.
INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake)
INCLUDE(${ELOQSQL_BINARY_DIR}/info_macros.cmake)
# Source: This can be done during the cmake phase, all information is
# available, but should be repeated on each "make" just in case someone
# does "cmake ; make ; git pull ; make".
CREATE_INFO_SRC(${CMAKE_BINARY_DIR}/Docs)
CREATE_INFO_SRC(${ELOQSQL_BINARY_DIR}/Docs)
ADD_CUSTOM_TARGET(INFO_SRC ALL
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/info_src.cmake
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -P ${ELOQSQL_SOURCE_DIR}/cmake/info_src.cmake
WORKING_DIRECTORY ${ELOQSQL_BINARY_DIR}
)
# Build flags: This must be postponed to the make phase.
ADD_CUSTOM_TARGET(INFO_BIN ALL
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/info_bin.cmake
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -P ${ELOQSQL_SOURCE_DIR}/cmake/info_bin.cmake
WORKING_DIRECTORY ${ELOQSQL_BINARY_DIR}
)

INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme)

# MDEV-6526 these files are not installed anymore
#INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
# ${CMAKE_BINARY_DIR}/Docs/INFO_BIN)
#INSTALL_DOCUMENTATION(${ELOQSQL_BINARY_DIR}/Docs/INFO_SRC
# ${ELOQSQL_BINARY_DIR}/Docs/INFO_BIN)

IF(UNIX)
INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
Expand Down Expand Up @@ -583,7 +602,7 @@ IF(NON_DISTRIBUTABLE_WARNING)
You have linked MariaDB with ${NON_DISTRIBUTABLE_WARNING} libraries! You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with the Free Software Foundation.")
ENDIF()

IF(NOT WITHOUT_SERVER)
IF(NOT WITHOUT_SERVER AND NOT BUILD_ELOQSQL_AS_LIBRARY)
# Define target for minimal mtr-testable build
ADD_CUSTOM_TARGET(minbuild)
ADD_DEPENDENCIES(minbuild
Expand Down Expand Up @@ -617,8 +636,7 @@ IF(NOT WITHOUT_SERVER)
ENDIF()
ADD_CUSTOM_TARGET(smoketest
COMMAND perl ./mysql-test-run.pl main.1st
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/mysql-test)
WORKING_DIRECTORY ${ELOQSQL_BINARY_DIR}/mysql-test)
ADD_DEPENDENCIES(smoketest minbuild)
ENDIF()

option(WITH_DYNAMO_DB "With DynamoDB" OFF)
22 changes: 11 additions & 11 deletions client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA

INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/include
${ELOQSQL_SOURCE_DIR}/include
${PCRE_INCLUDES}
${CMAKE_SOURCE_DIR}/mysys_ssl
${ELOQSQL_SOURCE_DIR}/mysys_ssl
${ZLIB_INCLUDE_DIR}
${SSL_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/sql
${CMAKE_SOURCE_DIR}/strings
${ELOQSQL_SOURCE_DIR}/sql
${ELOQSQL_SOURCE_DIR}/strings
${MY_READLINE_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)

INCLUDE_DIRECTORIES(BEFORE
${CMAKE_BINARY_DIR}/libmariadb/include
${CMAKE_SOURCE_DIR}/libmariadb/include)
${ELOQSQL_BINARY_DIR}/libmariadb/include
${ELOQSQL_SOURCE_DIR}/libmariadb/include)

## We will need libeay32.dll and ssleay32.dll when running client executables.
COPY_OPENSSL_DLLS(copy_openssl_client)
Expand All @@ -37,18 +37,18 @@ SET(CLIENT_LIB mariadbclient mysys)

ADD_DEFINITIONS(${SSL_DEFINES})
MYSQL_ADD_EXECUTABLE(mariadb completion_hash.cc mysql.cc readline.cc
${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
${ELOQSQL_SOURCE_DIR}/sql/sql_string.cc)
TARGET_LINK_LIBRARIES(mariadb ${CLIENT_LIB})
IF(UNIX)
TARGET_LINK_LIBRARIES(mariadb ${MY_READLINE_LIBRARY})
SET_TARGET_PROPERTIES(mariadb PROPERTIES ENABLE_EXPORTS TRUE)
ENDIF(UNIX)

IF(PLUGIN_ELOQ)
# IF(PLUGIN_ELOQ)
ADD_DEFINITIONS(-DWITH_ELOQ_STORAGE_ENGINE)
ENDIF()
# ENDIF()

Comment on lines +47 to 50
Copy link

@coderabbitai coderabbitai bot Oct 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Unconditional -DWITH_ELOQ_STORAGE_ENGINE define changes client semantics; gate it.

This define was previously conditional. Making it unconditional may affect all client binaries.

Apply:

-# IF(PLUGIN_ELOQ)
-  ADD_DEFINITIONS(-DWITH_ELOQ_STORAGE_ENGINE)
-# ENDIF()
+IF(PLUGIN_ELOQ)
+  ADD_DEFINITIONS(-DWITH_ELOQ_STORAGE_ENGINE)
+ENDIF()

If PLUGIN_ELOQ is no longer available, consider introducing an option(WITH_ELOQ_STORAGE_ENGINE OFF) to keep behavior controllable.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
# IF(PLUGIN_ELOQ)
ADD_DEFINITIONS(-DWITH_ELOQ_STORAGE_ENGINE)
ENDIF()
# ENDIF()
IF(PLUGIN_ELOQ)
ADD_DEFINITIONS(-DWITH_ELOQ_STORAGE_ENGINE)
ENDIF()
🤖 Prompt for AI Agents 
In client/CMakeLists.txt around lines 47 to 50, the -DWITH_ELOQ_STORAGE_ENGINE
define is being applied unconditionally which changes client semantics; restore
gating by making the define conditional: add an option(WITH_ELOQ_STORAGE_ENGINE
OFF) at top (or re-check PLUGIN_ELOQ if that variable still exists) and wrap the
ADD_DEFINITIONS(-DWITH_ELOQ_STORAGE_ENGINE) in an IF(WITH_ELOQ_STORAGE_ENGINE)
... ENDIF() so the define is only added when explicitly enabled.

MYSQL_ADD_EXECUTABLE(mariadb-test mysqltest.cc ${CMAKE_SOURCE_DIR}/sql/sql_string.cc COMPONENT Test)
MYSQL_ADD_EXECUTABLE(mariadb-test mysqltest.cc ${ELOQSQL_SOURCE_DIR}/sql/sql_string.cc COMPONENT Test)
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS ${PCRE2_DEBIAN_HACK}")
TARGET_LINK_LIBRARIES(mariadb-test ${CLIENT_LIB} pcre2-posix pcre2-8)
SET_TARGET_PROPERTIES(mariadb-test PROPERTIES ENABLE_EXPORTS TRUE)
Expand Down Expand Up @@ -85,7 +85,7 @@ SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mariadb-slap ${CLIENT_LIB})

MYSQL_ADD_EXECUTABLE(mariadb-conv mariadb-conv.cc
${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
${ELOQSQL_SOURCE_DIR}/sql/sql_string.cc)
TARGET_LINK_LIBRARIES(mariadb-conv mysys strings)

IF(WIN32)
Expand Down
40 changes: 20 additions & 20 deletions cmake/abi_check.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,47 +36,47 @@ IF(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang" AND RUN_ABI_CHECK)
SET(COMPILER ${CMAKE_C_COMPILER})
ENDIF()
SET(API_PREPROCESSOR_HEADER
${CMAKE_SOURCE_DIR}/include/mysql/plugin_audit.h
${CMAKE_SOURCE_DIR}/include/mysql/plugin_ftparser.h
${CMAKE_SOURCE_DIR}/include/mysql.h
${CMAKE_SOURCE_DIR}/include/mysql/psi/psi_abi_v1.h
${CMAKE_SOURCE_DIR}/include/mysql/psi/psi_abi_v2.h
${CMAKE_SOURCE_DIR}/include/mysql/client_plugin.h
${CMAKE_SOURCE_DIR}/include/mysql/plugin_auth.h
${CMAKE_SOURCE_DIR}/include/mysql/plugin_password_validation.h
${CMAKE_SOURCE_DIR}/include/mysql/plugin_encryption.h
${CMAKE_SOURCE_DIR}/include/mysql/plugin_data_type.h
${CMAKE_SOURCE_DIR}/include/mysql/plugin_function.h
${ELOQSQL_SOURCE_DIR}/include/mysql/plugin_audit.h
${ELOQSQL_SOURCE_DIR}/include/mysql/plugin_ftparser.h
${ELOQSQL_SOURCE_DIR}/include/mysql.h
${ELOQSQL_SOURCE_DIR}/include/mysql/psi/psi_abi_v1.h
${ELOQSQL_SOURCE_DIR}/include/mysql/psi/psi_abi_v2.h
${ELOQSQL_SOURCE_DIR}/include/mysql/client_plugin.h
${ELOQSQL_SOURCE_DIR}/include/mysql/plugin_auth.h
${ELOQSQL_SOURCE_DIR}/include/mysql/plugin_password_validation.h
${ELOQSQL_SOURCE_DIR}/include/mysql/plugin_encryption.h
${ELOQSQL_SOURCE_DIR}/include/mysql/plugin_data_type.h
${ELOQSQL_SOURCE_DIR}/include/mysql/plugin_function.h
)

ADD_CUSTOM_TARGET(abi_check ALL
COMMAND ${CMAKE_COMMAND}
-DCOMPILER=${COMPILER}
-DSOURCE_DIR=${CMAKE_SOURCE_DIR}
-DBINARY_DIR=${CMAKE_BINARY_DIR}
-DSOURCE_DIR=${ELOQSQL_SOURCE_DIR}
-DBINARY_DIR=${ELOQSQL_BINARY_DIR}
"-DABI_HEADERS=${API_PREPROCESSOR_HEADER}"
-P ${CMAKE_SOURCE_DIR}/cmake/do_abi_check.cmake
-P ${ELOQSQL_SOURCE_DIR}/cmake/do_abi_check.cmake
VERBATIM
)

ADD_CUSTOM_TARGET(abi_update
COMMAND ${CMAKE_COMMAND}
-DCOMPILER=${COMPILER}
-DABI_UPDATE=1
-DSOURCE_DIR=${CMAKE_SOURCE_DIR}
-DBINARY_DIR=${CMAKE_BINARY_DIR}
-DSOURCE_DIR=${ELOQSQL_SOURCE_DIR}
-DBINARY_DIR=${ELOQSQL_BINARY_DIR}
"-DABI_HEADERS=${API_PREPROCESSOR_HEADER}"
-P ${CMAKE_SOURCE_DIR}/cmake/do_abi_check.cmake
-P ${ELOQSQL_SOURCE_DIR}/cmake/do_abi_check.cmake
VERBATIM
)

ADD_CUSTOM_TARGET(abi_check_all
COMMAND ${CMAKE_COMMAND}
-DCOMPILER=${COMPILER}
-DSOURCE_DIR=${CMAKE_SOURCE_DIR}
-DBINARY_DIR=${CMAKE_BINARY_DIR}
-DSOURCE_DIR=${ELOQSQL_SOURCE_DIR}
-DBINARY_DIR=${ELOQSQL_BINARY_DIR}
"-DABI_HEADERS=${API_PREPROCESSOR_HEADER}"
-P ${CMAKE_SOURCE_DIR}/cmake/do_abi_check.cmake
-P ${ELOQSQL_SOURCE_DIR}/cmake/do_abi_check.cmake
VERBATIM
)
ENDIF()
Expand Down
2 changes: 1 addition & 1 deletion cmake/build_configurations/mysql_release.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ SET(WITH_INNODB_SNAPPY OFF CACHE STRING "")
SET(WITH_NUMA 0 CACHE BOOL "")
SET(CPU_LEVEL1_DCACHE_LINESIZE 0)

IF(NOT EXISTS ${CMAKE_SOURCE_DIR}/.git)
IF(NOT EXISTS ${ELOQSQL_SOURCE_DIR}/.git)
SET(GIT_EXECUTABLE GIT_EXECUTABLE-NOTFOUND CACHE FILEPATH "")
ENDIF()

Expand Down
4 changes: 2 additions & 2 deletions cmake/cpack_deb.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ FUNCTION(SET_PLUGIN_DEB_VERSION plugin ver)
STRING(REPLACE "_" "-" plugin ${plugin})
STRING(REPLACE "-" "." serverver ${SERVER_VERSION})
STRING(REPLACE ${SERVER_VERSION} ${serverver} ver ${ver})
FILE(READ ${CMAKE_SOURCE_DIR}/debian/changelog changelog)
FILE(READ ${ELOQSQL_SOURCE_DIR}/debian/changelog changelog)
STRING(REPLACE ${serverver} ${ver} changelog "${changelog}")
FILE(WRITE ${CMAKE_SOURCE_DIR}/debian/mariadb-plugin-${plugin}.changelog "${changelog}")
FILE(WRITE ${ELOQSQL_SOURCE_DIR}/debian/mariadb-plugin-${plugin}.changelog "${changelog}")
ENDFUNCTION()

ELSE(DEB)
Expand Down
32 changes: 16 additions & 16 deletions cmake/cpack_rpm.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,15 +228,15 @@ IF(WITH_WSREP)
"coreutils" "findutils" "tar")
ENDIF()

SET(CPACK_RPM_server_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-prein.sh)
SET(CPACK_RPM_server_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-preun.sh)
SET(CPACK_RPM_server_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-postin.sh)
SET(CPACK_RPM_server_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-postun.sh)
SET(CPACK_RPM_server_POST_TRANS_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-posttrans.sh)
SET(CPACK_RPM_shared_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/shared-post.sh)
SET(CPACK_RPM_shared_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/shared-post.sh)
SET(CPACK_RPM_compat_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/shared-post.sh)
SET(CPACK_RPM_compat_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/shared-post.sh)
SET(CPACK_RPM_server_PRE_INSTALL_SCRIPT_FILE ${ELOQSQL_SOURCE_DIR}/support-files/rpm/server-prein.sh)
SET(CPACK_RPM_server_PRE_UNINSTALL_SCRIPT_FILE ${ELOQSQL_SOURCE_DIR}/support-files/rpm/server-preun.sh)
SET(CPACK_RPM_server_POST_INSTALL_SCRIPT_FILE ${ELOQSQL_SOURCE_DIR}/support-files/rpm/server-postin.sh)
SET(CPACK_RPM_server_POST_UNINSTALL_SCRIPT_FILE ${ELOQSQL_SOURCE_DIR}/support-files/rpm/server-postun.sh)
SET(CPACK_RPM_server_POST_TRANS_SCRIPT_FILE ${ELOQSQL_SOURCE_DIR}/support-files/rpm/server-posttrans.sh)
SET(CPACK_RPM_shared_POST_INSTALL_SCRIPT_FILE ${ELOQSQL_SOURCE_DIR}/support-files/rpm/shared-post.sh)
SET(CPACK_RPM_shared_POST_UNINSTALL_SCRIPT_FILE ${ELOQSQL_SOURCE_DIR}/support-files/rpm/shared-post.sh)
SET(CPACK_RPM_compat_POST_INSTALL_SCRIPT_FILE ${ELOQSQL_SOURCE_DIR}/support-files/rpm/shared-post.sh)
SET(CPACK_RPM_compat_POST_UNINSTALL_SCRIPT_FILE ${ELOQSQL_SOURCE_DIR}/support-files/rpm/shared-post.sh)

MACRO(ALTERNATIVE_NAME real alt)
IF(${ARGC} GREATER 2)
Expand Down Expand Up @@ -303,15 +303,15 @@ SET(PYTHON_SHEBANG "/usr/bin/python3" CACHE STRING "python shebang")

# If we want to build build MariaDB-shared-compat,
# extract compat libraries from MariaDB-shared-5.3 rpm
FILE(GLOB compat53 RELATIVE ${CMAKE_SOURCE_DIR}
"${CMAKE_SOURCE_DIR}/../MariaDB-shared-5.3.*.rpm")
FILE(GLOB compat101 RELATIVE ${CMAKE_SOURCE_DIR}
"${CMAKE_SOURCE_DIR}/../MariaDB-shared-10.1.*.rpm")
FILE(GLOB compat53 RELATIVE ${ELOQSQL_SOURCE_DIR}
"${ELOQSQL_SOURCE_DIR}/../MariaDB-shared-5.3.*.rpm")
FILE(GLOB compat101 RELATIVE ${ELOQSQL_SOURCE_DIR}
"${ELOQSQL_SOURCE_DIR}/../MariaDB-shared-10.1.*.rpm")
IF(compat53 AND compat101)
FOREACH(compat_rpm "${compat53}" "${compat101}")
MESSAGE(STATUS "Using ${compat_rpm} to build MariaDB-compat")
INSTALL(CODE "EXECUTE_PROCESS(
COMMAND rpm2cpio ${CMAKE_SOURCE_DIR}/${compat_rpm}
COMMAND rpm2cpio ${ELOQSQL_SOURCE_DIR}/${compat_rpm}
COMMAND cpio --extract --make-directories */libmysqlclient*.so.* -
WORKING_DIRECTORY \$ENV{DESTDIR})
EXECUTE_PROCESS(
Expand All @@ -321,11 +321,11 @@ IF(compat53 AND compat101)
ENDFOREACH()

EXECUTE_PROCESS(
COMMAND rpm -q --provides -p "${CMAKE_SOURCE_DIR}/${compat101}"
COMMAND rpm -q --provides -p "${ELOQSQL_SOURCE_DIR}/${compat101}"
ERROR_QUIET
OUTPUT_VARIABLE compat_provides)
EXECUTE_PROCESS(
COMMAND rpm -q --obsoletes -p "${CMAKE_SOURCE_DIR}/${compat101}"
COMMAND rpm -q --obsoletes -p "${ELOQSQL_SOURCE_DIR}/${compat101}"
ERROR_QUIET
OUTPUT_VARIABLE compat_obsoletes)

Expand Down
4 changes: 2 additions & 2 deletions cmake/ctest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ ENDMACRO()
MACRO(MY_ADD_TESTS)
CMAKE_PARSE_ARGUMENTS(ARG "" "EXT" "LINK_LIBRARIES" ${ARGN})

INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/unittest/mytap)
INCLUDE_DIRECTORIES(${ELOQSQL_SOURCE_DIR}/include
${ELOQSQL_SOURCE_DIR}/unittest/mytap)

IF (NOT ARG_EXT)
SET(ARG_EXT "c")
Expand Down
Loading