Skip to content

M
MariaDB
Commit 1e7a68f8 authored by Roman Nozdrin's avatar Roman Nozdrin Committed by Oleksandr Byelkin
Browse files
Options

Both RPM and DEB now restart MDB uninstalling the plugin. 

    Both RPM and DEB now conflicts on previous versions of MCS.

    Trim .deb packaging.

    MCS now depends on python. Python version varies in distributions.
parent 070413fa
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 56 deletions
debian/control
View file @ 1e7a68f8
......@@ -657,9 +657,13 @@ Depends: mariadb-server-10.5 (= ${binary:Version}),
net-tools,
libsnappy1 | libsnappy1v5,
libjemalloc1 | libjemalloc2,
python | python2 | python3,
${misc:Depends},
${shlibs:Depends}
Recommends: python-mysqldb
Breaks: mariadb-columnstore-libs,
mariadb-columnstore-platform
Replaces: mariadb-columnstore-libs,
mariadb-columnstore-platform
Description: MariaDB ColumnStore storage engine
The MariaDB ColumnStore storage engine is a high-performance columnar
analytical engine, aimed at rapid processing of analytical queries on very
......
debian/mariadb-plugin-columnstore.install
View file @ 1e7a68f8
......@@ -86,43 +86,43 @@ usr/bin/mcs-start-storagemanager.py
usr/bin/mcs-loadbrm.py
usr/bin/mariadb-columnstore-start.sh
usr/bin/mariadb-columnstore-stop.sh
usr/lib/*-linux-gnu/libalarmmanager.so
usr/lib/*-linux-gnu/libbatchloader.so
usr/lib/*-linux-gnu/libbrm.so
usr/lib/*-linux-gnu/libcacheutils.so
usr/lib/*-linux-gnu/libcloudio.so
usr/lib/*-linux-gnu/libcommon.so
usr/lib/*-linux-gnu/libcompress.so
usr/lib/*-linux-gnu/libconfigcpp.so
usr/lib/*-linux-gnu/libdataconvert.so
usr/lib/*-linux-gnu/libddlcleanuputil.so
usr/lib/*-linux-gnu/libddlpackage.so
usr/lib/*-linux-gnu/libddlpackageproc.so
usr/lib/*-linux-gnu/libdmlpackage.so
usr/lib/*-linux-gnu/libdmlpackageproc.so
usr/lib/*-linux-gnu/libexecplan.so
usr/lib/*-linux-gnu/libfuncexp.so
usr/lib/*-linux-gnu/libidbdatafile.so
usr/lib/*-linux-gnu/libjoblist.so
usr/lib/*-linux-gnu/libjoiner.so
usr/lib/*-linux-gnu/liblibmysql_client.so
usr/lib/*-linux-gnu/libloggingcpp.so
usr/lib/*-linux-gnu/libmarias3.so
usr/lib/*-linux-gnu/libmessageqcpp.so
usr/lib/*-linux-gnu/liboamcpp.so
usr/lib/*-linux-gnu/libquerystats.so
usr/lib/*-linux-gnu/libquerytele.so
usr/lib/*-linux-gnu/libregr.so
usr/lib/*-linux-gnu/librowgroup.so
usr/lib/*-linux-gnu/librwlock.so
usr/lib/*-linux-gnu/libstoragemanager.so
usr/lib/*-linux-gnu/libthreadpool.so
usr/lib/*-linux-gnu/libthrift.so
usr/lib/*-linux-gnu/libudfsdk.so
usr/lib/*-linux-gnu/libwindowfunction.so
usr/lib/*-linux-gnu/libwriteengine.so
usr/lib/*-linux-gnu/libwriteengineclient.so
usr/lib/*-linux-gnu/libwriteengineredistribute.so
usr/lib/*/libalarmmanager.so
usr/lib/*/libbatchloader.so
usr/lib/*/libbrm.so
usr/lib/*/libcacheutils.so
usr/lib/*/libcloudio.so
usr/lib/*/libcommon.so
usr/lib/*/libcompress.so
usr/lib/*/libconfigcpp.so
usr/lib/*/libdataconvert.so
usr/lib/*/libddlcleanuputil.so
usr/lib/*/libddlpackage.so
usr/lib/*/libddlpackageproc.so
usr/lib/*/libdmlpackage.so
usr/lib/*/libdmlpackageproc.so
usr/lib/*/libexecplan.so
usr/lib/*/libfuncexp.so
usr/lib/*/libidbdatafile.so
usr/lib/*/libjoblist.so
usr/lib/*/libjoiner.so
usr/lib/*/liblibmysql_client.so
usr/lib/*/libloggingcpp.so
usr/lib/*/libmarias3.so
usr/lib/*/libmessageqcpp.so
usr/lib/*/liboamcpp.so
usr/lib/*/libquerystats.so
usr/lib/*/libquerytele.so
usr/lib/*/libregr.so
usr/lib/*/librowgroup.so
usr/lib/*/librwlock.so
usr/lib/*/libstoragemanager.so
usr/lib/*/libthreadpool.so
usr/lib/*/libthrift.so
usr/lib/*/libudfsdk.so
usr/lib/*/libwindowfunction.so
usr/lib/*/libwriteengine.so
usr/lib/*/libwriteengineclient.so
usr/lib/*/libwriteengineredistribute.so
usr/lib/mysql/plugin/ha_columnstore.so
usr/lib/mysql/plugin/libregr_mysql.so
usr/lib/mysql/plugin/libudf_mysql.so
......
debian/mariadb-plugin-columnstore.postinst
View file @ 1e7a68f8
#!/bin/bash -e
#!/bin/bash
rpmmode=install
set -e
columnstore-post-install --rpmmode=$rpmmode
# Install ColumnStore
columnstore-post-install --rpmmode=install
echo "MariaDB ColumnStore install completed"
exit 0
#DEBHELPER#
debian/mariadb-plugin-columnstore.postrm
View file @ 1e7a68f8
#!/bin/bash -e
#!/bin/bash
set -e
if [ "$1" = "purge" ]; then
rm -rf /var/lib/columnstore
......@@ -6,3 +8,22 @@ if [ "$1" = "purge" ]; then
rm -f /etc/mysql/mariadb.conf.d/columnstore.cnf.rpmsave
fi
running_systemd() {
if [ "$(ps --no-headers -o comm 1)" = "systemd" ]; then
echo 0
else
echo 1
fi
}
if [ ! -z "$(pgrep -x mysqld)" ];then
systemctl cat mariadb.service > /dev/null 2>&1
if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
systemctl restart mariadb.service > /dev/null 2>&1
else
pkill mysqld > /dev/null 2>&1
/usr/bin/mysqld_safe &
fi
fi
#DEBHELPER#
debian/mariadb-plugin-columnstore.prerm
View file @ 1e7a68f8
#!/bin/bash -e
#!/bin/bash
set -e
columnstore-pre-uninstall
exit 0
#DEBHELPER#
storage/columnstore/CMakeLists.txt
View file @ 1e7a68f8
......@@ -12,16 +12,23 @@ CMAKE_SYSTEM_PROCESSOR STREQUAL "i686")
add_subdirectory(columnstore)
IF(TARGET columnstore)
# Needed to bump the component changes up to the main scope
SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} PARENT_SCOPE)
IF (RPM)
SET(CPACK_RPM_columnstore-engine_USER_FILELIST ${CPACK_RPM_columnstore-engine_USER_FILELIST} PARENT_SCOPE)
SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4" PARENT_SCOPE)
SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE} PARENT_SCOPE)
SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE} PARENT_SCOPE)
SET(CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE} PARENT_SCOPE)
SET(CPACK_RPM_columnstore-engine_PACKAGE_CONFLICTS thrift PARENT_SCOPE)
ENDIF()
INSTALL_MYSQL_TEST("${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/" "plugin/columnstore")
# Needed to bump the component changes up to the main scope
SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} PARENT_SCOPE)
IF (RPM)
SET(CPACK_RPM_columnstore-engine_USER_FILELIST ${CPACK_RPM_columnstore-engine_USER_FILELIST} PARENT_SCOPE)
# To untie the python mess across distributions MCS supports.
IF(RPM MATCHES "(rhel|centos)8|(sles|suse)15|fedora")
SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4, python3" PARENT_SCOPE)
ELSEIF(RPM MATCHES "(centos|rhel)7")
SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4, python" PARENT_SCOPE)
ELSE()
SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4, python or python2 or python3" PARENT_SCOPE)
ENDIF()
SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE} PARENT_SCOPE)
SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE} PARENT_SCOPE)
SET(CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE} PARENT_SCOPE)
SET(CPACK_RPM_columnstore-engine_PACKAGE_CONFLICTS "thrift, MariaDB-columnstore-engine, MariaDB-columnstore-platform, MariaDB-columnstore-libs" PARENT_SCOPE)
ENDIF()
INSTALL_MYSQL_TEST("${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/" "plugin/columnstore")
ENDIF()
ENDIF()
columnstore @ 0cd56e7d
Subproject commit 3cfbda3ad30cd9c759f5a24dd8be66586faa56d9
Subproject commit 0cd56e7d01ec952fbe05f2c462cc59a80b88a309
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7