database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +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

2
writeengine/bulk/bulkload.py
View File

@ -56,7 +56,7 @@ def find_paths():
except KeyError:
try:
logger.info("Environment variable CALPONT_CONFIG_FILE not set, looking for system Calpont.xml")
config_file = '/usr/local/MariaDB/Columnstore/etc/Calpont.xml'
config_file = '/usr/local/mariadb/columnstore/etc/Calpont.xml'
os.lstat(config_file)
except:
logger.error('No config file available')

2
writeengine/bulk/bulkload.sh
View File

@ -12,7 +12,7 @@
#Job ID will determine the names of the two xml files. For example, job id 100 will generate Job_100.xml for columns and Job_101 for index xml file. Job id for index xml file is the entered job id +1
#if the job id is skipped, the default job ids are 299 and 300 for column and index files
#There are two xml files will be generated which reside in bulkroot directory under subdirectory job
#For example, the job directory may look like /usr/local/MariaDB/Columnstore/test/bulk/job
#For example, the job directory may look like /usr/local/mariadb/columnstore/test/bulk/job
# Set up a default search path.
PATH="$HOME/genii/export/bin:.:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"

6
writeengine/bulk/bulkloadp.sh
View File

@ -12,7 +12,7 @@
#Job ID will determine the names of the two xml files. For example, job id 100 will generate Job_100.xml for columns and Job_101 for index xml file. Job id for index xml file is the entered job id +1
#if the job id is skipped, the default job ids are 299 and 300 for column and index files
#There are two xml files will be generated which reside in bulkroot directory under subdirectory job
#For example, the job directory may look like /usr/local/MariaDB/Columnstore/test/bulk/job
#For example, the job directory may look like /usr/local/mariadb/columnstore/test/bulk/job
# Set up a default search path.
PROG_NAME=$(basename $0)
@ -92,10 +92,10 @@ fi
if [ -n "$CALPONT_CONFIG_FILE" ]; then
echo "CALPONT_CONFIG_FILE=" $CALPONT_CONFIG_FILE
elif [ -z "$CALPONT_CONFIG_FILE"]; then
CALPONT_CONFIG_FILE="/usr/local/MariaDB/Columnstore/etc/Calpont.xml"
CALPONT_CONFIG_FILE="/usr/local/mariadb/columnstore/etc/Calpont.xml"
echo "CALPONT_CONFIG_FILE=" $CALPONT_CONFIG_FILE
else
CALPONT_CONFIG_FILE="/usr/local/MariaDB/Columnstore/etc/Calpont.xml"
CALPONT_CONFIG_FILE="/usr/local/mariadb/columnstore/etc/Calpont.xml"
echo "CALPONT_CONFIG_FILE=" $CALPONT_CONFIG_FILE
fi

2
writeengine/bulk/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/Calpont.xml'
config_file = '/usr/local/mariadb/columnstore/etc/Calpont.xml'
os.lstat(config_file)
except:
sys.exit('No config file available')

2
writeengine/bulk/cleanup.sh
View File

@ -12,7 +12,7 @@
#Job ID will determine the names of the two xml files. For example, job id 100 will generate Job_100.xml for columns and Job_101 for index xml file. Job id for index xml file is the entered job id +1
#if the job id is skipped, the default job ids are 299 and 300 for column and index files
#There are two xml files will be generated which reside in bulkroot directory under subdirectory job
#For example, the job directory may look like /usr/local/MariaDB/Columnstore/test/bulk/job
#For example, the job directory may look like /usr/local/mariadb/columnstore/test/bulk/job
# Set up a default search path.
PATH="$HOME/genii/export/bin:.:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"

2
writeengine/bulk/cpimport.sh
View File

@ -12,7 +12,7 @@
#Job ID will determine the names of the two xml files. For example, job id 100 will generate Job_100.xml for columns and Job_101 for index xml file. Job id for index xml file is the entered job id +1
#if the job id is skipped, the default job ids are 299 and 300 for column and index files
#There are two xml files will be generated which reside in bulkroot directory under subdirectory job
#For example, the job directory may look like /usr/local/MariaDB/Columnstore/test/bulk/job
#For example, the job directory may look like /usr/local/mariadb/columnstore/test/bulk/job
# Set up a default search path.

2
writeengine/bulk/dbbuilder.sh
View File

@ -12,7 +12,7 @@
#Job ID will determine the names of the two xml files. For example, job id 100 will generate Job_100.xml for columns and Job_101 for index xml file. Job id for index xml file is the entered job id +1
#if the job id is skipped, the default job ids are 299 and 300 for column and index files
#There are two xml files will be generated which reside in bulkroot directory under subdirectory job
#For example, the job directory may look like /usr/local/MariaDB/Columnstore/test/bulk/job
#For example, the job directory may look like /usr/local/mariadb/columnstore/test/bulk/job
# Set up a default search path.
PATH="$HOME/genii/export/bin:.:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"

2
writeengine/bulk/dbload_tmplate.sh
View File

