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
utils/autoconf/INSTALL
View File

@ -4,7 +4,7 @@ Installation Instructions
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
Software Foundation, Inc.
Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB, Corporation
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@ -43,10 +43,10 @@ the entire Calpont directory tree there.
After untaring the sofware or installing the RPM's, setup the software
to run (this script needs to run with root privileges). Check the Installation
Guide for addition details on using postConfigure:
/usr/local/MariaDB/Columnstore/bin/postConfigure
/usr/local/mariadb/columnstore/bin/postConfigure
Setup some aliases:
. /usr/local/MariaDB/Columnstore/bin/columnsoreAlias
. /usr/local/mariadb/columnstore/bin/columnsoreAlias
Connect to MySQL:
idbmysql
@ -70,7 +70,7 @@ To use bulk load:
200|2002|
2. Save/place this file in a directory.
3. From that same directory, import the rows:
/usr/local/MariaDB/Columnstore/bin/cpimport calpont caltest caltest.tbl
/usr/local/mariadb/columnstore/bin/cpimport calpont caltest caltest.tbl
And check the import:
calpontmysql calpont

16
utils/autoconf/README
View File

@ -3,8 +3,8 @@ To build the software from source, consult the file INSTALL.
Brief Install Instructions:
1. Install the 3 MariaDB Columnstore RPMs.
2. Install and start the software, run: /usr/local/MariaDB/Columnstore/bin/postConfigure
3. Setup some aliases: . /usr/local/MariaDB/Columnstore/bin/MariaDB ColumnstoreAlias
2. Install and start the software, run: /usr/local/mariadb/columnstore/bin/postConfigure
3. Setup some aliases: . /usr/local/mariadb/columnstore/bin/MariaDB ColumnstoreAlias
4. Connect to MySQL: idbmysql
5. Try the test in step 12 below
@ -21,7 +21,7 @@ Detailed Installation Instructions:
tar xvf MariaDB Columnstore-2.2.0-2.x86_64.rpm.tar.gz
4. Install the 3 RPMs in this order, the MariaDB Columnstore software will be installed in
/usr/local/MariaDB/Columnstore.
/usr/local/mariadb/columnstore.
rpm -ivh infinidb-libs-2.2.0-2.x86_64.rpm
rpm -ivh infinidb-platform-2.2.0-2.x86_64.rpm
@ -31,19 +31,19 @@ Detailed Installation Instructions:
5a.To configure and run on a single server system utilizing local disk storage,
run install script:
/usr/local/MariaDB/Columnstore/bin/postConfigure
/usr/local/mariadb/columnstore/bin/postConfigure
5b.To configure and run on a multi-server system and/or to utilize a SAN storage
system, follow the instructions in the MariaDB Columnstore Installation Guide.
/usr/local/MariaDB/Columnstore/bin/postConfigure
/usr/local/mariadb/columnstore/bin/postConfigure
6. Ports utilized by the MariaDB Columnstore Software
The MariaDB Columnstore MySQL daemon utilizes port 3306. To use a different port, update
the 2 locations in the following file:
/usr/local/MariaDB/Columnstore/mysql/my.cnf
/usr/local/mariadb/columnstore/mysql/my.cnf
port = 3306
port = 3306
@ -53,7 +53,7 @@ Detailed Installation Instructions:
8600 - 8622, 8700, and 8800
7. Setup some aliases:
. /usr/local/MariaDB/Columnstore/bin/MariaDB ColumnstoreAlias
. /usr/local/mariadb/columnstore/bin/MariaDB ColumnstoreAlias
8. To manually start and stop the MariaDB Columnstore Software as the root user run:
@ -127,7 +127,7 @@ Detailed Installation Instructions:
mysql>
12. Run the following upgrade script to create calponsys schema and upgrade the syscolumn table: /usr/local/MariaDB/Columnstore/bin/upgrade-infinidb.sh
12. Run the following upgrade script to create calponsys schema and upgrade the syscolumn table: /usr/local/mariadb/columnstore/bin/upgrade-infinidb.sh
13. As an example to get you started, try this:

2
utils/funcexp/func_from_unixtime.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
utils/funcexp/func_nullif.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
utils/idbhdfs/hdfs-12/setenv-hdfs-12
View File

@ -1,6 +1,6 @@
#!/bin/bash
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

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

@ -1,6 +1,6 @@
#!/bin/bash
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

8
utils/infinidb_hadoop/infinidb_hadoop_bulkload.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh
export LD_LIBRARY_PATH=/usr/local/MariaDB/Columnstore/lib:$LD_LIBRARY_PATH
export CALPONT_CONFIG_FILE=/usr/local/MariaDB/Columnstore/etc/Calpont.xml
export PATH=$PATH:/usr/local/hadoop-0.20.2/bin:/usr/local/MariaDB/Columnstore/bin
export CALPONT_HOME=/usr/local/MariaDB/Columnstore/etc
export LD_LIBRARY_PATH=/usr/local/mariadb/columnstore/lib:$LD_LIBRARY_PATH
export CALPONT_CONFIG_FILE=/usr/local/mariadb/columnstore/etc/Calpont.xml
export PATH=$PATH:/usr/local/hadoop-0.20.2/bin:/usr/local/mariadb/columnstore/bin
export CALPONT_HOME=/usr/local/mariadb/columnstore/etc
hadoop dfs -cat $1 | cpimport $2 $3

2
utils/infinidb_hadoop/src/infinidb/hadoop/example/InfiniDBOutputDriver.java
View File

@ -63,7 +63,7 @@ public class InfiniDBOutputDriver extends Configured implements Tool
InfiniDBConfiguration idbconf = new InfiniDBConfiguration(jobconf);
idbconf.setInputPath("input");
idbconf.setOutputPath("output");
idbconf.setInfiniDBHome("/usr/local/MariaDB/Columnstore");
idbconf.setInfiniDBHome("/usr/local/mariadb/columnstore");
jobconf.setMapperClass(InfiniDoopMapper.class);
jobconf.setNumMapTasks(1);

2
utils/loggingcpp/errorids.h
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
utils/loggingcpp/messagelog.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

4
utils/loggingcpp/tdriver.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
@ -195,7 +195,7 @@ void m4()
//------------------------------------------------------------------------------
// This method is intended to test the messages used to profile db performance.
// The method also provides an example on how to use these log messages.
// Test can be verified by viewing /var/log/Columnstore/debug.log.
// Test can be verified by viewing /var/log/mariadb/columnstore/debug.log.
//
// Message types are:
//

12
utils/net-snmp/net-snmp-config.h
View File

