From 1c41fc52c04af07169b9c76892b3a70c9aa61a3c Mon Sep 17 00:00:00 2001 From: Leonid Fedorov Date: Fri, 23 May 2025 21:59:40 +0000 Subject: [PATCH] chore(build): massive removals, auto add files to debian install file --- cmake/ColumnstoreLibrary.cmake | 1 - debian/mariadb-plugin-columnstore.install | 28 +++++++++++------------ oam/oamcpp/CMakeLists.txt | 2 ++ 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/cmake/ColumnstoreLibrary.cmake b/cmake/ColumnstoreLibrary.cmake index 5d1271eee..18d69acad 100644 --- a/cmake/ColumnstoreLibrary.cmake +++ b/cmake/ColumnstoreLibrary.cmake @@ -88,7 +88,6 @@ macro(columnstore_library libname) else() columnstore_shared_library(${libname} ${ARGN}) endif() - endmacro() macro(columnstore_link libname) diff --git a/debian/mariadb-plugin-columnstore.install b/debian/mariadb-plugin-columnstore.install index 0efba1cf8..974e41889 100644 --- a/debian/mariadb-plugin-columnstore.install +++ b/debian/mariadb-plugin-columnstore.install @@ -3,47 +3,45 @@ etc/columnstore/ErrorMessage.txt etc/columnstore/MessageFile.txt etc/columnstore/storagemanager.cnf etc/mysql/mariadb.conf.d/columnstore.cnf -usr/bin/mcsRebuildEM -usr/bin/DDLProc -usr/bin/DMLProc -usr/bin/PrimProc -usr/bin/StorageManager -usr/bin/WriteEngineServer usr/bin/clearShm usr/bin/cleartablelock +usr/bin/columnstore_run.sh usr/bin/columnstore-post-install usr/bin/columnstore-pre-uninstall usr/bin/columnstoreDBWrite usr/bin/columnstoreSyslogSetup.sh -usr/bin/columnstore_run.sh usr/bin/colxml usr/bin/controllernode usr/bin/cpimport usr/bin/cpimport.bin usr/bin/cplogger -usr/bin/cspasswd usr/bin/cskeys +usr/bin/cspasswd usr/bin/dbbuilder usr/bin/dbrmctl usr/bin/ddlcleanup +usr/bin/DDLProc +usr/bin/DMLProc usr/bin/editem usr/bin/idbmeminfo usr/bin/load_brm usr/bin/loop_process_starter.sh usr/bin/mariadb-columnstore-start.sh usr/bin/mariadb-columnstore-stop.sh -usr/bin/mcs-savebrm.py -usr/bin/mcs-loadbrm.py -usr/bin/mcs-stop-controllernode.sh usr/bin/mcs-load-brm-from-file usr/bin/mcs-load-em -usr/bin/mcs-shmem-locks +usr/bin/mcs-loadbrm.py usr/bin/mcs-oid-client +usr/bin/mcs-savebrm.py +usr/bin/mcs-shmem-locks +usr/bin/mcs-stop-controllernode.sh usr/bin/mcsGetConfig +usr/bin/mcsRebuildEM usr/bin/mcsSetConfig usr/bin/mycnfUpgrade usr/bin/post-mysql-install usr/bin/post-mysqld-install +usr/bin/PrimProc usr/bin/reset_locks usr/bin/rollback usr/bin/save_brm @@ -53,9 +51,11 @@ usr/bin/smls usr/bin/smps usr/bin/smput usr/bin/smrm +usr/bin/StorageManager usr/bin/testS3Connection usr/bin/viewtablelock usr/bin/workernode +usr/bin/WriteEngineServer usr/lib/*/libbatchloader.so usr/lib/*/libbrm.so usr/lib/*/libcacheutils.so @@ -64,6 +64,7 @@ usr/lib/*/libcommon.so usr/lib/*/libcompress.so usr/lib/*/libconfigcpp.so usr/lib/*/libdataconvert.so +usr/lib/*/libdatatypes.so usr/lib/*/libddlcleanuputil.so usr/lib/*/libddlpackage.so usr/lib/*/libddlpackageproc.so @@ -90,7 +91,6 @@ usr/lib/*/libwindowfunction.so usr/lib/*/libwriteengine.so usr/lib/*/libwriteengineclient.so usr/lib/*/libwriteengineredistribute.so -usr/lib/*/libdatatypes.so usr/lib/mysql/plugin/ha_columnstore.so usr/lib/mysql/plugin/libregr_mysql.so usr/lib/mysql/plugin/libudf_mysql.so @@ -98,12 +98,12 @@ usr/sbin/install_mcs_mysql.sh usr/share/columnstore/calremoveuserpriority.sql usr/share/columnstore/calsetuserpriority.sql usr/share/columnstore/calshowprocesslist.sql +usr/share/columnstore/columnstore_info.sql usr/share/columnstore/columnstoreAlias usr/share/columnstore/columnstoreLogRotate usr/share/columnstore/columnstoreSyslog usr/share/columnstore/columnstoreSyslog-ng usr/share/columnstore/columnstoreSyslog7 -usr/share/columnstore/columnstore_info.sql usr/share/columnstore/dumpcat_mysql.sql usr/share/columnstore/gitversionEngine usr/share/columnstore/mariadb-columnstore.service diff --git a/oam/oamcpp/CMakeLists.txt b/oam/oamcpp/CMakeLists.txt index d5b4ac307..b705aa076 100644 --- a/oam/oamcpp/CMakeLists.txt +++ b/oam/oamcpp/CMakeLists.txt @@ -4,6 +4,8 @@ include_directories(${ENGINE_COMMON_INCLUDES}) set(oamcpp_LIB_SRCS liboamcpp.cpp oamcache.cpp) +set(COLUMNSTORE_STATIC_LIBRARIES YES) + columnstore_library(oamcpp ${oamcpp_LIB_SRCS}) columnstore_link(oamcpp loggingcpp)