@ -12,7 +12,7 @@
#Job ID will determine the names of the two xml files. For example, job id 100 will generate Job_100.xml for columns and Job_101 for index xml file. Job id for index xml file is the entered job id +1
#if the job id is skipped, the default job ids are 299 and 300 for column and index files
#There are two xml files will be generated which reside in bulkroot directory under subdirectory job
#For example, the job directory may look like /usr/local/MariaDB/Columnstore/test/bulk/job
#For example, the job directory may look like /usr/local/mariadb/columnstore/test/bulk/job
# Set up a default search path.
PATH="$HOME/genii/export/bin:.:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"

2
writeengine/bulk/dbreset.sh
View File

@ -12,7 +12,7 @@
#Job ID will determine the names of the two xml files. For example, job id 100 will generate Job_100.xml for columns and Job_101 for index xml file. Job id for index xml file is the entered job id +1
#if the job id is skipped, the default job ids are 299 and 300 for column and index files
#There are two xml files will be generated which reside in bulkroot directory under subdirectory job
#For example, the job directory may look like /usr/local/MariaDB/Columnstore/test/bulk/job
#For example, the job directory may look like /usr/local/mariadb/columnstore/test/bulk/job
# Set up a default search path.
PATH="$HOME/genii/export/bin:.:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"

2
writeengine/bulk/dbstart.sh
View File

@ -12,7 +12,7 @@
#Job ID will determine the names of the two xml files. For example, job id 100 will generate Job_100.xml for columns and Job_101 for index xml file. Job id for index xml file is the entered job id +1
#if the job id is skipped, the default job ids are 299 and 300 for column and index files
#There are two xml files will be generated which reside in bulkroot directory under subdirectory job
#For example, the job directory may look like /usr/local/MariaDB/Columnstore/test/bulk/job
#For example, the job directory may look like /usr/local/mariadb/columnstore/test/bulk/job
# Set up a default search path.
PATH="$HOME/genii/export/bin:.:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"

2
writeengine/bulk/dbstop.sh
View File

@ -12,7 +12,7 @@
#Job ID will determine the names of the two xml files. For example, job id 100 will generate Job_100.xml for columns and Job_101 for index xml file. Job id for index xml file is the entered job id +1
#if the job id is skipped, the default job ids are 299 and 300 for column and index files
#There are two xml files will be generated which reside in bulkroot directory under subdirectory job
#For example, the job directory may look like /usr/local/MariaDB/Columnstore/test/bulk/job
#For example, the job directory may look like /usr/local/mariadb/columnstore/test/bulk/job
# Set up a default search path.
PATH="$HOME/genii/export/bin:.:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin"

2
writeengine/bulk/qa-bulkload.py
View File

@ -53,7 +53,7 @@ def find_paths():
except KeyError:
try:
logger.info("Environment variable CALPONT_CONFIG_FILE not set, looking for system Calpont.xml")
config_file = '/usr/local/MariaDB/Columnstore/etc/Calpont.xml'
config_file = '/usr/local/mariadb/columnstore/etc/Calpont.xml'
os.lstat(config_file)
except:
logger.error('No config file available')

4
writeengine/redistribute/we_redistributecontrol.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
@ -86,7 +86,7 @@ RedistributeControl* RedistributeControl::instance()
RedistributeControl::RedistributeControl() : fInfoFilePtr(NULL), fPlanFilePtr(NULL)
{
// default path /usr/local/MariaDB/Columnstore/data1/systemFiles/redistribute
// default path /usr/local/mariadb/columnstore/data1/systemFiles/redistribute
string installDir = startup::StartUp::installDir();
fRedistributeDir = installDir + RedistributeDir;
fInfoFilePath = fRedistributeDir + InfoFileName;

2
writeengine/redistribute/we_redistributecontrolthread.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
writeengine/splitter/we_cmdargs.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
@ -95,7 +95,7 @@ void WECmdArgs::appTestFunction()
// testing begins
//std::string aJobFile("/home/bpaul/Calpont/data/bulk/job/Job_1234.xml");
//std::string aJobFile("/usr/local/MariaDB/Columnstore/data/bulk/job/Job_1234.xml");
//std::string aJobFile("/usr/local/mariadb/columnstore/data/bulk/job/Job_1234.xml");
//setSchemaAndTableFromJobFile(aJobFile);
//setEnclByAndEscCharFromJobFile(aJobFile);
//exit(1);

6
writeengine/wrapper/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
@ -2792,8 +2792,8 @@ void testBoostFloat()
void testSoloman()
{
char fileName[80]="/usr/local/MariaDB/Columnstore/data1/test.dat";
char outfile[80] = "/usr/local/MariaDB/Columnstore/data1/out.dat";
char fileName[80]="/usr/local/mariadb/columnstore/data1/test.dat";
char outfile[80] = "/usr/local/mariadb/columnstore/data1/out.dat";
int numOfBlock=8192,blockSize=8192;
FILE* testFile;
FILE* outFile;