@ -30,7 +30,7 @@
/* default location to look for mibs to load using the above tokens
and/or those in the MIBS envrionment variable*/
#define DEFAULT_MIBDIRS "$HOME/.snmp/mibs:/usr/local/MariaDB/Columnstore/share/snmp/mibs"
#define DEFAULT_MIBDIRS "$HOME/.snmp/mibs:/usr/local/mariadb/columnstore/share/snmp/mibs"
/* default mib files to load, specified by path. */
/* #undef DEFAULT_MIBFILES */
@ -107,10 +107,10 @@
/* #undef DEFAULT_CLIENT_RECV_BUF */
/* SNMPLIBDIR contains important files */
#define SNMPLIBPATH "/usr/local/MariaDB/Columnstore/lib/snmp"
#define SNMPSHAREPATH "/usr/local/MariaDB/Columnstore/share/snmp"
#define SNMPCONFPATH "/usr/local/MariaDB/Columnstore/etc/snmp"
#define SNMPDLMODPATH "/usr/local/MariaDB/Columnstore/lib/snmp/dlmod"
#define SNMPLIBPATH "/usr/local/mariadb/columnstore/lib/snmp"
#define SNMPSHAREPATH "/usr/local/mariadb/columnstore/share/snmp"
#define SNMPCONFPATH "/usr/local/mariadb/columnstore/etc/snmp"
#define SNMPDLMODPATH "/usr/local/mariadb/columnstore/lib/snmp/dlmod"
/* LOGFILE: If defined it closes stdout/err/in and opens this in out/err's
place. (stdin is closed so that sh scripts won't wait for it) */
@ -1339,7 +1339,7 @@
#define LASTFIELD -1 /* internal define */
/* configure options specified */
#define CONFIGURE_OPTIONS "\"'--prefix=/usr/local/MariaDB/Columnstore' '--with-mib-modules=disman/event-mib' '--with-cc=gcc'\""
#define CONFIGURE_OPTIONS "\"'--prefix=/usr/local/mariadb/columnstore' '--with-mib-modules=disman/event-mib' '--with-cc=gcc'\""
/* got socklen_t? */
#define HAVE_SOCKLEN_T 1

6
utils/prat/copy2here.sh
View File

@ -10,7 +10,7 @@
#*
#******************************************************************************/
CTOOLS=/usr/local/MariaDB/Columnstore/tools
CTOOLS=/usr/local/mariadb/columnstore/tools
localhost=$(hostname -s)
#
@ -38,9 +38,9 @@ while read moduletype hostname hostdir; do
echo Collecting files on remote host $servername
echo " and copying them to this server"
tarfile=$hostdir.tar
/usr/local/MariaDB/Columnstore/bin/remote_command.sh $servername $srvpwd "$CTOOLS/tarfiles.sh $hostdir $tarfile"
/usr/local/mariadb/columnstore/bin/remote_command.sh $servername $srvpwd "$CTOOLS/tarfiles.sh $hostdir $tarfile"
cd $CTOOLS/data
/usr/local/MariaDB/Columnstore/bin/remote_scp_get.sh $servername $srvpwd $CTOOLS/data/$tarfile
/usr/local/mariadb/columnstore/bin/remote_scp_get.sh $servername $srvpwd $CTOOLS/data/$tarfile
fi
done
fi

10
utils/prat/getlogs.sh
View File

