database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Merge pull request #1480 from dhall-MariaDB/MCOL-4329-dev

Browse Source 
MCOL-4329 dev set plugin-maturity to stable
This commit is contained in:
Roman Nozdrin
2020-10-27 18:07:22 +03:00
committed by GitHub
parent 0c71b8da8a a50bec905f
commit 39a1dd604d
3 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dbcon/mysql/CMakeLists.txt
View File

@ -40,12 +40,7 @@ if (COMMAND mysql_add_plugin)
ENDIF() ENDIF()
FILE(COPY columnstore.cnf DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/) FILE(COPY columnstore.cnf DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/)
if (BUILD_CONFIG STREQUAL "enterprise") SET(CS_CNF_FILE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/columnstore.cnf")
FILE(RENAME ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/columnstore.cnf ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/x-columnstore.cnf)
SET(CS_CNF_FILE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/x-columnstore.cnf")
else ()
SET(CS_CNF_FILE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/columnstore.cnf")
endif ()
mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY ${disabled} mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY ${disabled}
LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool
@ -62,15 +57,7 @@ else ()
# define this dummy target for standalone builds (ie, when mysql_add_plugin doesn't exist) # define this dummy target for standalone builds (ie, when mysql_add_plugin doesn't exist)
add_custom_target(columnstore DEPENDS ha_columnstore) add_custom_target(columnstore DEPENDS ha_columnstore)
if(BUILD_CONFIG STREQUAL "enterprise") install(FILES columnstore.cnf DESTINATION ${MARIADB_MYCNFDIR} COMPONENT columnstore-engine)
message(STATUS "enterprise build: columnstore.cnf renamed to x-columnstore.cnf on install")
install(FILES columnstore.cnf
RENAME x-columnstore.cnf
DESTINATION ${MARIADB_MYCNFDIR} COMPONENT columnstore-engine)
else()
install(FILES columnstore.cnf
DESTINATION ${MARIADB_MYCNFDIR} COMPONENT columnstore-engine)
endif()
endif () endif ()
if (TARGET columnstore) if (TARGET columnstore)

1
dbcon/mysql/columnstore.cnf
View File

@ -1,6 +1,5 @@
[mysqld] [mysqld]
plugin-load-add=ha_columnstore.so plugin-load-add=ha_columnstore.so
plugin-maturity=beta
# Enable compression by default on create, set to NONE to turn off # Enable compression by default on create, set to NONE to turn off
#columnstore_compression_type=SNAPPY #columnstore_compression_type=SNAPPY

6
oam/install_scripts/columnstore-post-install.in
View File

@ -81,6 +81,12 @@ if [ -z "$(pgrep -x mariadbd)" ];then
fi fi
sleep 2 sleep 2
# One time remove x-columnstore.cnf if it exists.
# x-columnstore.cnf was a kludge for using when plugin-maturity=gamma
if [ -f @MARIADB_MYCNFDIR@/x-columnstore.cnf ]; then
/bin/mv -f @MARIADB_MYCNFDIR@/x-columnstore.cnf @MARIADB_MYCNFDIR@/x-columnstore.cnf.rpmsave
fi
if [ -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.rpmsave ]; then if [ -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.rpmsave ]; then
/bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.new /bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.new
/bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.rpmsave @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf /bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.rpmsave @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf