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

merge

Browse Source
This commit is contained in:
Justin Swanhart
2016-06-01 17:30:57 -04:00
parent f16c8a63e3 84eeae5a34
commit be45f0a40f
258 changed files with 1875 additions and 1273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/configMgt/autoConfigure.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -1456,7 +1456,7 @@ int main(int argc, char *argv[])
{
int id = *pt;
string DBrootID = "DBRoot" + oam.itoa(id);;
string pathID = "/usr/local/MariaDB/Columnstore/data" + oam.itoa(id);
string pathID = "/usr/local/mariadb/columnstore/data" + oam.itoa(id);
try {
sysConfigNew->setConfig(SystemSection, DBrootID, pathID);
@ -1528,7 +1528,7 @@ int main(int argc, char *argv[])
{
int id = *pt;
string DBrootID = "DBRoot" + oam.itoa(id);;
string pathID = "/usr/local/MariaDB/Columnstore/data" + oam.itoa(id);
string pathID = "/usr/local/mariadb/columnstore/data" + oam.itoa(id);
try {
sysConfigNew->setConfig(SystemSection, DBrootID, pathID);
@ -1596,7 +1596,7 @@ int main(int argc, char *argv[])
}
string DBrootID = "DBRoot" + oam.itoa(i);
string pathID = "/usr/local/MariaDB/Columnstore/data" + oam.itoa(i);
string pathID = "/usr/local/mariadb/columnstore/data" + oam.itoa(i);
try {
sysConfigNew->setConfig(SystemSection, DBrootID, pathID);

4
tools/configMgt/autoInstaller.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -197,7 +197,7 @@ int main(int argc, char *argv[])
if ( product == "columnstore" ) {
company = "MariaDB-Columnstore";
calpontPackagename = "mariadb-columnstore";
installLocation = "/MariaDB/Columnstore";
installLocation = "/mariadb/columnstore";
adminCommand = "mcsadmin";
}
else if ( product != "infinidb" )

6
tools/configMgt/configure.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -213,7 +213,7 @@ int main(int argc, char *argv[])
exit (-1);
}
cmd = "./remote_scp_get.sh " + parentOAMModuleIPAddr + " " + password + " /usr/local/MariaDB/Columnstore/etc/Calpont.xml 0 ";
cmd = "./remote_scp_get.sh " + parentOAMModuleIPAddr + " " + password + " /usr/local/mariadb/columnstore/etc/Calpont.xml 0 ";
rtnCode = system(cmd.c_str());
if (rtnCode == 0) {
cmd = "mv Calpont.xml systems/" + systemName + "/.";
@ -507,7 +507,7 @@ int main(int argc, char *argv[])
}
string DBrootID = "DBRoot" + oam.itoa(i);
string pathID = "/usr/local/MariaDB/Columnstore/data" + oam.itoa(i);
string pathID = "/usr/local/mariadb/columnstore/data" + oam.itoa(i);
try {
sysConfig->setConfig(SystemSection, DBrootID, pathID);

6
tools/configMgt/dm_parent_installer_v3.sh
View File

@ -143,7 +143,7 @@ if { $CONFIGFILE != "NULL"} {
# copy over Calpont.xml file
#
send_user "Copy Calpont Configuration File "
send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/MariaDB/Columnstore/etc/Calpont.xml.rpmsave\n"
send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/mariadb/columnstore/etc/Calpont.xml.rpmsave\n"
expect -re "word: "
# send the password
send "$PASSWORD\n"
@ -153,7 +153,7 @@ if { $CONFIGFILE != "NULL"} {
-re "Permission denied, please try again" { send_user "FAILED: Invalid password\n" ; exit -1 }
-re "No such file or directory" { send_user "FAILED: Invalid package\n" ; exit -1 }
}
send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/MariaDB/Columnstore/etc/Calpont.xml\n"
send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/mariadb/columnstore/etc/Calpont.xml\n"
expect -re "word: "
# send the password
send "$PASSWORD\n"
@ -175,7 +175,7 @@ if { $CONFIGFILE != "NULL"} {
# rename previous installed config file
#
send_user "Copy RPM-saved Calpont Configuration File "
send "ssh $USERNAME@$SERVER 'cd /usr/local/MariaDB/Columnstore/etc/;mv -f Calpont.xml Calpont.xml.install;cp -v Calpont.xml.rpmsave Calpont.xml'\n"
send "ssh $USERNAME@$SERVER 'cd /usr/local/mariadb/columnstore/etc/;mv -f Calpont.xml Calpont.xml.install;cp -v Calpont.xml.rpmsave Calpont.xml'\n"
expect -re "word: "
# password for ssh
send "$PASSWORD\n"

4
tools/configMgt/parent_installer.sh
View File

@ -189,7 +189,7 @@ if { $CONFIGFILE != "NULL"} {
# copy over Calpont.xml file
#
send_user "Copy Calpont Configuration File "
send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/MariaDB/Columnstore/etc/Calpont.xml\n"
send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/mariadb/columnstore/etc/Calpont.xml\n"
expect -re "word: "
# send the password
send "$PASSWORD\n"
@ -206,7 +206,7 @@ if { $CONFIGFILE != "NULL"} {
# rename previous installed config file
#
send_user "Copy RPM-saved Calpont Configuration File "
send "ssh $USERNAME@$SERVER 'cd /usr/local/MariaDB/Columnstore/etc/;mv -f Calpont.xml Calpont.xml.install;cp -v Calpont.xml.rpmsave Calpont.xml'\n"
send "ssh $USERNAME@$SERVER 'cd /usr/local/mariadb/columnstore/etc/;mv -f Calpont.xml Calpont.xml.install;cp -v Calpont.xml.rpmsave Calpont.xml'\n"
expect -re "word: "
# password for ssh
send "$PASSWORD\n"

6
tools/configMgt/pm_parent_installer_v3.sh
View File

@ -130,7 +130,7 @@ if { $CONFIGFILE != "NULL"} {
# copy over Calpont.xml file
#
send_user "Copy Calpont Configuration File "
send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/MariaDB/Columnstore/etc/Calpont.xml.rpmsave\n"
send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/mariadb/columnstore/etc/Calpont.xml.rpmsave\n"
expect -re "word: "
# send the password
send "$PASSWORD\n"
@ -140,7 +140,7 @@ if { $CONFIGFILE != "NULL"} {
-re "Permission denied, please try again" { send_user "FAILED: Invalid password\n" ; exit -1 }
-re "No such file or directory" { send_user "FAILED: Invalid package\n" ; exit -1 }
}
send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/MariaDB/Columnstore/etc/Calpont.xml\n"
send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/mariadb/columnstore/etc/Calpont.xml\n"
expect -re "word: "
# send the password
send "$PASSWORD\n"
@ -162,7 +162,7 @@ if { $CONFIGFILE != "NULL"} {
# rename previous installed config file
#
send_user "Copy RPM-saved Calpont Configuration File "
send "ssh $USERNAME@$SERVER 'cd /usr/local/MariaDB/Columnstore/etc/;mv -f Calpont.xml Calpont.xml.install;cp -v Calpont.xml.rpmsave Calpont.xml'\n"
send "ssh $USERNAME@$SERVER 'cd /usr/local/mariadb/columnstore/etc/;mv -f Calpont.xml Calpont.xml.install;cp -v Calpont.xml.rpmsave Calpont.xml'\n"
expect -re "word: "
# password for ssh
send "$PASSWORD\n"

2
tools/configMgt/stackReleaseChecker.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
tools/evalidx/checkidx.py
View File

@ -9,7 +9,7 @@ def find_paths():
config_file = os.environ['CALPONT_CONFIG_FILE']
except KeyError:
try:
config_file = '/usr/local/MariaDB/Columnstore/etc'
config_file = '/usr/local/mariadb/columnstore/etc'
os.lstat(config_file)
except:
sys.exit('No config file available')

2
tools/hdfsCheck/hdfsCheck.cpp
View File

@ -241,7 +241,7 @@ bool TestRunner::runTest( IDBDataFile::Types filetype, unsigned open_opts )
for( int i = 0; i < m_opts.numDbRoots; ++i )
{
ostringstream dbroot;
dbroot << "/usr/local/MariaDB/Columnstore/data" << i+1;
dbroot << "/usr/local/mariadb/columnstore/data" << i+1;
if( !fs.exists(dbroot.str().c_str()) )
{
ostringstream msg;

2
tools/reserveStacks/stack
View File

@ -37,7 +37,7 @@ elif [ $(expr 'release' : "$cmd") -gt 2 ]; then
INST=$4
fi
if [ -z "$INSTALLDIR" ]; then
INSTALLDIR="/usr/local/MariaDB/Columnstore"
INSTALLDIR="/usr/local/mariadb/columnstore"
if [ $INST ]; then
INSTALLDIR=$INST
fi

4
tools/setConfig/configxml.sh
View File

@ -9,14 +9,14 @@ if [ -z "$INFINIDB_INSTALL_DIR" ]; then
fi
if [ -z "$INFINIDB_INSTALL_DIR" ]; then
INFINIDB_INSTALL_DIR=/usr/local/MariaDB/Columnstore
INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore
fi
export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR
InstallDir=$INFINIDB_INSTALL_DIR
if [ $InstallDir != "/usr/local/MariaDB/Columnstore" ]; then
if [ $InstallDir != "/usr/local/mariadb/columnstore" ]; then
export PATH=$InstallDir/bin:$InstallDir/mysql/bin:/bin:/usr/bin
export LD_LIBRARY_PATH=$InstallDir/lib:$InstallDir/mysql/lib/mysql
fi