database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

MCOL-520 - remove use of /usr/default/columnstore

Browse Source
This commit is contained in:
David Hill
2018-10-22 13:23:00 -05:00
parent 904d21ccd8
commit ef4fab8408
8 changed files with 182 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
dbcon/mysql/mysql-Columnstore
View File

@ -43,12 +43,33 @@
# If you change base dir, you must also change datadir. These may get # If you change base dir, you must also change datadir. These may get
# overwritten by settings in the MySQL configuration files. # overwritten by settings in the MySQL configuration files.
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then prefix=/usr/local
test -f /etc/default/columnstore && . /etc/default/columnstore
USER=`whoami 2>/dev/null`
if [ $USER != "root" ]; then
prefix=$HOME
fi
if [ $USER != "root" ]; then
if [ -f $prefix/.bash_profile ]; then
profileFile=$prefix/.bash_profile
elif [ -f $prefix/.profile ]; then
profileFile=$prefix/.profile
else
profileFile=$prefix/.bashrc
fi
. .$profileFile
fi
# Source function library.
if [ -f /etc/init.d/functions ]; then
. /etc/init.d/functions
fi fi
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
fi fi
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR

26
oam/install_scripts/columnstore
View File

@ -17,15 +17,31 @@
# Short-Description: Start/stop MariaDB Columnstore DW DBMS # Short-Description: Start/stop MariaDB Columnstore DW DBMS
### END INIT INFO ### END INIT INFO
prefix=/usr/local
USER=`whoami 2>/dev/null`
if [ $USER != "root" ]; then
prefix=$HOME
fi
if [ $USER != "root" ]; then
if [ -f $prefix/.bash_profile ]; then
profileFile=$prefix/.bash_profile
elif [ -f $prefix/.profile ]; then
profileFile=$prefix/.profile
else
profileFile=$prefix/.bashrc
fi
. .$profileFile
fi
# Source function library. # Source function library.
if [ -f /etc/init.d/functions ]; then if [ -f /etc/init.d/functions ]; then
. /etc/init.d/functions . /etc/init.d/functions
fi fi
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
test -f /etc/default/columnstore && . /etc/default/columnstore
fi
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
fi fi
@ -40,7 +56,7 @@ if [ $InstallDir != "/usr/local/mariadb/columnstore" ]; then
fi fi
#hadoop #hadoop
plugin=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig SystemConfig DataFilePlugin` plugin=`$InstallDir/bin/getConfig SystemConfig DataFilePlugin`
if [ -n "$plugin" ]; then if [ -n "$plugin" ]; then
setenv=`$InstallDir/bin/getConfig SystemConfig DataFileEnvFile` setenv=`$InstallDir/bin/getConfig SystemConfig DataFileEnvFile`
. $InstallDir/bin/$setenv >/dev/null 2>&1 . $InstallDir/bin/$setenv >/dev/null 2>&1

24
oam/install_scripts/startupTests.sh
View File

@ -5,8 +5,27 @@
# startupTests - perform sanity testing on system DB at system startup time # startupTests - perform sanity testing on system DB at system startup time
# called by Process-Monitor # called by Process-Monitor
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then USER=`whoami 2>/dev/null`
test -f /etc/default/columnstore && . /etc/default/columnstore
if [ $USER != "root" ]; then
prefix=$HOME
fi
if [ $USER != "root" ]; then
if [ -f $prefix/.bash_profile ]; then
profileFile=$prefix/.bash_profile
elif [ -f $prefix/.profile ]; then
profileFile=$prefix/.profile
else
profileFile=$prefix/.bashrc
fi
. .$profileFile
fi
# Source function library.
if [ -f /etc/init.d/functions ]; then
. /etc/init.d/functions
fi fi
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
@ -14,7 +33,6 @@ if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
fi fi
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
test -f $COLUMNSTORE_INSTALL_DIR/post/functions && . $COLUMNSTORE_INSTALL_DIR/post/functions test -f $COLUMNSTORE_INSTALL_DIR/post/functions && . $COLUMNSTORE_INSTALL_DIR/post/functions
for testScript in $COLUMNSTORE_INSTALL_DIR/post/*.sh; do for testScript in $COLUMNSTORE_INSTALL_DIR/post/*.sh; do

25
oam/post/functions
View File

@ -2,8 +2,29 @@
# $Id: functions 2937 2012-05-30 18:17:09Z rdempsey $ # $Id: functions 2937 2012-05-30 18:17:09Z rdempsey $
# #
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then prefix=/usr/local
test -f /etc/default/columnstore && . /etc/default/columnstore
USER=`whoami 2>/dev/null`
if [ $USER != "root" ]; then
prefix=$HOME
fi
if [ $USER != "root" ]; then
if [ -f $prefix/.bash_profile ]; then
profileFile=$prefix/.bash_profile
elif [ -f $prefix/.profile ]; then
profileFile=$prefix/.profile
else
profileFile=$prefix/.bashrc
fi
. .$profileFile
fi
# Source function library.
if [ -f /etc/init.d/functions ]; then
. /etc/init.d/functions
fi fi
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then

25
oam/post/test-001.sh
View File

@ -2,8 +2,29 @@
# #
# $Id: test-001.sh 3704 2013-08-07 03:33:20Z bwilkinson $ # $Id: test-001.sh 3704 2013-08-07 03:33:20Z bwilkinson $
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then prefix=/usr/local
test -f /etc/default/columnstore && . /etc/default/columnstore
USER=`whoami 2>/dev/null`
if [ $USER != "root" ]; then
prefix=$HOME
fi
if [ $USER != "root" ]; then
if [ -f $prefix/.bash_profile ]; then
profileFile=$prefix/.bash_profile
elif [ -f $prefix/.profile ]; then
profileFile=$prefix/.profile
else
profileFile=$prefix/.bashrc
fi
. .$profileFile
fi
# Source function library.
if [ -f /etc/init.d/functions ]; then
. /etc/init.d/functions
fi fi
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then

25
oam/post/test-002.sh
View File

@ -2,8 +2,29 @@
# #
# $Id: test-002.sh 2937 2012-05-30 18:17:09Z rdempsey $ # $Id: test-002.sh 2937 2012-05-30 18:17:09Z rdempsey $
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then prefix=/usr/local
test -f /etc/default/columnstore && . /etc/default/columnstore
USER=`whoami 2>/dev/null`
if [ $USER != "root" ]; then
prefix=$HOME
fi
if [ $USER != "root" ]; then
if [ -f $prefix/.bash_profile ]; then
profileFile=$prefix/.bash_profile
elif [ -f $prefix/.profile ]; then
profileFile=$prefix/.profile
else
profileFile=$prefix/.bashrc
fi
. .$profileFile
fi
# Source function library.
if [ -f /etc/init.d/functions ]; then
. /etc/init.d/functions
fi fi
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then

25
oam/post/test-003.sh
View File

@ -2,8 +2,29 @@
# #
# $Id: test-003.sh 2937 2012-05-30 18:17:09Z rdempsey $ # $Id: test-003.sh 2937 2012-05-30 18:17:09Z rdempsey $
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then prefix=/usr/local
test -f /etc/default/columnstore && . /etc/default/columnstore
USER=`whoami 2>/dev/null`
if [ $USER != "root" ]; then
prefix=$HOME
fi
if [ $USER != "root" ]; then
if [ -f $prefix/.bash_profile ]; then
profileFile=$prefix/.bash_profile
elif [ -f $prefix/.profile ]; then
profileFile=$prefix/.profile
else
profileFile=$prefix/.bashrc
fi
. .$profileFile
fi
# Source function library.
if [ -f /etc/init.d/functions ]; then
. /etc/init.d/functions
fi fi
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then

26
oam/post/test-004.sh
View File

@ -6,14 +6,36 @@
# Validates that FilesPerColumnPartition setting is not set lower than existing extents. # Validates that FilesPerColumnPartition setting is not set lower than existing extents.
# #
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then prefix=/usr/local
test -f /etc/default/columnstore && . /etc/default/columnstore
USER=`whoami 2>/dev/null`
if [ $USER != "root" ]; then
prefix=$HOME
fi
if [ $USER != "root" ]; then
if [ -f $prefix/.bash_profile ]; then
profileFile=$prefix/.bash_profile
elif [ -f $prefix/.profile ]; then
profileFile=$prefix/.profile
else
profileFile=$prefix/.bashrc
fi
. .$profileFile
fi
# Source function library.
if [ -f /etc/init.d/functions ]; then
. /etc/init.d/functions
fi fi
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
fi fi
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
test -f $COLUMNSTORE_INSTALL_DIR/post/functions && . $COLUMNSTORE_INSTALL_DIR/post/functions test -f $COLUMNSTORE_INSTALL_DIR/post/functions && . $COLUMNSTORE_INSTALL_DIR/post/functions