merge

writeengine/bulk/bulkload.py

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

writeengine/bulk/bulkload.sh

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

writeengine/bulk/bulkloadp.sh

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

writeengine/bulk/checkidx.py

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

writeengine/bulk/cleanup.sh

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

writeengine/bulk/cpimport.sh

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

writeengine/bulk/dbbuilder.sh

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

writeengine/bulk/dbload_tmplate.sh

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

writeengine/bulk/dbreset.sh

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

writeengine/bulk/dbstart.sh

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

writeengine/bulk/dbstop.sh

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

writeengine/bulk/qa-bulkload.py

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