database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-24 14:20:59 +03:00
Code Activity

MCOL-3606 Make ColumnStore use generic paths

Browse Source 
ColumnStore now uses standard bin/lib paths for pretty much everything.
Data path is now hard-coded to /var/lib/columnstore.

This patch also:

* Removes v1 decompression
* Removes a bunch of unneeded files
* Removes COLUMNSTORE_INSTALL_DIR / $INSTALLDIR
* Makes my.cnf.d work for all platforms (MCOL-3558)
* Changes configcpp to use recursive mutex (fixes possible config write deadlock)
* Fixes MCOL-3599 Fix regr functions, The library was installed in the wrong location
* Fixes a bunch of Ubuntu packaging issues
* Changes the binary names of several of the executables so as not to
clash with potential executables from other packages
This commit is contained in:
Andrew Hutchings
2019-11-04 11:06:33 +00:00
parent dea1dec507
commit 8ab9ebb0f4
178 changed files with 1310 additions and 18366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/setConfig/CMakeLists.txt
View File

@@ -7,11 +7,11 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/configxml.sh.in" "${CMAKE_CURRENT_SO
set(setConfig_SRCS main.cpp)
add_executable(setConfig ${setConfig_SRCS})
add_executable(mcsSetConfig ${setConfig_SRCS})
target_link_libraries(setConfig ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
target_link_libraries(mcsSetConfig ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS setConfig DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS mcsSetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(PROGRAMS configxml.sh DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

28
tools/setConfig/configxml.sh.in
View File

@@ -4,22 +4,6 @@
#
#
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
test -f /etc/default/infinidb && . /etc/default/infinidb
fi
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
fi
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
InstallDir=$COLUMNSTORE_INSTALL_DIR
if [ $InstallDir != "/usr/local/mariadb/columnstore" ]; then
export PATH=$InstallDir/bin:/bin:/usr/bin
export LD_LIBRARY_PATH=$InstallDir/lib
fi
case "$1" in
setconfig)
@@ -29,7 +13,7 @@ case "$1" in
exit 1
fi
oldvalue=$($InstallDir/bin/getConfig $2 $3)
oldvalue=$(mcsGetConfig $2 $3)
#if [ -z $oldvalue ]; then
# echo "$2 / $3 not found in Columnstore.xml"
@@ -46,17 +30,17 @@ case "$1" in
echo "$calxml backed up to $calxml.$seconds"
echo
oldvalue=$($InstallDir/bin/getConfig $2 $3)
oldvalue=$(mcsGetConfig $2 $3)
echo "Old value of $2 / $3 is $oldvalue"
if ( [ $# -eq 4 ] && [ -z $4 ] ); then
$InstallDir/bin/setConfig $2 $3 ""
mcsSetConfig $2 $3 ""
else
$InstallDir/bin/setConfig $2 $3 $4
mcsSetConfig $2 $3 $4
fi
newvalue=$($InstallDir/bin/getConfig $2 $3)
newvalue=$(mcsGetConfig $2 $3)
echo "$2 / $3 now set to $newvalue"
;;
@@ -67,7 +51,7 @@ case "$1" in
exit 1
fi
value=$($InstallDir/bin/getConfig $2 $3)
value=$(mcsGetConfig $2 $3)
if [ -z $value ]; then
echo "$2 / $3 not found in Columnstore.xml"

2
tools/setConfig/main.cpp
View File

@@ -119,7 +119,7 @@ int main(int argc, char** argv)
if (!dflg && !parentOAMModuleFlag)
{
cerr << "Exiting, setConfig can only be run on the Active "
cerr << "Exiting, mcsSetConfig can only be run on the Active "
"OAM Parent Module '" << parentOAMModule << "'" << endl;
return 2;
}