database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-05-28 13:01:26 +03:00
Code

name change

Browse Source
This commit is contained in:
david hill 2016-08-15 13:39:00 -05:00
parent bd8f18bcce
commit 468a971517
27 changed files with 154 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/mysql/mysql-Calpont
View File

@ -300,7 +300,7 @@ fi
kill_by_pid() {
# let's see if we can kill the 2 mysql procs by hand
# get the our mysql from ps
eval $(ps -ef | grep "$INFINIDB_INSTALL_DIR/mysql//sbin/mysqld" | grep -v grep | head -1 | awk '{printf "pid=%d\n", $2}')
eval $(ps -ef | grep "$COLUMNSTORE_INSTALL_DIR/mysql//sbin/mysqld" | grep -v grep | head -1 | awk '{printf "pid=%d\n", $2}')
if [ -n "$pid" ]; then
ppid=$(ps -o ppid= -p $pid)

12
dbcon/mysql/mysql-Columnstore
View File

@ -43,17 +43,17 @@
# If you change base dir, you must also change datadir. These may get
# overwritten by settings in the MySQL configuration files.
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
test -f /etc/default/columnstore && . /etc/default/columnstore
fi
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
fi
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
basedir=$INFINIDB_INSTALL_DIR/mysql
basedir=$COLUMNSTORE_INSTALL_DIR/mysql
datadir=$basedir/db
# Default value, in seconds, afterwhich the script should timeout waiting
@ -310,7 +310,7 @@ fi
kill_by_pid() {
# let's see if we can kill the 2 mysql procs by hand
# get the our mysql from ps
eval $(ps -ef | grep "$INFINIDB_INSTALL_DIR/mysql//sbin/mysqld" | grep -v grep | head -1 | awk '{printf "pid=%d\n", $2}')
eval $(ps -ef | grep "$COLUMNSTORE_INSTALL_DIR/mysql//sbin/mysqld" | grep -v grep | head -1 | awk '{printf "pid=%d\n", $2}')
if [ -n "$pid" ]; then
ppid=$(ps -o ppid= -p $pid)

2
oam/etc/Columnstore.xml
View File

@ -2,7 +2,7 @@
<!-- $Id: Columnstore.xml 3713 2013-08-16 20:04:47Z wweeks $ -->
<!--
WARNING: Do not make changes to this file unless directed to do so by
Calpont service engineers. Incorrect settings can render your system
MariaDB service engineers. Incorrect settings can render your system
unusable and will require a service call to correct.
-->
<Columnstore Version="V1.0.0">

2
oam/install_scripts/binary_installer.sh
View File

@ -29,7 +29,7 @@ set IDIR [lindex $argv 9]
if { $IDIR != "" } {
set INSTALLDIR $IDIR
}
set env(INFINIDB_INSTALL_DIR) $INSTALLDIR
set env(COLUMNSTORE_INSTALL_DIR) $INSTALLDIR
set PREFIX [file dirname $INSTALLDIR]
set PREFIX [file dirname $PREFIX]
set USERNAME $env(USER)

14
oam/install_scripts/calpontUninstall.sh
View File

@ -4,8 +4,8 @@
#
# Uninstall Package from system
set INFINIDB_INSTALL_DIR "/usr/local/mariadb/columnstore"
set env(INFINIDB_INSTALL_DIR) $INFINIDB_INSTALL_DIR
set COLUMNSTORE_INSTALL_DIR "/usr/local/mariadb/columnstore"
set env(COLUMNSTORE_INSTALL_DIR) $COLUMNSTORE_INSTALL_DIR
set USERNAME $env(USER)
set PASSWORD " "
@ -55,13 +55,13 @@ log_user $DEBUG
set timeout 2
set INSTALL 2
send "$INFINIDB_INSTALL_DIR/bin/getConfig DBRM_Controller NumWorkers\n"
send "$COLUMNSTORE_INSTALL_DIR/bin/getConfig DBRM_Controller NumWorkers\n"
expect {
1 { set INSTALL 1 }
}
set PACKAGE "rpm"
send "$INFINIDB_INSTALL_DIR/bin/getConfig Installation EEPackageType\n"
send "$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation EEPackageType\n"
expect {
rpm { set PACKAGE rpm }
deb { set PACKAGE deb }
@ -79,7 +79,7 @@ send_user "\nPerforming InfiniDB System Uninstall\n\n"
#
send_user "Shutdown InfiniDB System "
expect -re {[$#] }
send "$INFINIDB_INSTALL_DIR/bin/mcsadmin shutdownsystem y\n"
send "$COLUMNSTORE_INSTALL_DIR/bin/mcsadmin shutdownsystem y\n"
expect {
"shutdownSystem " { send_user "DONE" }
}
@ -92,7 +92,7 @@ if { $INSTALL == "2"} {
# Run installer
#
send_user "Run System Uninstaller "
send "$INFINIDB_INSTALL_DIR/bin/installer $INFINIDBRPM1 $INFINIDBRPM2 $INFINIDBRPM3 $CONNECTORRPM1 $CONNECTORRPM2 uninstall $PASSWORD n --nodeps dummymysqlpw $DEBUG\n"
send "$COLUMNSTORE_INSTALL_DIR/bin/installer $INFINIDBRPM1 $INFINIDBRPM2 $INFINIDBRPM3 $CONNECTORRPM1 $CONNECTORRPM2 uninstall $PASSWORD n --nodeps dummymysqlpw $DEBUG\n"
expect {
"uninstall request successful" { send_user "DONE" }
"ERROR" { send_user "FAILED" ; exit -1 }
@ -101,7 +101,7 @@ if { $INSTALL == "2"} {
}
if { $PACKAGE == "binary" } {
send "$INFINIDB_INSTALL_DIR/bin/pre-uninstall\n"
send "$COLUMNSTORE_INSTALL_DIR/bin/pre-uninstall\n"
expect {
-re {[$#] } { }
}

12
oam/install_scripts/columnstore
View File

@ -22,17 +22,17 @@ if [ -f /etc/init.d/functions ]; then
. /etc/init.d/functions
fi
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
test -f /etc/default/columnstore && . /etc/default/columnstore
fi
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
fi
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
InstallDir=$INFINIDB_INSTALL_DIR
InstallDir=$COLUMNSTORE_INSTALL_DIR
if [ $InstallDir != "/usr/local/mariadb/columnstore" ]; then
export PATH=$InstallDir/bin:$InstallDir/mysql/bin:/bin:/usr/bin
@ -40,7 +40,7 @@ if [ $InstallDir != "/usr/local/mariadb/columnstore" ]; then
fi
#hadoop
plugin=`$INFINIDB_INSTALL_DIR/bin/getConfig SystemConfig DataFilePlugin`
plugin=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig SystemConfig DataFilePlugin`
if [ -n "$plugin" ]; then
setenv=`$InstallDir/bin/getConfig SystemConfig DataFileEnvFile`
. $InstallDir/bin/$setenv >/dev/null 2>&1

6
oam/install_scripts/columnstore.def
View File

@ -2,8 +2,8 @@
# Copy this file to /etc/default and rename it to 'columnstore'.
# Change this line to your MariaDB Columnstore installation directory
INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
LD_LIBRARY_PATH=$INFINIDB_INSTALL_DIR/lib:$INFINIDB_INSTALL_DIR/mysql/lib/mysql
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR
LD_LIBRARY_PATH=$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib/mysql
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH

14
oam/install_scripts/columnstoreUninstall.sh
View File

@ -4,8 +4,8 @@
#
# Uninstall Package from system
set INFINIDB_INSTALL_DIR "/usr/local/mariadb/columnstore"
set env(INFINIDB_INSTALL_DIR) $INFINIDB_INSTALL_DIR
set COLUMNSTORE_INSTALL_DIR "/usr/local/mariadb/columnstore"
set env(COLUMNSTORE_INSTALL_DIR) $COLUMNSTORE_INSTALL_DIR
set USERNAME $env(USER)
set PASSWORD " "
@ -55,13 +55,13 @@ log_user $DEBUG
set timeout 2
set INSTALL 2
send "$INFINIDB_INSTALL_DIR/bin/getConfig DBRM_Controller NumWorkers\n"
send "$COLUMNSTORE_INSTALL_DIR/bin/getConfig DBRM_Controller NumWorkers\n"
expect {
1 { set INSTALL 1 }
}
set PACKAGE "rpm"
send "$INFINIDB_INSTALL_DIR/bin/getConfig Installation EEPackageType\n"
send "$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation EEPackageType\n"
expect {
rpm { set PACKAGE rpm }
deb { set PACKAGE deb }
@ -79,7 +79,7 @@ send_user "\nPerforming InfiniDB System Uninstall\n\n"
#
send_user "Shutdown InfiniDB System "
expect -re {[$#] }
send "$INFINIDB_INSTALL_DIR/bin/mcsadmin shutdownsystem y\n"
send "$COLUMNSTORE_INSTALL_DIR/bin/mcsadmin shutdownsystem y\n"
expect {
"shutdownSystem " { send_user "DONE" }
}
@ -92,7 +92,7 @@ if { $INSTALL == "2"} {
# Run installer
#
send_user "Run System Uninstaller "
send "$INFINIDB_INSTALL_DIR/bin/installer $INFINIDBRPM1 $INFINIDBRPM2 $INFINIDBRPM3 $CONNECTORRPM1 $CONNECTORRPM2 uninstall $PASSWORD n --nodeps dummymysqlpw $DEBUG\n"
send "$COLUMNSTORE_INSTALL_DIR/bin/installer $INFINIDBRPM1 $INFINIDBRPM2 $INFINIDBRPM3 $CONNECTORRPM1 $CONNECTORRPM2 uninstall $PASSWORD n --nodeps dummymysqlpw $DEBUG\n"
expect {
"uninstall request successful" { send_user "DONE" }
"ERROR" { send_user "FAILED" ; exit -1 }
@ -101,7 +101,7 @@ if { $INSTALL == "2"} {
}
if { $PACKAGE == "binary" } {
send "$INFINIDB_INSTALL_DIR/bin/pre-uninstall\n"
send "$COLUMNSTORE_INSTALL_DIR/bin/pre-uninstall\n"
expect {
-re {[$#] } { }
}

12
oam/install_scripts/infinidb
View File

@ -22,17 +22,17 @@ if [ -f /etc/init.d/functions ]; then
. /etc/init.d/functions
fi
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
test -f /etc/default/infinidb && . /etc/default/infinidb
fi
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
INFINIDB_INSTALL_DIR=/usr/local/Calpont
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/Calpont
fi
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
InstallDir=$INFINIDB_INSTALL_DIR
InstallDir=$COLUMNSTORE_INSTALL_DIR
if [ $InstallDir != "/usr/local/Calpont" ]; then
export PATH=$InstallDir/bin:$InstallDir/mysql/bin:/bin:/usr/bin
@ -40,7 +40,7 @@ if [ $InstallDir != "/usr/local/Calpont" ]; then
fi
#hadoop
plugin=`$INFINIDB_INSTALL_DIR/bin/getConfig SystemConfig DataFilePlugin`
plugin=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig SystemConfig DataFilePlugin`
if [ -n "$plugin" ]; then
setenv=`$InstallDir/bin/getConfig SystemConfig DataFileEnvFile`
. $InstallDir/bin/$setenv >/dev/null 2>&1

6
oam/install_scripts/infinidb.def
View File

@ -2,8 +2,8 @@
# Copy this file to /etc/default and rename it to 'infinidb'.
# Change this line to your InfiniDB installation directory
INFINIDB_INSTALL_DIR=/usr/local/Calpont
COLUMNSTORE_INSTALL_DIR=/usr/local/Calpont
LD_LIBRARY_PATH=$INFINIDB_INSTALL_DIR/lib:$INFINIDB_INSTALL_DIR/mysql/lib/mysql
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR
LD_LIBRARY_PATH=$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib/mysql
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH

62
oam/install_scripts/module_installer.sh
View File

@ -48,42 +48,42 @@ done
shift $shiftcnt
if [ $installdir != "/usr/local/mariadb/columnstore" ]; then
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$INFINIDB_INSTALL_DIR/lib:$INFINIDB_INSTALL_DIR/mysql/lib/mysql
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib/mysql
fi
export INFINIDB_INSTALL_DIR=$installdir
export COLUMNSTORE_INSTALL_DIR=$installdir
cloud=`$INFINIDB_INSTALL_DIR/bin/getConfig Installation Cloud`
cloud=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation Cloud`
if [ $module = "pm" ]; then
if [ $cloud = "amazon-ec2" ] || [ $cloud = "amazon-vpc" ]; then
cp $INFINIDB_INSTALL_DIR/local/etc/*.pem /root/. > /dev/null 2>&1
cp $COLUMNSTORE_INSTALL_DIR/local/etc/*.pem /root/. > /dev/null 2>&1
if test -f $INFINIDB_INSTALL_DIR/local/etc/pm1/fstab ; then
if test -f $COLUMNSTORE_INSTALL_DIR/local/etc/pm1/fstab ; then
echo "Setup fstab on Module"
touch /etc/fstab
rm -f /etc/fstab.columnstoreSave
cp /etc/fstab /etc/fstab.columnstoreSave
cat $INFINIDB_INSTALL_DIR/local/etc/pm1/fstab >> /etc/fstab
cat $COLUMNSTORE_INSTALL_DIR/local/etc/pm1/fstab >> /etc/fstab
fi
fi
fi
test -f $INFINIDB_INSTALL_DIR/post/functions && . $INFINIDB_INSTALL_DIR/post/functions
test -f $COLUMNSTORE_INSTALL_DIR/post/functions && . $COLUMNSTORE_INSTALL_DIR/post/functions
mid=`module_id`
#if um, cloud, separate system type, external um storage, then setup mount
if [ $module = "um" ]; then
if [ $cloud = "amazon-ec2" ] || [ $cloud = "amazon-vpc" ]; then
systemtype=`$INFINIDB_INSTALL_DIR/bin/getConfig Installation ServerTypeInstall`
systemtype=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation ServerTypeInstall`
if [ $systemtype = "1" ]; then
umstoragetype=`$INFINIDB_INSTALL_DIR/bin/getConfig Installation UMStorageType`
umstoragetype=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation UMStorageType`
if [ $umstoragetype = "external" ]; then
echo "Setup UM Volume Mount"
device=`$INFINIDB_INSTALL_DIR/bin/getConfig Installation UMVolumeDeviceName$mid`
mkdir -p $INFINIDB_INSTALL_DIR/mysql/db > /dev/null 2>&1
mount $device $INFINIDB_INSTALL_DIR/mysql/db -t ext2 -o defaults
chown mysql:mysql -R $INFINIDB_INSTALL_DIR/mysql > /dev/null 2>&1
device=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation UMVolumeDeviceName$mid`
mkdir -p $COLUMNSTORE_INSTALL_DIR/mysql/db > /dev/null 2>&1
mount $device $COLUMNSTORE_INSTALL_DIR/mysql/db -t ext2 -o defaults
chown mysql:mysql -R $COLUMNSTORE_INSTALL_DIR/mysql > /dev/null 2>&1
fi
fi
fi
@ -91,25 +91,25 @@ fi
#if pm, create dbroot directories
if [ $module = "pm" ]; then
numdbroots=`$INFINIDB_INSTALL_DIR/bin/getConfig SystemConfig DBRootCount`
numdbroots=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig SystemConfig DBRootCount`
for (( id=1; id<$numdbroots+1; id++ )); do
mkdir -p $INFINIDB_INSTALL_DIR/data$id > /dev/null 2>&1
chmod 755 $INFINIDB_INSTALL_DIR/data$id
mkdir -p $COLUMNSTORE_INSTALL_DIR/data$id > /dev/null 2>&1
chmod 755 $COLUMNSTORE_INSTALL_DIR/data$id
done
fi
echo "Setup rc.local on Module"
if [ $EUID -eq 0 -a -f $INFINIDB_INSTALL_DIR/local/rc.local.columnstore ]; then
if [ $EUID -eq 0 -a -f $COLUMNSTORE_INSTALL_DIR/local/rc.local.columnstore ]; then
if [ $user = "root" ]; then
touch /etc/rc.local
rm -f /etc/rc.local.columnstoreSave
cp /etc/rc.local /etc/rc.local.columnstoreSave
cat $INFINIDB_INSTALL_DIR/local/rc.local.columnstore >> /etc/rc.local
cat $COLUMNSTORE_INSTALL_DIR/local/rc.local.columnstore >> /etc/rc.local
else
sudo touch /etc/rc.local
sudo rm -f /etc/rc.local.columnstoreSave
sudo cp /etc/rc.local /etc/rc.local.columnstoreSave
sudo cat $INFINIDB_INSTALL_DIR/local/rc.local.columnstore >> /etc/rc.local
sudo cat $COLUMNSTORE_INSTALL_DIR/local/rc.local.columnstore >> /etc/rc.local
fi
fi
@ -121,45 +121,45 @@ if [ $user != "root" ]; then
touch ${bashFile}
echo " " >> ${bashFile}
echo "export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR" >> ${bashFile}
echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$INFINIDB_INSTALL_DIR/lib:$INFINIDB_INSTALL_DIR/mysql/lib/mysql" >> ${bashFile}
echo "export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR" >> ${bashFile}
echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib/mysql" >> ${bashFile}
fi
plugin=`$INFINIDB_INSTALL_DIR/bin/getConfig SystemConfig DataFilePlugin`
plugin=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig SystemConfig DataFilePlugin`
if [ -n "$plugin" ]; then
echo "Setup .bashrc on Module for local-query"
setenv=`$INFINIDB_INSTALL_DIR/bin/getConfig SystemConfig DataFileEnvFile`
setenv=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig SystemConfig DataFileEnvFile`
eval userhome=~$user
bashFile=$userhome/.bashrc
touch ${bashFile}
echo " " >> ${bashFile}
echo ". $INFINIDB_INSTALL_DIR/bin/$setenv" >> ${bashFile}
echo ". $COLUMNSTORE_INSTALL_DIR/bin/$setenv" >> ${bashFile}
fi
# if mysqlrep is on and module has a my.cnf file, upgrade it
MySQLRep=`$INFINIDB_INSTALL_DIR/bin/getConfig Installation MySQLRep`
MySQLRep=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation MySQLRep`
if [ $MySQLRep = "y" ]; then
if test -f $INFINIDB_INSTALL_DIR/mysql/my.cnf ; then
if test -f $COLUMNSTORE_INSTALL_DIR/mysql/my.cnf ; then
echo "Run Upgrade on my.cnf on Module"
$INFINIDB_INSTALL_DIR/bin/mycnfUpgrade > /tmp/mycnfUpgrade.log 2>&1
$COLUMNSTORE_INSTALL_DIR/bin/mycnfUpgrade > /tmp/mycnfUpgrade.log 2>&1
fi
fi
if test -f $INFINIDB_INSTALL_DIR/mysql/my.cnf ; then
if test -f $COLUMNSTORE_INSTALL_DIR/mysql/my.cnf ; then
echo "Run Mysql Port update on my.cnf on Module"
$INFINIDB_INSTALL_DIR/bin/mycnfUpgrade $mysqlPort > /tmp/mycnfUpgrade_port.log 2>&1
$COLUMNSTORE_INSTALL_DIR/bin/mycnfUpgrade $mysqlPort > /tmp/mycnfUpgrade_port.log 2>&1
fi
# if um, run mysql install scripts
if [ $module = "um" ]; then
echo "Run post-mysqld-install"
$INFINIDB_INSTALL_DIR/bin/post-mysqld-install > /tmp/post-mysqld-install.log 2>&1
$COLUMNSTORE_INSTALL_DIR/bin/post-mysqld-install > /tmp/post-mysqld-install.log 2>&1
echo "Run post-mysql-install"
$INFINIDB_INSTALL_DIR/bin/post-mysql-install > /tmp/post-mysql-install.log 2>&1
$COLUMNSTORE_INSTALL_DIR/bin/post-mysql-install > /tmp/post-mysql-install.log 2>&1
fi

12
oam/install_scripts/post-install
View File

@ -34,7 +34,7 @@ for arg in "$@"; do
done
if [ $installdir != "/usr/local/mariadb/columnstore" ]; then
export INFINIDB_INSTALL_DIR=$installdir
export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib
else
# add library config file
@ -251,7 +251,7 @@ if [ -z "$hadoop" ]; then
cat <<EOD
The next steps are:
export INFINIDB_INSTALL_DIR=$installdir
export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql
$installdir/bin/postConfigure -i $installdir
@ -282,14 +282,14 @@ cat <<EOD
If you are intending to install MariaDB Columnstore over Hadoop, the next steps are:
export INFINIDB_INSTALL_DIR=$installdir
export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql
. $installdir/bin/setenv-hdfs-20
$installdir/bin/postConfigure -i $installdir
If you are intending to install MariaDB Columnstore without Hadoop, the next steps are:
export INFINIDB_INSTALL_DIR=$installdir
export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql
$installdir/bin/postConfigure -i $installdir
@ -321,14 +321,14 @@ cat <<EOD
If you are intending to install MariaDB Columnstore over Hadoop, the next steps are:
export INFINIDB_INSTALL_DIR=$installdir
export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql:$libpath
. $installdir/bin/setenv-hdfs-12
$installdir/bin/postConfigure -i $installdir
If you are intending to install MariaDB Columnstore without Hadoop, the next steps are:
export INFINIDB_INSTALL_DIR=$installdir
export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib/mysql
$installdir/bin/postConfigure -i $installdir

4
oam/install_scripts/post-mysql-install
View File

@ -71,8 +71,8 @@ done
sudo ldconfig
if [ $installdir != "/usr/local/mariadb/columnstore" ]; then
export INFINIDB_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$INFINIDB_INSTALL_DIR/lib:$INFINIDB_INSTALL_DIR/mysql/lib/mysql
export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib/mysql
fi
if [ -f $installdir/lib/libcalmysql.so.1.0.0 ]; then

4
oam/install_scripts/pre-uninstall
View File

@ -53,9 +53,9 @@ if test -f /etc/rc.local.columnstoreSave ; then
$sudo mv -f /etc/rc.local.columnstoreSave /etc/rc.local > /dev/null 2>&1
fi
export INFINIDB_INSTALL_DIR=$installdir
export COLUMNSTORE_INSTALL_DIR=$installdir
cloud=`$INFINIDB_INSTALL_DIR/bin/getConfig Installation Cloud`
cloud=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation Cloud`
if [ $cloud = "amazon-ec2" ] || [ $cloud = "amazon-vpc" ]; then
if test -f /etc/fstab ; then
$sudo sed -i '/Columnstore\/data/d' /etc/fstab > /dev/null 2>&1

12
oam/install_scripts/startupTests.sh
View File

@ -5,19 +5,19 @@
# startupTests - perform sanity testing on system DB at system startup time
# called by Process-Monitor
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
test -f /etc/default/columnstore && . /etc/default/columnstore
fi
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
fi
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
test -f $INFINIDB_INSTALL_DIR/post/functions && . $INFINIDB_INSTALL_DIR/post/functions
test -f $COLUMNSTORE_INSTALL_DIR/post/functions && . $COLUMNSTORE_INSTALL_DIR/post/functions
for testScript in $INFINIDB_INSTALL_DIR/post/*.sh; do
for testScript in $COLUMNSTORE_INSTALL_DIR/post/*.sh; do
if [ -x $testScript ]; then
eval $testScript
rc=$?

4
oam/install_scripts/syslogSetup.sh
View File

@ -31,8 +31,8 @@ for arg in "$@"; do
done
if [ $installdir != "/usr/local/mariadb/columnstore" ]; then
export INFINIDB_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$INFINIDB_INSTALL_DIR/lib
export COLUMNSTORE_INSTALL_DIR=$installdir
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$COLUMNSTORE_INSTALL_DIR/lib
fi
columnstoreSyslogFile=$installdir/bin/columnstoreSyslog

16
oam/post/functions
View File

@ -2,23 +2,23 @@
# $Id: functions 2937 2012-05-30 18:17:09Z rdempsey $
#
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
test -f /etc/default/columnstore && . /etc/default/columnstore
fi
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
fi
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
PATH=$INFINIDB_INSTALL_DIR/bin:$PATH
PATH=$COLUMNSTORE_INSTALL_DIR/bin:$PATH
export PATH
module_type()
{
(
sed -r 's/[0-9]+$//' $INFINIDB_INSTALL_DIR/local/module
sed -r 's/[0-9]+$//' $COLUMNSTORE_INSTALL_DIR/local/module
) 2>/dev/null
}
@ -38,13 +38,13 @@ oidbitmapfile()
module_name()
{
(
cat $INFINIDB_INSTALL_DIR/local/module
cat $COLUMNSTORE_INSTALL_DIR/local/module
) 2>/dev/null
}
module_id()
{
(
sed -r 's/[a-zA-Z]//g' $INFINIDB_INSTALL_DIR/local/module
sed -r 's/[a-zA-Z]//g' $COLUMNSTORE_INSTALL_DIR/local/module
) 2>/dev/null
}

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

@ -2,17 +2,17 @@
#
# $Id: test-001.sh 3704 2013-08-07 03:33:20Z bwilkinson $
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
test -f /etc/default/columnstore && . /etc/default/columnstore
fi
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
fi
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
test -f $INFINIDB_INSTALL_DIR/post/functions && . $INFINIDB_INSTALL_DIR/post/functions
test -f $COLUMNSTORE_INSTALL_DIR/post/functions && . $COLUMNSTORE_INSTALL_DIR/post/functions
scrname=`basename $0`
tname="check-syscat-oids"
@ -26,7 +26,7 @@ fi
#check for dbrm and data1, don't run if missing both
if firstboot; then
if [ -d $INFINIDB_INSTALL_DIR/data1/000.dir ]; then
if [ -d $COLUMNSTORE_INSTALL_DIR/data1/000.dir ]; then
cplogger -c 50 $scrname "$tname" "missing dbrm data with existing 000.dir"
exit 1
else

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

@ -2,17 +2,17 @@
#
# $Id: test-002.sh 2937 2012-05-30 18:17:09Z rdempsey $
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
test -f /etc/default/columnstore && . /etc/default/columnstore
fi
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
fi
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
test -f $INFINIDB_INSTALL_DIR/post/functions && . $INFINIDB_INSTALL_DIR/post/functions
test -f $COLUMNSTORE_INSTALL_DIR/post/functions && . $COLUMNSTORE_INSTALL_DIR/post/functions
scrname=`basename $0`
tname="check-brm"

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

@ -2,17 +2,17 @@
#
# $Id: test-003.sh 2937 2012-05-30 18:17:09Z rdempsey $
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
test -f /etc/default/columnstore && . /etc/default/columnstore
fi
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
fi
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
test -f $INFINIDB_INSTALL_DIR/post/functions && . $INFINIDB_INSTALL_DIR/post/functions
test -f $COLUMNSTORE_INSTALL_DIR/post/functions && . $COLUMNSTORE_INSTALL_DIR/post/functions
scrname=`basename $0`
tname="check-oid-bitmap"

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

@ -6,17 +6,17 @@
# Validates that FilesPerColumnPartition setting is not set lower than existing extents.
#
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
test -f /etc/default/columnstore && . /etc/default/columnstore
fi
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
fi
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
test -f $INFINIDB_INSTALL_DIR/post/functions && . $INFINIDB_INSTALL_DIR/post/functions
test -f $COLUMNSTORE_INSTALL_DIR/post/functions && . $COLUMNSTORE_INSTALL_DIR/post/functions
scrname=`basename $0`
tname="validate-partition-size"

22
oamapps/calpontSupport/findStranded.sh
View File

@ -4,35 +4,35 @@
# This script lists InfiniDBlpont data files that do not have associated extent map entries.
#
# NOTES:
# 1) Only looks in $INFINIDB_INSTALL_DIR/data* for the data files.
# 1) Only looks in $COLUMNSTORE_INSTALL_DIR/data* for the data files.
# 2) Only checks for an existing extent with a matching OID, doesn't validate that there is an
# existing extent for the exact segment.
#
# Close enough for hand grenades.
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
fi
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
if [ $INFINIDB_INSTALL_DIR != "/usr/local/mariadb/columnstore" ]; then
export PATH=$INFINIDB_INSTALL_DIR/bin:$INFINIDB_INSTALL_DIR/mysql/bin:/bin:/usr/bin
export LD_LIBRARY_PATH=$INFINIDB_INSTALL_DIR/lib:$INFINIDB_INSTALL_DIR/mysql/lib/mysql
if [ $COLUMNSTORE_INSTALL_DIR != "/usr/local/mariadb/columnstore" ]; then
export PATH=$COLUMNSTORE_INSTALL_DIR/bin:$COLUMNSTORE_INSTALL_DIR/mysql/bin:/bin:/usr/bin
export LD_LIBRARY_PATH=$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib/mysql
fi
cd $INFINIDB_INSTALL_DIR
cd $COLUMNSTORE_INSTALL_DIR
last=-1
existsInExtentMap=0
count=0
for i in $INFINIDB_INSTALL_DIR/data*/*/*/*/*/*/FILE*cdf; do
for i in $COLUMNSTORE_INSTALL_DIR/data*/*/*/*/*/*/FILE*cdf; do
let count++
oid=`$INFINIDB_INSTALL_DIR/bin/file2oid.pl $i`
oid=`$COLUMNSTORE_INSTALL_DIR/bin/file2oid.pl $i`
if [ $last -ne $oid ]; then
last=$oid
existsInExtentMap=`$INFINIDB_INSTALL_DIR/bin/editem -o $oid | wc -l`
existsInExtentMap=`$COLUMNSTORE_INSTALL_DIR/bin/editem -o $oid | wc -l`
fi
if [ $existsInExtentMap -le 0 ]; then
echo "Missing oid $oid path $i"

14
oamapps/calpontSupport/sqlLogs.sh
View File

@ -6,20 +6,20 @@
DB=idb_idb_sqllogs
TABLE=statements
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
fi
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
if [ $INFINIDB_INSTALL_DIR != "/usr/local/mariadb/columnstore" ]; then
export PATH=$INFINIDB_INSTALL_DIR/bin:$INFINIDB_INSTALL_DIR/mysql/bin:/bin:/usr/bin
export LD_LIBRARY_PATH=$INFINIDB_INSTALL_DIR/lib:$INFINIDB_INSTALL_DIR/mysql/lib/mysql
if [ $COLUMNSTORE_INSTALL_DIR != "/usr/local/mariadb/columnstore" ]; then
export PATH=$COLUMNSTORE_INSTALL_DIR/bin:$COLUMNSTORE_INSTALL_DIR/mysql/bin:/bin:/usr/bin
export LD_LIBRARY_PATH=$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib/mysql
fi
if [ -z "$MYSQLCMD" ]; then
MYSQLCMD="$INFINIDB_INSTALL_DIR/mysql/bin/mysql --defaults-file=$INFINIDB_INSTALL_DIR/mysql/my.cnf -u root"
MYSQLCMD="$COLUMNSTORE_INSTALL_DIR/mysql/bin/mysql --defaults-file=$COLUMNSTORE_INSTALL_DIR/mysql/my.cnf -u root"
export MYSQLCMD
fi

10
tools/setConfig/configxml.sh
View File

@ -4,17 +4,17 @@
#
#
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
test -f /etc/default/infinidb && . /etc/default/infinidb
fi
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
fi
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
InstallDir=$INFINIDB_INSTALL_DIR
InstallDir=$COLUMNSTORE_INSTALL_DIR
if [ $InstallDir != "/usr/local/mariadb/columnstore" ]; then
export PATH=$InstallDir/bin:$InstallDir/mysql/bin:/bin:/usr/bin

10
utils/idbhdfs/hdfs-12/setenv-hdfs-12
View File

@ -1,9 +1,9 @@
#!/bin/bash
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
fi
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
# Returns 0 if the specified string contains the specified substring,
# otherwise returns 1.
@ -158,8 +158,8 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$javalibpath
export JAVA_HOME=$JAVA_HOME
#set in config file
$INFINIDB_INSTALL_DIR/bin/setConfig -d Installation JavaHome $JAVA_HOME
$INFINIDB_INSTALL_DIR/bin/setConfig -d Installation JavaPath $javalibpath
$COLUMNSTORE_INSTALL_DIR/bin/setConfig -d Installation JavaHome $JAVA_HOME
$COLUMNSTORE_INSTALL_DIR/bin/setConfig -d Installation JavaPath $javalibpath
#run hadoop-config
. $HADOOP_LIBEXEC_DIR/hadoop-config.sh

10
utils/idbhdfs/hdfs-20/setenv-hdfs-20
View File

@ -1,9 +1,9 @@
#!/bin/bash
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore
if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
fi
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR
export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
# Returns 0 if the specified string contains the specified substring,
# otherwise returns 1.
@ -156,8 +156,8 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$javalibpath
export JAVA_HOME=$JAVA_HOME
#set in config file
$INFINIDB_INSTALL_DIR/bin/setConfig -d Installation JavaHome $JAVA_HOME
$INFINIDB_INSTALL_DIR/bin/setConfig -d Installation JavaPath $javalibpath
$COLUMNSTORE_INSTALL_DIR/bin/setConfig -d Installation JavaHome $JAVA_HOME
$COLUMNSTORE_INSTALL_DIR/bin/setConfig -d Installation JavaPath $javalibpath
#run hadoop-config
. $HADOOP_LIBEXEC_DIR/hadoop-config.sh

4
utils/startup/installdir.cpp
View File

@ -55,9 +55,9 @@ const string StartUp::installDir()
#else
fInstallDirp = new string("/usr/local/mariadb/columnstore");
//See if we can figure out the install dir in Linux...
//1. env var INFINIDB_INSTALL_DIR
//1. env var COLUMNSTORE_INSTALL_DIR
const char* p=0;
p = getenv("INFINIDB_INSTALL_DIR");
p = getenv("COLUMNSTORE_INSTALL_DIR");
if (p && *p)
*fInstallDirp = p;
//2. up one level from current binary location?