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

MCOL-3 directory name changes

Browse Source
This commit is contained in:
david hill
2016-05-31 16:40:30 -05:00
parent 29a89c1b36
commit eff8f39801
277 changed files with 9489 additions and 1702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
writeengine/bulk/Makefile
View File

@ -10,7 +10,7 @@ VERSION=1.0.0
.PHONY: install clean docs test coverage leakcheck install_bulk
TLIBS+=-L$(CALPONT_LIBRARY_PATH) $(IDB_COMMON_LIBS) $(IDB_WRITE_LIBS)
GLIBS=-L$(CALPONT_LIBRARY_PATH) $(IDB_COMMON_LIBS) $(IDB_WRITE_LIBS) $(IDB_SNMP_LIBS) -Wl,--rpath -Wl,/usr/local/MariaDB/Columnstore/lib
GLIBS=-L$(CALPONT_LIBRARY_PATH) $(IDB_COMMON_LIBS) $(IDB_WRITE_LIBS) $(IDB_SNMP_LIBS) -Wl,--rpath -Wl,/usr/local/mariadb/columnstore/lib
SRCS=we_bulkload.cpp we_workers.cpp we_colopbulk.cpp we_tableinfo.cpp we_bulkloadbuffer.cpp we_colbuf.cpp we_colbufcompressed.cpp we_colbufmgr.cpp we_colbufmgrdctnry.cpp we_colbufsec.cpp we_columninfo.cpp we_columninfocompressed.cpp we_bulkstatus.cpp we_colextinf.cpp we_tempxmlgendata.cpp we_columnautoinc.cpp we_brmreporter.cpp we_extentstripealloc.cpp
BULK_SRCS=cpimport.cpp

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')

2
writeengine/redistribute/we_redistributecontrol.cpp
View File

@ -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/server/Makefile
View File

@ -13,7 +13,7 @@ VERSION=1.0.0
.PHONY: install clean docs test coverage leakcheck install_server
TLIBS+=-L$(CALPONT_LIBRARY_PATH) $(IDB_COMMON_LIBS) $(IDB_WRITE_LIBS)
LDFLAGS+=-L$(CALPONT_LIBRARY_PATH) $(IDB_COMMON_LIBS) $(IDB_WRITE_LIBS) $(IDB_SNMP_LIBS) -lthreadpool -lwriteengineredistribute -Wl,--rpath -Wl,/usr/local/MariaDB/Columnstore/lib
LDFLAGS+=-L$(CALPONT_LIBRARY_PATH) $(IDB_COMMON_LIBS) $(IDB_WRITE_LIBS) $(IDB_SNMP_LIBS) -lthreadpool -lwriteengineredistribute -Wl,--rpath -Wl,/usr/local/mariadb/columnstore/lib
GLIBS=$(LDFLAGS)
SRCS= \

2
writeengine/splitter/Makefile
View File

@ -29,7 +29,7 @@ CPPFLAGS=-I$(EXPORT_ROOT)/include -I/usr/include/libxml2
CXXFLAGS+=$(DEBUG_FLAGS) -Wall
# Linker flags
LDFLAGS+=-L$(CALPONT_LIBRARY_PATH) $(IDB_COMMON_LIBS) $(IDB_WRITE_LIBS) -lthreadpool $(IDB_SNMP_LIBS) -Wl,--rpath -Wl,/usr/local/MariaDB/Columnstore/lib -lbatchloader
LDFLAGS+=-L$(CALPONT_LIBRARY_PATH) $(IDB_COMMON_LIBS) $(IDB_WRITE_LIBS) -lthreadpool $(IDB_SNMP_LIBS) -Wl,--rpath -Wl,/usr/local/mariadb/columnstore/lib -lbatchloader
.PHONY: install clean docs test coverage leakcheck
TLIBS+=-L$(CALPONT_LIBRARY_PATH) $(IDB_COMMON_LIBS) $(IDB_WRITE_LIBS)

2
writeengine/splitter/we_cmdargs.cpp
View File

@ -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);

4
writeengine/wrapper/tdriver.cpp
View File

@ -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;