@ -10,12 +10,12 @@
#* hostdir - directory name for this run
#******************************************************************************/
CTOOLS=/usr/local/MariaDB/Columnstore/tools
CTOOLS=/usr/local/mariadb/columnstore/tools
date=$1
hostdir=$2
localhost=$(hostname -s)
modulename=`cat /usr/local/MariaDB/Columnstore/local/module`
modulename=`cat /usr/local/mariadb/columnstore/local/module`
currentdate=`date +%d`
if [ -f /tmp/.prat/.hostlist2.txt ]; then
sc=`wc -l < /tmp/.prat/.hostlist2.txt`
@ -45,15 +45,15 @@ readserverlist ()
#
getlogsremote ()
{ # Send the command to the remote module(s) to copy the Calpont logs
/usr/local/MariaDB/Columnstore/bin/remote_command.sh $servername $srvpwd "$CTOOLS/getlogs.sh $date $hostdir"
/usr/local/mariadb/columnstore/bin/remote_command.sh $servername $srvpwd "$CTOOLS/getlogs.sh $date $hostdir"
}
#
getlogslocal ()
{ mkdir -p $CTOOLS/data/$hostdir/logs
if [ $date = $currentdate ]; then
cp -r /var/log/Columnstore/* /usr/local/MariaDB/Columnstore/tools/data/$hostdir/logs
cp -r /var/log/mariadb/columnstore/* /usr/local/mariadb/columnstore/tools/data/$hostdir/logs
else
find /var/log/Columnstore -type f -name "*$date" -exec sh -c 'exec cp -f "$@" '$CTOOLS/data/$hostdir/logs'' find-copy {} +
find /var/log/mariadb/columnstore -type f -name "*$date" -exec sh -c 'exec cp -f "$@" '$CTOOLS/data/$hostdir/logs'' find-copy {} +
fi
}
#

4
utils/prat/getmodules.sh
View File

@ -10,7 +10,7 @@
#*
#***************************************************************************/
#
moduletype=`cat /usr/local/MariaDB/Columnstore/local/module`
moduletype=`cat /usr/local/mariadb/columnstore/local/module`
hostdir=`date +%Y%m%d%H%M%S`
#
# Module check
@ -35,7 +35,7 @@ then
fi
# issue Calpont console command and send the output to a file
/usr/local/MariaDB/Columnstore/bin/mcsadmin getsystemnetworkconfig ACK_YES |
/usr/local/mariadb/columnstore/bin/mcsadmin getsystemnetworkconfig ACK_YES |
egrep -w 'Director|User|Performance' |
awk -F" " '{print $1"\t" $2"\t" $3"\t" $4"\t" $6}' > /tmp/modulelist.txt
#

6
utils/prat/getps.sh
View File

@ -12,14 +12,14 @@
#*
#******************************************************************************/
CTOOLS=/usr/local/MariaDB/Columnstore/tools
CTOOLS=/usr/local/mariadb/columnstore/tools
date=$1
starttime=$2
endtime=$3
hostdir=$4
localhost=$(hostname -s)
modulename=`cat /usr/local/MariaDB/Columnstore/local/module`
modulename=`cat /usr/local/mariadb/columnstore/local/module`
if [ -f /tmp/.prat/.hostlist2.txt ]; then
sc=`wc -l < /tmp/.prat/.hostlist2.txt`
else
@ -48,7 +48,7 @@ readserverlist ()
#
getpsremote ()
{ # Send the command to the remote module(s) to extract ps data
/usr/local/MariaDB/Columnstore/bin/remote_command.sh $servername $srvpwd "$CTOOLS/getps.sh $date $starttime $endtime $hostdir"
/usr/local/mariadb/columnstore/bin/remote_command.sh $servername $srvpwd "$CTOOLS/getps.sh $date $starttime $endtime $hostdir"
}
#
getpslocal ()

6
utils/prat/getsar.sh
View File

@ -11,14 +11,14 @@
#* hostdir - directory name for this run
#******************************************************************************/
CTOOLS=/usr/local/MariaDB/Columnstore/tools
CTOOLS=/usr/local/mariadb/columnstore/tools
date=$1
starttime=$2
endtime=$3
hostdir=$4
localhost=$(hostname -s)
modulename=`cat /usr/local/MariaDB/Columnstore/local/module`
modulename=`cat /usr/local/mariadb/columnstore/local/module`
if [ -f /tmp/.prat/.hostlist2.txt ]; then
sc=`wc -l < /tmp/.prat/.hostlist2.txt`
else
@ -47,7 +47,7 @@ readserverlist ()
#
getsarremote ()
{ # Send the sar extraction statments to the remote module
/usr/local/MariaDB/Columnstore/bin/remote_command.sh $servername $srvpwd "$CTOOLS/getsar.sh $date $starttime $endtime $hostdir"
/usr/local/mariadb/columnstore/bin/remote_command.sh $servername $srvpwd "$CTOOLS/getsar.sh $date $starttime $endtime $hostdir"
}
#
getsarlocal ()

2
utils/prat/getuserinput.sh
View File

@ -8,7 +8,7 @@
#* Parameter: None
#******************************************************************************/
CTOOLS=/usr/local/MariaDB/Columnstore/tools
CTOOLS=/usr/local/mariadb/columnstore/tools
getuserinput ()
{ echo -n "Enter the two digit day of the month for the desired timeframe > "

2
utils/prat/prat.sh
View File

@ -8,7 +8,7 @@
#* Parameter: None
#******************************************************************************/
CTOOLS=/usr/local/MariaDB/Columnstore/tools
CTOOLS=/usr/local/mariadb/columnstore/tools
# Retrieve the names of servers in this Calpont stack
$CTOOLS/getmodules.sh

2
utils/prat/tarfiles.sh
View File

@ -15,7 +15,7 @@ hostdir=$1
tarfile=$2
#
# tar the files
cd /usr/local/MariaDB/Columnstore/tools/data
cd /usr/local/mariadb/columnstore/tools/data
tar -cf $tarfile $hostdir
#
# End of Script

64
utils/scenarios/common/sh/bulkExecResult.sh
View File

@ -12,25 +12,25 @@ function getTestInfo {
function copySQLResultFiles {
#
rm -f /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestSummary.*
rm -f /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestTime.*
rm -f /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestStats.*
rm -f /usr/local/mariadb/columnstore/data/bulk/data/import/TestSummary.*
rm -f /usr/local/mariadb/columnstore/data/bulk/data/import/TestTime.*
rm -f /usr/local/mariadb/columnstore/data/bulk/data/import/TestStats.*
#
cp -f testResultSummary.txt /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestSummary.tbl
cp -f testResultTime.txt /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestTime.tbl
cp -f testResultStats.txt /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestStats.tbl
cp -f testResultSummary.txt /usr/local/mariadb/columnstore/data/bulk/data/import/TestSummary.tbl
cp -f testResultTime.txt /usr/local/mariadb/columnstore/data/bulk/data/import/TestTime.tbl
cp -f testResultStats.txt /usr/local/mariadb/columnstore/data/bulk/data/import/TestStats.tbl
}
function CalLoadSQLTestResult {
#
/usr/local/MariaDB/Columnstore/bin/colxml perfstats -t TestSummary -j 1001
/usr/local/MariaDB/Columnstore/bin/colxml perfstats -t TestTime -j 1002
/usr/local/MariaDB/Columnstore/bin/colxml perfstats -t TestStats -j 1003
/usr/local/mariadb/columnstore/bin/colxml perfstats -t TestSummary -j 1001
/usr/local/mariadb/columnstore/bin/colxml perfstats -t TestTime -j 1002
/usr/local/mariadb/columnstore/bin/colxml perfstats -t TestStats -j 1003
#
/usr/local/MariaDB/Columnstore/bin/cpimport -j 1001
/usr/local/MariaDB/Columnstore/bin/cpimport -j 1002
/usr/local/MariaDB/Columnstore/bin/cpimport -j 1003
/usr/local/mariadb/columnstore/bin/cpimport -j 1001
/usr/local/mariadb/columnstore/bin/cpimport -j 1002
/usr/local/mariadb/columnstore/bin/cpimport -j 1003
}
#
function MySQLLoadSQLTestResult {
@ -47,38 +47,38 @@ function MySQLLoadSQLTestResult {
#=========================================================================================
function CalLoadSQLTestResult {
#
rm -f /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestSummary.*
rm -f /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestTime.*
rm -f /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestStats.*
rm -f /usr/local/mariadb/columnstore/data/bulk/data/import/TestSummary.*
rm -f /usr/local/mariadb/columnstore/data/bulk/data/import/TestTime.*
rm -f /usr/local/mariadb/columnstore/data/bulk/data/import/TestStats.*
#
/usr/local/MariaDB/Columnstore/bin/colxml perfstats -t TestSummary -j 1001
/usr/local/MariaDB/Columnstore/bin/colxml perfstats -t TestTime -j 1002
/usr/local/MariaDB/Columnstore/bin/colxml perfstats -t TestStats -j 1003
/usr/local/mariadb/columnstore/bin/colxml perfstats -t TestSummary -j 1001
/usr/local/mariadb/columnstore/bin/colxml perfstats -t TestTime -j 1002
/usr/local/mariadb/columnstore/bin/colxml perfstats -t TestStats -j 1003
#
cp -f testResultSummary.txt /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestSummary.tbl
cp -f testResultTime.txt /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestTime.tbl
cp -f testResultStats.txt /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestStats.tbl
cp -f testResultSummary.txt /usr/local/mariadb/columnstore/data/bulk/data/import/TestSummary.tbl
cp -f testResultTime.txt /usr/local/mariadb/columnstore/data/bulk/data/import/TestTime.tbl
cp -f testResultStats.txt /usr/local/mariadb/columnstore/data/bulk/data/import/TestStats.tbl
#
/usr/local/MariaDB/Columnstore/bin/cpimport -j 1001
/usr/local/MariaDB/Columnstore/bin/cpimport -j 1002
/usr/local/MariaDB/Columnstore/bin/cpimport -j 1003
/usr/local/mariadb/columnstore/bin/cpimport -j 1001
/usr/local/mariadb/columnstore/bin/cpimport -j 1002
/usr/local/mariadb/columnstore/bin/cpimport -j 1003
}
#=========================================================================================
# cpimport bulk test results
#=========================================================================================
function CalLoadBulkTestResult {
#
rm -f /usr/local/MariaDB/Columnstore/data/bulk/data/import/BulkSummary.*
rm -f /usr/local/MariaDB/Columnstore/data/bulk/data/import/BulkTime.*
rm -f /usr/local/mariadb/columnstore/data/bulk/data/import/BulkSummary.*
rm -f /usr/local/mariadb/columnstore/data/bulk/data/import/BulkTime.*
#
/usr/local/MariaDB/Columnstore/bin/colxml perfstats -t BulkSummary -j 1001
/usr/local/MariaDB/Columnstore/bin/colxml perfstats -t BulkStats -j 1002
/usr/local/mariadb/columnstore/bin/colxml perfstats -t BulkSummary -j 1001
/usr/local/mariadb/columnstore/bin/colxml perfstats -t BulkStats -j 1002
#
cp -f testResultSummary.txt /usr/local/MariaDB/Columnstore/data/bulk/data/import/BulkSummary.tbl
cp -f testResultTime.txt /usr/local/MariaDB/Columnstore/data/bulk/data/import/BulkStats.tbl
cp -f testResultSummary.txt /usr/local/mariadb/columnstore/data/bulk/data/import/BulkSummary.tbl
cp -f testResultTime.txt /usr/local/mariadb/columnstore/data/bulk/data/import/BulkStats.tbl
#
/usr/local/MariaDB/Columnstore/bin/cpimport -j 1001
/usr/local/MariaDB/Columnstore/bin/cpimport -j 1002
/usr/local/mariadb/columnstore/bin/cpimport -j 1001
/usr/local/mariadb/columnstore/bin/cpimport -j 1002
}
#=========================================================================================

2
utils/scenarios/common/sh/execSQLScript_m.sh
View File

@ -22,5 +22,5 @@
#
# Execute script on test database
#
/usr/local/MariaDB/Columnstore/mysql/bin/mysql --defaults-file=/usr/local/MariaDB/Columnstore/mysql/my.cnf -f -u root $1 <$6 > $logFileName.test.log 2>&1
/usr/local/mariadb/columnstore/mysql/bin/mysql --defaults-file=/usr/local/mariadb/columnstore/mysql/my.cnf -f -u root $1 <$6 > $logFileName.test.log 2>&1
diff $logFileName.ref.log $logFileName.test.log > $logFileName.diff.log

20
utils/scenarios/common/sh/restore100gb.sh
View File

@ -3,17 +3,17 @@
#=========================================================================================
mount /dev/sdj1 /mnt/qadbs
#
rm -rf /usr/local/MariaDB/Columnstore/data1/000.dir
rm -rf /usr/local/MariaDB/Columnstore/data2/000.dir
rm -rf /usr/local/MariaDB/Columnstore/data3/000.dir
rm -rf /usr/local/MariaDB/Columnstore/data4/000.dir
rm -f /usr/local/MariaDB/Columnstore/data1/systemFiles/dbrm/*
rm -rf /usr/local/mariadb/columnstore/data1/000.dir
rm -rf /usr/local/mariadb/columnstore/data2/000.dir
rm -rf /usr/local/mariadb/columnstore/data3/000.dir
rm -rf /usr/local/mariadb/columnstore/data4/000.dir
rm -f /usr/local/mariadb/columnstore/data1/systemFiles/dbrm/*
#
cp /mnt/qadbs/tpch/1m-1-10-100/dbrm/* /usr/local/MariaDB/Columnstore/data1/systemFiles/dbrm
cp /mnt/qadbs/tpch/1m-1-10-100/dbrm/* /usr/local/mariadb/columnstore/data1/systemFiles/dbrm
#
cp -r /mnt/qadbs/tpch/1m-1-10-100/data1/000.dir /usr/local/MariaDB/Columnstore/data1 &
cp -r /mnt/qadbs/tpch/1m-1-10-100/data2/000.dir /usr/local/MariaDB/Columnstore/data2 &
cp -r /mnt/qadbs/tpch/1m-1-10-100/data3/000.dir /usr/local/MariaDB/Columnstore/data3 &
cp -r /mnt/qadbs/tpch/1m-1-10-100/data4/000.dir /usr/local/MariaDB/Columnstore/data4 &
cp -r /mnt/qadbs/tpch/1m-1-10-100/data1/000.dir /usr/local/mariadb/columnstore/data1 &
cp -r /mnt/qadbs/tpch/1m-1-10-100/data2/000.dir /usr/local/mariadb/columnstore/data2 &
cp -r /mnt/qadbs/tpch/1m-1-10-100/data3/000.dir /usr/local/mariadb/columnstore/data3 &
cp -r /mnt/qadbs/tpch/1m-1-10-100/data4/000.dir /usr/local/mariadb/columnstore/data4 &
#

12
utils/scenarios/common/sh/testExecEngine.sh
View File

@ -59,11 +59,11 @@ function logEnvInfo {
# $1 = test run
# $2 = a or b, b=before test run, a=after test run
#
cp /usr/local/MariaDB/Columnstore/etc/Calpont.xml $1/.
/usr/local/MariaDB/Columnstore/bin/mcsadmin getcalpontsoftwareinfo > $1/getcalpontsoftwareinfo.log
/usr/local/MariaDB/Columnstore/bin/mcsadmin getsystemstatus > $1/getSystemStatus.$2.log
/usr/local/MariaDB/Columnstore/bin/mcsadmin getsystemnetwork > $1/getSystemNetwork.$2.log
/usr/local/MariaDB/Columnstore/bin/mcsadmin getprocessstatus > $1/getProcessStatus.$2.log
cp /usr/local/mariadb/columnstore/etc/Calpont.xml $1/.
/usr/local/mariadb/columnstore/bin/mcsadmin getcalpontsoftwareinfo > $1/getcalpontsoftwareinfo.log
/usr/local/mariadb/columnstore/bin/mcsadmin getsystemstatus > $1/getSystemStatus.$2.log
/usr/local/mariadb/columnstore/bin/mcsadmin getsystemnetwork > $1/getSystemNetwork.$2.log
/usr/local/mariadb/columnstore/bin/mcsadmin getprocessstatus > $1/getProcessStatus.$2.log
}
#=========================================================================================
# log environment info
@ -186,7 +186,7 @@ function execOneTestRun {
fi
if [ $dbmsType = "M" ]; then
pathSfn=$1\/$sess
/usr/local/MariaDB/Columnstore/mysql/bin/mysql --defaults-file=/usr/local/MariaDB/Columnstore/mysql/my.cnf -u root $testDB <$sfn 2> $pathSfn\/$sfn.err.log |grep "^Calpont" > $pathSfn\/$sfn.log &
/usr/local/mariadb/columnstore/mysql/bin/mysql --defaults-file=/usr/local/mariadb/columnstore/mysql/my.cnf -u root $testDB <$sfn 2> $pathSfn\/$sfn.err.log |grep "^Calpont" > $pathSfn\/$sfn.log &
else
su - oracle -c "sqlplus /nolog @/home/qa/srv/common/script/callogin.sql $testDB $testDB xe srvqaperf2 <$sfn" |grep "^Calpont" > $1\/$sess\/$sfn.log &
fi

2
utils/scenarios/common/sql/load_TestStats.sql
View File

@ -4,7 +4,7 @@
* Author: Joseph Williams
* Purpose: Script to load the performance test result from a CSV file.
******************************************************************************/
LOAD DATA INFILE '/usr/local/MariaDB/Columnstore/data/bulk/data/import/TestStats.tbl'
LOAD DATA INFILE '/usr/local/mariadb/columnstore/data/bulk/data/import/TestStats.tbl'
INTO TABLE TestStats
FIELDS
TERMINATED BY '|'

2
utils/scenarios/common/sql/load_TestSummary.sql
View File

@ -4,7 +4,7 @@
* Author: Joseph Williams
* Purpose: Script to load the performance test result from a CSV file.
******************************************************************************/
LOAD DATA INFILE '/usr/local/MariaDB/Columnstore/data/bulk/data/import/TestSummary.tbl'
LOAD DATA INFILE '/usr/local/mariadb/columnstore/data/bulk/data/import/TestSummary.tbl'
INTO TABLE TestSummary
FIELDS
TERMINATED BY '|'

2
utils/scenarios/common/sql/load_TestTime.sql
View File

@ -4,7 +4,7 @@
* Author: Joseph Williams
* Purpose: Script to load the performance test result from a CSV file.
******************************************************************************/
LOAD DATA INFILE '/usr/local/MariaDB/Columnstore/data/bulk/data/import/TestTime.tbl'
LOAD DATA INFILE '/usr/local/mariadb/columnstore/data/bulk/data/import/TestTime.tbl'
INTO TABLE TestTime
FIELDS
TERMINATED BY '|'

14
utils/scenarios/dwweek/test/dwSubmitCpimport.sh
View File

@ -22,13 +22,13 @@
echo \#!/bin/bash > $bulkScriptName
echo \# >> $bulkScriptName
#
echo rm -f /usr/local/MariaDB/Columnstore/data/bulk/log/Jobxml_9999.log >> $bulkScriptName
echo rm -f /usr/local/MariaDB/Columnstore/data/bulk/log/Job_9999.log >> $bulkScriptName
echo /usr/local/MariaDB/Columnstore/bin/colxml $testDB -t lineitem -l $sourceFileName -j 9999 >> $bulkScriptName
echo /usr/local/MariaDB/Columnstore/bin/cpimport -j 9999 >> $bulkScriptName
echo cp /usr/local/MariaDB/Columnstore/data/bulk/job/Job_9999.xml . >> $bulkScriptName
echo cp /usr/local/MariaDB/Columnstore/data/bulk/log/Jobxml_9999.log . >> $bulkScriptName
echo cp /usr/local/MariaDB/Columnstore/data/bulk/log/Job_9999.log . >> $bulkScriptName
echo rm -f /usr/local/mariadb/columnstore/data/bulk/log/Jobxml_9999.log >> $bulkScriptName
echo rm -f /usr/local/mariadb/columnstore/data/bulk/log/Job_9999.log >> $bulkScriptName
echo /usr/local/mariadb/columnstore/bin/colxml $testDB -t lineitem -l $sourceFileName -j 9999 >> $bulkScriptName
echo /usr/local/mariadb/columnstore/bin/cpimport -j 9999 >> $bulkScriptName
echo cp /usr/local/mariadb/columnstore/data/bulk/job/Job_9999.xml . >> $bulkScriptName
echo cp /usr/local/mariadb/columnstore/data/bulk/log/Jobxml_9999.log . >> $bulkScriptName
echo cp /usr/local/mariadb/columnstore/data/bulk/log/Job_9999.log . >> $bulkScriptName
chmod 777 $bulkScriptName
#
#append current directory path to to script file name

10
utils/scenarios/dwweek/test/dwbackup.sh
View File

@ -3,7 +3,7 @@
numRoots=4
#
for ((idx=1; $idx<=$numRoots; idx++)); do
rm -rf /usr/local/MariaDB/Columnstore/data$idx/dwbackup/2 &
rm -rf /usr/local/mariadb/columnstore/data$idx/dwbackup/2 &
pids[$idx]=$!
done
#
@ -26,9 +26,9 @@
done
#
for ((idx=1; $idx<=$numRoots; idx++)); do
mv /usr/local/MariaDB/Columnstore/data$idx/dwbackup/1 /usr/local/MariaDB/Columnstore/data$idx/dwbackup/2
mkdir -p /usr/local/MariaDB/Columnstore/data$idx/dwbackup/1
cp -r /usr/local/MariaDB/Columnstore/data$idx/000.dir /usr/local/MariaDB/Columnstore/data$idx/dwbackup/1 &
mv /usr/local/mariadb/columnstore/data$idx/dwbackup/1 /usr/local/mariadb/columnstore/data$idx/dwbackup/2
mkdir -p /usr/local/mariadb/columnstore/data$idx/dwbackup/1
cp -r /usr/local/mariadb/columnstore/data$idx/000.dir /usr/local/mariadb/columnstore/data$idx/dwbackup/1 &
pids[$idx]=$!
done
#
@ -49,4 +49,4 @@
done
sleep 5
done
cp -r /mnt/OAM/dbrm /usr/local/MariaDB/Columnstore/data1/dwbackup/1/.
cp -r /mnt/OAM/dbrm /usr/local/mariadb/columnstore/data1/dwbackup/1/.

2
utils/scenarios/perf/sh/pfExeSQLscript.sh
View File

@ -19,5 +19,5 @@
#
# Execute script on test database
#
/usr/local/MariaDB/Columnstore/mysql/bin/mysql --defaults-file=/usr/local/MariaDB/Columnstore/mysql/my.cnf -u root $1 <$2 > $logFileName.test.log
/usr/local/mariadb/columnstore/mysql/bin/mysql --defaults-file=/usr/local/mariadb/columnstore/mysql/my.cnf -u root $1 <$2 > $logFileName.test.log
exit 0

12
utils/scenarios/perf/source/pf/common/exeStreamTest.sh
View File

@ -50,15 +50,15 @@ while [ $k -le $repeatNum ]
do
if [ $restart == Y ] || [ $restart == y ]
then
/usr/local/MariaDB/Columnstore/bin/mcsadmin restartsystem y
/usr/local/mariadb/columnstore/bin/mcsadmin restartsystem y
sleep 90
fi
mkdir $k
cd $k
cp /usr/local/MariaDB/Columnstore/etc/Calpont.xml .
/usr/local/MariaDB/Columnstore/bin/mcsadmin getCalpontSoftware >CalpontSoftware.txt
ls -al /mnt/pm*/usr/local/MariaDB/Columnstore/data* > dbRoots.txt
/usr/local/MariaDB/Columnstore/bin/mcsadmin getProcessStatus >stackConfigBefore.txt
cp /usr/local/mariadb/columnstore/etc/Calpont.xml .
/usr/local/mariadb/columnstore/bin/mcsadmin getCalpontSoftware >CalpontSoftware.txt
ls -al /mnt/pm*/usr/local/mariadb/columnstore/data* > dbRoots.txt
/usr/local/mariadb/columnstore/bin/mcsadmin getProcessStatus >stackConfigBefore.txt
$exeCommand > $logFileName 2>&1
#
if [ $streamNum == 1_7 ]
@ -71,7 +71,7 @@ do
done
fi
#
/usr/local/MariaDB/Columnstore/bin/mcsadmin getProcessStatus >stackConfigAfter.txt
/usr/local/mariadb/columnstore/bin/mcsadmin getProcessStatus >stackConfigAfter.txt
/home/pf/auto/common/extractstartstoptimes.sh
cd ..
((k++))

2
utils/scenarios/perf/source/pf/common/sendPlanExec.sh
View File

@ -14,7 +14,7 @@ echo ---------------------------------------------------------------------------
echo sendPlan start: $3
date
echo
/usr/local/MariaDB/Columnstore/bin/sendPlan -v -s$1 -t$2 $3
/usr/local/mariadb/columnstore/bin/sendPlan -v -s$1 -t$2 $3
echo
date
echo sendPlan end: $3

48
utils/scenarios/perf/source/pf/common/setDBRoots.sh
View File

@ -22,48 +22,48 @@ echo *****-----*****-----*****-----*****-----*****
# unmount dbroots from all PMs
#-----------------------------------------------------------------------------
echo unmounting PM1
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf3 qalpont! "umount -a"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf3 qalpont! "umount -a"
echo unmounting PM2
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf4 qalpont! "umount -a"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf4 qalpont! "umount -a"
echo unmounting PM3
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf5 qalpont! "umount -a"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf5 qalpont! "umount -a"
echo unmounting PM4
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf8 qalpont! "umount -a"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf8 qalpont! "umount -a"
#-----------------------------------------------------------------------------
# save current fstab to fstab.auto then move 'set number' fstab to 'real' fstab
#-----------------------------------------------------------------------------
echo *-*
echo doing the hokey pokey with fstabs on PM1
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf3 qalpont! "rm -f /etc/fstab.auto"
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf3 qalpont! "mv /etc/fstab /etc/fstab.auto"
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf3 qalpont! "cp /etc/fstab.[$setNum] /etc/fstab"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf3 qalpont! "rm -f /etc/fstab.auto"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf3 qalpont! "mv /etc/fstab /etc/fstab.auto"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf3 qalpont! "cp /etc/fstab.[$setNum] /etc/fstab"
echo *-*
echo doing the funky chicken with fstabs on PM2
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf4 qalpont! "rm -f /etc/fstab.auto"
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf4 qalpont! "mv /etc/fstab /etc/fstab.auto"
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf4 qalpont! "cp /etc/fstab.[$setNum] /etc/fstab"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf4 qalpont! "rm -f /etc/fstab.auto"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf4 qalpont! "mv /etc/fstab /etc/fstab.auto"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf4 qalpont! "cp /etc/fstab.[$setNum] /etc/fstab"
echo *-*
echo doing the swim with fstabs on PM3
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf5 qalpont! "rm -f /etc/fstab.auto"
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf5 qalpont! "mv /etc/fstab /etc/fstab.auto"
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf5 qalpont! "cp /etc/fstab.[$setNum] /etc/fstab"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf5 qalpont! "rm -f /etc/fstab.auto"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf5 qalpont! "mv /etc/fstab /etc/fstab.auto"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf5 qalpont! "cp /etc/fstab.[$setNum] /etc/fstab"
echo *-*
echo doing the stroll with fstabs on PM4
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf8 qalpont! "rm -f /etc/fstab.auto"
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf8 qalpont! "mv /etc/fstab /etc/fstab.auto"
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf8 qalpont! "cp /etc/fstab.[$setNum] /etc/fstab"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf8 qalpont! "rm -f /etc/fstab.auto"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf8 qalpont! "mv /etc/fstab /etc/fstab.auto"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf8 qalpont! "cp /etc/fstab.[$setNum] /etc/fstab"
#-----------------------------------------------------------------------------
# re-mount dbroots on all PMs
#-----------------------------------------------------------------------------
echo *-*
echo mounting PM1
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf3 qalpont! "mount -a"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf3 qalpont! "mount -a"
echo mounting PM2
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf4 qalpont! "mount -a"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf4 qalpont! "mount -a"
echo mounting PM3
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf5 qalpont! "mount -a"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf5 qalpont! "mount -a"
echo mounting PM4
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf8 qalpont! "mount -a"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf8 qalpont! "mount -a"
#-----------------------------------------------------------------------------
echo
#-----------------------------------------------------------------------------
@ -71,13 +71,13 @@ echo set disk scheduler to deadline for newly mounted LUNs
#-----------------------------------------------------------------------------
echo
echo setting disk scheduler to deadline on PM1
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf3 qalpont! "/etc/rc.d/rc.local"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf3 qalpont! "/etc/rc.d/rc.local"
echo setting disk scheduler to deadline on PM2
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf4 qalpont! "/etc/rc.d/rc.local"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf4 qalpont! "/etc/rc.d/rc.local"
echo setting disk scheduler to deadline on PM3
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf5 qalpont! "/etc/rc.d/rc.local"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf5 qalpont! "/etc/rc.d/rc.local"
echo setting disk scheduler to deadline on PM4
/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf8 qalpont! "/etc/rc.d/rc.local"
/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf8 qalpont! "/etc/rc.d/rc.local"
#
echo -----*****-----*****-----*****-----*****-----**
echo End - set dbroots to RAID Configuration $setNum

8
utils/scenarios/perf/source/pf/common/setPMConfig.sh
View File

@ -13,7 +13,7 @@
echo Start - Set PM configuration
#
# Stopping the Calpont software
/usr/local/MariaDB/Columnstore/bin/mcsadmin stopsystem y ACK_YES
/usr/local/mariadb/columnstore/bin/mcsadmin stopsystem y ACK_YES
#
# set maximum number of PMs possible for the stack
maxPMs=4
@ -26,7 +26,7 @@ numPMs=$1
#-----------------------------------------------------------------------------
k=1
while [ $k -le $maxPMs ]; do
/usr/local/MariaDB/Columnstore/bin/mcsadmin enableModule pm$k ACK_YES
/usr/local/mariadb/columnstore/bin/mcsadmin enableModule pm$k ACK_YES
((k++))
done
#-----------------------------------------------------------------------------
@ -34,12 +34,12 @@ done
#-----------------------------------------------------------------------------
k=$maxPMs
while [ $k -gt $numPMs ]; do
/usr/local/MariaDB/Columnstore/bin/mcsadmin disableModule pm$k ACK_YES
/usr/local/mariadb/columnstore/bin/mcsadmin disableModule pm$k ACK_YES
((k--))
done
#-----------------------------------------------------------------------------
# Starting the Calpont software
/usr/local/MariaDB/Columnstore/bin/mcsadmin startsystem y ACK_YES
/usr/local/mariadb/columnstore/bin/mcsadmin startsystem y ACK_YES
sleep 60
echo *-*-*-*-*-*-*-*-*-*-*-*-*-*-*
echo End - Set PM configuration

10
utils/scenarios/perf/source/pf/common/setStackConfig.sh
View File

@ -14,7 +14,7 @@
echo Start - Set stack configuration
#
# Stopping the Calpont software
/usr/local/MariaDB/Columnstore/bin/mcsadmin stopsystem y ACK_YES
/usr/local/mariadb/columnstore/bin/mcsadmin stopsystem y ACK_YES
#
# set maximum number of UMs and PMs possible the stack
maxUMs=2
@ -29,7 +29,7 @@ numPMs=$2
#-----------------------------------------------------------------------------
k=1
while [ $k -le $maxUMs ]; do
/usr/local/MariaDB/Columnstore/bin/mcsadmin enableModule um$k ACK_YES
/usr/local/mariadb/columnstore/bin/mcsadmin enableModule um$k ACK_YES
((k++))
done
#-----------------------------------------------------------------------------
@ -37,7 +37,7 @@ done
#-----------------------------------------------------------------------------
k=$maxUMs
while [ $k -gt $numUMs ]; do
/usr/local/MariaDB/Columnstore/bin/mcsadmin disableModule um$k ACK_YES
/usr/local/mariadb/columnstore/bin/mcsadmin disableModule um$k ACK_YES
((k--))
done
#-----------------------------------------------------------------------------
@ -45,7 +45,7 @@ done
#-----------------------------------------------------------------------------
k=1
while [ $k -le $maxPMs ]; do
/usr/local/MariaDB/Columnstore/bin/mcsadmin enableModule pm$k ACK_YES
/usr/local/mariadb/columnstore/bin/mcsadmin enableModule pm$k ACK_YES
((k++))
done
#-----------------------------------------------------------------------------
@ -53,7 +53,7 @@ done
#-----------------------------------------------------------------------------
k=$maxPMs
while [ $k -gt $numPMs ]; do
/usr/local/MariaDB/Columnstore/bin/mcsadmin disableModule pm$k ACK_YES
/usr/local/mariadb/columnstore/bin/mcsadmin disableModule pm$k ACK_YES
((k--))
done
#-----------------------------------------------------------------------------

2
utils/scenarios/perf/source/pf/common/setTestEnv.sh
View File

@ -21,7 +21,7 @@ setNum=$3
#
/home/pf/auto/common/setStackConfig.sh $numUMs $numPMs
/home/pf/auto/common/setDBRoots.sh $setNum
/usr/local/MariaDB/Columnstore/bin/mcsadmin startsystem
/usr/local/mariadb/columnstore/bin/mcsadmin startsystem
sleep 90
#
# End of script

2
utils/scenarios/perf/source/pf/common/step1.sh
View File

@ -21,7 +21,7 @@ setNum=$3
#
/home/pf/auto/common/setStackConfig.sh $numUMs $numPMs
/home/pf/auto/common/setDBRoots.sh $setNum
/usr/local/MariaDB/Columnstore/bin/mcsadmin startsystem
/usr/local/mariadb/columnstore/bin/mcsadmin startsystem
sleep 90
#
# End of script

12
utils/scenarios/perf/source/pf/common/step2.sh
View File

@ -46,15 +46,15 @@ while [ $k -le $repeatNum ]
do
if [ $restart == Y ] || [ $restart == y ]
then
/usr/local/MariaDB/Columnstore/bin/mcsadmin restartsystem y
/usr/local/mariadb/columnstore/bin/mcsadmin restartsystem y
sleep 90
fi
mkdir $k
cd $k
cp /usr/local/MariaDB/Columnstore/etc/Calpont.xml .
/usr/local/MariaDB/Columnstore/bin/mcsadmin getCalpontSoftware >CalpontSoftware.txt
ls -al /usr/local/MariaDB/Columnstore/data* > dbRoots.txt
/usr/local/MariaDB/Columnstore/bin/mcsadmin getProcessStatus >stackConfigBefore.txt
cp /usr/local/mariadb/columnstore/etc/Calpont.xml .
/usr/local/mariadb/columnstore/bin/mcsadmin getCalpontSoftware >CalpontSoftware.txt
ls -al /usr/local/mariadb/columnstore/data* > dbRoots.txt
/usr/local/mariadb/columnstore/bin/mcsadmin getProcessStatus >stackConfigBefore.txt
$exeCommand > $logFileName 2>&1
#
if [ $streamNum == 1_7 ]
@ -67,7 +67,7 @@ do
done
fi
#
/usr/local/MariaDB/Columnstore/bin/mcsadmin getProcessStatus >stackConfigAfter.txt
/usr/local/mariadb/columnstore/bin/mcsadmin getProcessStatus >stackConfigAfter.txt
cd ..
((k++))
done

2
utils/scenarios/perf/source/pf/fm/getlogs.sh
View File

@ -28,6 +28,6 @@ then
fi
#
mkdir /tmp/$host/logs
cp -r /var/log/Columnstore/* /tmp/$host/logs
cp -r /var/log/mariadb/columnstore/* /tmp/$host/logs
#
# End of script

8
utils/scenarios/perf/source/pf/fm/getsar.sh
View File

@ -57,9 +57,9 @@ smbclient //calweb/perf -Wcalpont -Uoamuser%Calpont1 -c "cd ${host1};prompt OFF;
#------------------------------------------------------------------------------
# Execute the script on the other servers in the stack
#
/usr/local/MariaDB/Columnstore/bin/remote_command.sh $host2 qalpont! "/home/pf/auto/fm/sar.sh $1 $2 $3" 1
/usr/local/MariaDB/Columnstore/bin/remote_command.sh $host3 qalpont! "/home/pf/auto/fm/sar.sh $1 $2 $3" 1
/usr/local/MariaDB/Columnstore/bin/remote_command.sh $host4 qalpont! "/home/pf/auto/fm/sar.sh $1 $2 $3" 1
/usr/local/MariaDB/Columnstore/bin/remote_command.sh $host5 qalpont! "/home/pf/auto/fm/sar.sh $1 $2 $3" 1
/usr/local/mariadb/columnstore/bin/remote_command.sh $host2 qalpont! "/home/pf/auto/fm/sar.sh $1 $2 $3" 1
/usr/local/mariadb/columnstore/bin/remote_command.sh $host3 qalpont! "/home/pf/auto/fm/sar.sh $1 $2 $3" 1
/usr/local/mariadb/columnstore/bin/remote_command.sh $host4 qalpont! "/home/pf/auto/fm/sar.sh $1 $2 $3" 1
/usr/local/mariadb/columnstore/bin/remote_command.sh $host5 qalpont! "/home/pf/auto/fm/sar.sh $1 $2 $3" 1
#
# End of Script

2
utils/scenarios/perf/source/pf/fm/getsql.orig
View File

@ -41,7 +41,7 @@ cmd="/$startdate/,/$enddate/ {print \$0} "
echo $cmd > /tmp/$host/sql/cmd.$$
#
# execute the command
awk -f /tmp/$host/sql/cmd.$$ /usr/local/MariaDB/Columnstore/mysql/db/$host.log > /tmp/$host/sql/temp.log
awk -f /tmp/$host/sql/cmd.$$ /usr/local/mariadb/columnstore/mysql/db/$host.log > /tmp/$host/sql/temp.log
#
exit
#

6
utils/scenarios/perf/source/pf/fm/getsql.sh
View File

@ -52,7 +52,7 @@ while [ $k -ge $st ] && [ $k -le $et ] && [ $foundstart == "no" ]; do
k=`expr $k + 39`
sm=`expr $sm - 61`
elif [ $k -ge $st ] && [ $k -le $et ]; then
grep -q "$newdate $sh:$sm" /usr/local/MariaDB/Columnstore/mysql/db/$host.log
grep -q "$newdate $sh:$sm" /usr/local/mariadb/columnstore/mysql/db/$host.log
if [ "$?" -eq "0" ] && [ $foundstart == "no" ]; then
start="$newdate $sh:$sm"
foundstart="yes"
@ -69,7 +69,7 @@ while [ $k -ge $st ] && [ $k -le $et ] && [ $foundend == "no" ]; do
k=`expr $k + 39`
em=`expr $em - 61`
elif [ $k -ge $st ] && [ $k -le $et ]; then
grep -q "$newdate $eh:$em" /usr/local/MariaDB/Columnstore/mysql/db/$host.log
grep -q "$newdate $eh:$em" /usr/local/mariadb/columnstore/mysql/db/$host.log
if [ "$?" -eq "0" ] && [ $foundend == "no" ]; then
end="$newdate $eh:$em"
foundend="yes"
@ -87,7 +87,7 @@ cmd="/$start/,/$end/ {print \$0} "
echo $cmd >> /tmp/$host/sql/cmd.$$
#
# execute the command
awk -f /tmp/$host/sql/cmd.$$ /usr/local/MariaDB/Columnstore/mysql/db/$host.log > /tmp/$host/sql/temp.log
awk -f /tmp/$host/sql/cmd.$$ /usr/local/mariadb/columnstore/mysql/db/$host.log > /tmp/$host/sql/temp.log
#
exit
#

2
utils/scenarios/perf/source/pf/scripts/1server_all.sh
View File

@ -57,7 +57,7 @@ echo ------------------------------------------------------------------
echo executing setLowMem100 script to prep for following stream1_7 tests
echo ------------------------------------------------------------------
echo
/usr/local/MariaDB/Columnstore/bin/setLowMem100.sh
/usr/local/mariadb/columnstore/bin/setLowMem100.sh
#
echo
echo ------------------------------------------------------------------

2
utils/scenarios/perf/source/pf/scripts/1um_1a_100_s17.sh
View File

@ -8,7 +8,7 @@ echo executing setLowMem100 script to prep for following stream1_7 tests
echo ------------------------------------------------------------------
echo
#
/usr/local/MariaDB/Columnstore/bin/setLowMem100.sh
/usr/local/mariadb/columnstore/bin/setLowMem100.sh
#
echo
echo ------------------------------------------------------------------

2
utils/scenarios/perf/source/pf/scripts/1um_2a_100_s17.sh
View File

@ -8,7 +8,7 @@ echo executing setLowMem100 script to prep for following stream1_7 tests
echo ------------------------------------------------------------------
echo
#
/usr/local/MariaDB/Columnstore/bin/setLowMem100.sh
/usr/local/mariadb/columnstore/bin/setLowMem100.sh
#
echo
echo ------------------------------------------------------------------

2
utils/scenarios/perf/source/pf/scripts/1um_allarrays_allPMs_s0_s17.sh
View File

@ -53,7 +53,7 @@ echo ------------------------------------------------------------------
echo executing setLowMem100 script to prep for following stream1_7 tests
echo ------------------------------------------------------------------
echo
/usr/local/MariaDB/Columnstore/bin/setLowMem100.sh
/usr/local/mariadb/columnstore/bin/setLowMem100.sh
#
echo
echo ------------------------------------------------------------------

2
utils/scenarios/perf/source/pf/scripts/2a_100g_1t_s0_s17.sh
View File

@ -82,7 +82,7 @@ echo executing setLowMem100 script to prep for following stream1_7 tests
echo ------------------------------------------------------------------
echo
#
/usr/local/MariaDB/Columnstore/bin/setLowMem100.sh
/usr/local/mariadb/columnstore/bin/setLowMem100.sh
#
echo
echo ------------------------------------------------------------------

2
utils/scenarios/perf/source/pf/scripts/2um_allconfigs_s17.sh
View File

@ -12,7 +12,7 @@ echo ------------------------------------------------------------------
echo executing setLowMem100 script to prep for following stream1_7 tests
echo ------------------------------------------------------------------
echo
/usr/local/MariaDB/Columnstore/bin/setLowMem100.sh
/usr/local/mariadb/columnstore/bin/setLowMem100.sh
#
echo
echo ------------------------------------------------------------------

2
utils/scenarios/perf/source/pf/scripts/allconfigs_s17.sh
View File

@ -12,7 +12,7 @@ echo ------------------------------------------------------------------
echo executing setLowMem100 script to prep for following stream1_7 tests
echo ------------------------------------------------------------------
echo
/usr/local/MariaDB/Columnstore/bin/setLowMem100.sh
/usr/local/mariadb/columnstore/bin/setLowMem100.sh
#
echo
echo ------------------------------------------------------------------

20
utils/scenarios/perf/test/pfSubmitBulkTest.sh
View File

@ -19,19 +19,19 @@
#
echo \#\!/bin/bash > $cpimportScriptName
echo \# >> $cpimportScriptName
echo cd /usr/local/MariaDB/Columnstore/data/bulk/log >> $cpimportScriptName
echo cd /usr/local/mariadb/columnstore/data/bulk/log >> $cpimportScriptName
echo rm -f Jobxml_9999.log >> $cpimportScriptName
echo rm -f Job_9999.log >> $cpimportScriptName
echo rm -f fileStats.txt >> $cpimportScriptName
echo rm -f finished.txt >> $cpimportScriptName
echo "ls -alh /usr/local/MariaDB/Columnstore/data/bulk/data/import/*.tbl > fileStats.txt" >> $cpimportScriptName
# echo "wc -l /usr/local/MariaDB/Columnstore/data/bulk/data/import/*.tbl >> fileStats.txt" >> $cpimportScriptName
echo "ls -alh /usr/local/mariadb/columnstore/data/bulk/data/import/*.tbl > fileStats.txt" >> $cpimportScriptName
# echo "wc -l /usr/local/mariadb/columnstore/data/bulk/data/import/*.tbl >> fileStats.txt" >> $cpimportScriptName
#
echo /usr/local/MariaDB/Columnstore/bin/colxml $testDB -r 2 -j 9999 >> $cpimportScriptName
echo /usr/local/mariadb/columnstore/bin/colxml $testDB -r 2 -j 9999 >> $cpimportScriptName
echo sleep 5 >> $cpimportScriptName
echo sync >> $cpimportScriptName
#
echo \# /usr/local/MariaDB/Columnstore/bin/cpimport -j 9999 -i >> $cpimportScriptName
echo \# /usr/local/mariadb/columnstore/bin/cpimport -j 9999 -i >> $cpimportScriptName
echo sleep 5 >> $cpimportScriptName
echo touch finished.txt >> $cpimportScriptName
echo sync >> $cpimportScriptName
@ -47,15 +47,15 @@
echo "/root/genii/utils/scenarios/common/sh/remote_command.sh $PM1 qalpont! \"/mnt/parentOAM$curDir/$cpimportScriptName\"" >> $bulkScriptName
#
echo sleep 5 >> $bulkScriptName
echo "while [ ! -f /mnt/pm1/usr/local/MariaDB/Columnstore/data/bulk/log/finished.txt ]; do" >> $bulkScriptName
echo "while [ ! -f /mnt/pm1/usr/local/mariadb/columnstore/data/bulk/log/finished.txt ]; do" >> $bulkScriptName
echo sleep 5 >> $bulkScriptName
echo echo waiting...... >> $bulkScriptName
echo done >> $bulkScriptName
#
echo cp /mnt/pm1/usr/local/MariaDB/Columnstore/data/bulk/job/Job_9999.xml . >> $bulkScriptName
echo cp /mnt/pm1/usr/local/MariaDB/Columnstore/data/bulk/log/Jobxml_9999.log . >> $bulkScriptName
echo cp /mnt/pm1/usr/local/MariaDB/Columnstore/data/bulk/log/Job_9999.log . >> $bulkScriptName
echo cp /mnt/pm1/usr/local/MariaDB/Columnstore/data/bulk/log/fileStats.txt . >> $bulkScriptName
echo cp /mnt/pm1/usr/local/mariadb/columnstore/data/bulk/job/Job_9999.xml . >> $bulkScriptName
echo cp /mnt/pm1/usr/local/mariadb/columnstore/data/bulk/log/Jobxml_9999.log . >> $bulkScriptName
echo cp /mnt/pm1/usr/local/mariadb/columnstore/data/bulk/log/Job_9999.log . >> $bulkScriptName
echo cp /mnt/pm1/usr/local/mariadb/columnstore/data/bulk/log/fileStats.txt . >> $bulkScriptName
#
chmod 777 $bulkScriptName
#

6
utils/startup/installdir.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
@ -52,7 +52,7 @@ const string StartUp::installDir()
if (!cfStr.empty())
*fInstallDirp = cfStr;
#else
fInstallDirp = new string("/usr/local/MariaDB/Columnstore");
fInstallDirp = new string("/usr/local/mariadb/columnstore");
//See if we can figure out the install dir in Linux...
//1. env var INFINIDB_INSTALL_DIR
const char* p=0;
@ -60,7 +60,7 @@ const string StartUp::installDir()
if (p && *p)
*fInstallDirp = p;
//2. up one level from current binary location?
//3. fall back to /usr/local/MariaDB/Columnstore
//3. fall back to /usr/local/mariadb/columnstore
#endif
return *fInstallDirp;

4
utils/testbc/stats.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
@ -92,7 +92,7 @@ public:
else
outName = name;
ostringstream oss;
oss << "/var/log/Columnstore/trace/" << outName << '.' << sessionID;
oss << "/var/log/mariadb/columnstore/trace/" << outName << '.' << sessionID;
oFile.reset(new ofstream());
oFile->open(oss.str().c_str(), ios_base::out | ios_base::ate | ios_base::app);
}

6
utils/udfsdk/README.txt
View File

@ -15,11 +15,11 @@ At this point you can use the idb_add() function template in udfinfinidb.cpp and
files to create your own function or just try that function as is.
Make the library
Stop InfiniDB
Copy the libudf_mysql.so.1.0.0 and libudfsdk.so.1.0.0 file to /usr/local/MariaDB/Columnstore/lib on
Copy the libudf_mysql.so.1.0.0 and libudfsdk.so.1.0.0 file to /usr/local/mariadb/columnstore/lib on
every InfiniDB node
Start InfiniDB
In the directory /usr/local/MariaDB/Columnstore/mysql/lib64/mysql/plugin create a symbolic link called
libudf_msql.so to the file /usr/local/MariaDB/Columnstore/lib/libudf_msql.so.1.0.0
In the directory /usr/local/mariadb/columnstore/mysql/lib64/mysql/plugin create a symbolic link called
libudf_msql.so to the file /usr/local/mariadb/columnstore/lib/libudf_msql.so.1.0.0
In the mysql client add the function (e.g. "create function idb_add returns integer soname
'libudf_msql.so';")
You should now be able to use the idb_add() function in the select and/or where clauses

2
utils/udfsdk/udfinfinidb.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

4
utils/udfsdk/udfsdk.h
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
@ -30,7 +30,7 @@
* 2. add the UDF function implementation in udfsdk.cpp
* 3. add the connector stub for this UDF function in udfsdk.cpp
* 4. build the dynamic library libudfsdk
* 5. put the library in /usr/local/MariaDB/Columnstore/lib of all modules
* 5. put the library in /usr/local/mariadb/columnstore/lib of all modules
* 6. restart all the InfiniDB servers and MySQL server
* 7. notify mysqld about the new functions with the commands like:
*