MCOL-3 directory name changes

dbcon/ddlpackage/ddl-gram.h

@@ -0,0 +1,173 @@
+
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     ACTION = 258,
+     ADD = 259,
+     ALTER = 260,
+     AUTO_INCREMENT = 261,
+     BIGINT = 262,
+     BIT = 263,
+     IDB_BLOB = 264,
+     CASCADE = 265,
+     IDB_CHAR = 266,
+     CHARACTER = 267,
+     CHECK = 268,
+     CLOB = 269,
+     COLUMN = 270,
+     COLUMNS = 271,
+     COMMENT = 272,
+     CONSTRAINT = 273,
+     CONSTRAINTS = 274,
+     CREATE = 275,
+     CURRENT_USER = 276,
+     DATETIME = 277,
+     DEC = 278,
+     DECIMAL = 279,
+     DEFAULT = 280,
+     DEFERRABLE = 281,
+     DEFERRED = 282,
+     IDB_DELETE = 283,
+     DROP = 284,
+     ENGINE = 285,
+     FOREIGN = 286,
+     FULL = 287,
+     IMMEDIATE = 288,
+     INDEX = 289,
+     INITIALLY = 290,
+     IDB_INT = 291,
+     INTEGER = 292,
+     KEY = 293,
+     MATCH = 294,
+     MAX_ROWS = 295,
+     MIN_ROWS = 296,
+     MODIFY = 297,
+     NO = 298,
+     NOT = 299,
+     NULL_TOK = 300,
+     NUMBER = 301,
+     NUMERIC = 302,
+     ON = 303,
+     PARTIAL = 304,
+     PRECISION = 305,
+     PRIMARY = 306,
+     REFERENCES = 307,
+     RENAME = 308,
+     RESTRICT = 309,
+     SET = 310,
+     SMALLINT = 311,
+     TABLE = 312,
+     TIME = 313,
+     TINYINT = 314,
+     TO = 315,
+     UNIQUE = 316,
+     UNSIGNED = 317,
+     UPDATE = 318,
+     USER = 319,
+     SESSION_USER = 320,
+     SYSTEM_USER = 321,
+     VARCHAR = 322,
+     VARBINARY = 323,
+     VARYING = 324,
+     WITH = 325,
+     ZONE = 326,
+     DOUBLE = 327,
+     IDB_FLOAT = 328,
+     REAL = 329,
+     CHARSET = 330,
+     IDB_IF = 331,
+     EXISTS = 332,
+     CHANGE = 333,
+     TRUNCATE = 334,
+     IDENT = 335,
+     FCONST = 336,
+     SCONST = 337,
+     CP_SEARCH_CONDITION_TEXT = 338,
+     ICONST = 339,
+     DATE = 340
+   };
+#endif
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{
+
+
+  ddlpackage::AlterTableStatement *alterTableStmt;
+  ddlpackage::AlterTableAction *ata;
+  ddlpackage::AlterTableActionList *ataList;
+  ddlpackage::DDL_CONSTRAINT_ATTRIBUTES cattr;
+  std::pair<std::string, std::string> *tableOption;
+  const char *columnOption;
+  ddlpackage::ColumnConstraintDef *columnConstraintDef;
+  ddlpackage::ColumnNameList *columnNameList;
+  ddlpackage::ColumnType* columnType;
+  ddlpackage::ConstraintAttributes *constraintAttributes;
+  ddlpackage::ColumnConstraintList *constraintList;
+  ddlpackage::DDL_CONSTRAINTS constraintType;
+  double dval;
+  bool flag;
+  int ival;
+  ddlpackage::QualifiedName *qualifiedName;
+  ddlpackage::SchemaObject *schemaObject;
+  ddlpackage::SqlStatement *sqlStmt;
+  ddlpackage::SqlStatementList *sqlStmtList;
+  const char *str;
+  ddlpackage::TableConstraintDef *tableConstraint;
+  ddlpackage::TableElementList *tableElementList;
+  ddlpackage::TableOptionMap *tableOptionMap;
+  ddlpackage::ColumnDefaultValue *colDefault;
+  ddlpackage::DDL_MATCH_TYPE matchType;
+  ddlpackage::DDL_REFERENTIAL_ACTION refActionCode;
+  ddlpackage::ReferentialAction *refAction;
+
+
+
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+extern YYSTYPE ddllval;
+
+

dbcon/dmlpackage/dml-gram.h

@@ -0,0 +1,182 @@
+
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     NAME = 258,
+     STRING = 259,
+     INTNUM = 260,
+     APPROXNUM = 261,
+     SELECT = 262,
+     ALL = 263,
+     DISTINCT = 264,
+     NULLX = 265,
+     USER = 266,
+     INDICATOR = 267,
+     AMMSC = 268,
+     PARAMETER = 269,
+     ANY = 270,
+     SOME = 271,
+     OR = 272,
+     AND = 273,
+     NOT = 274,
+     COMPARISON = 275,
+     UMINUS = 276,
+     AS = 277,
+     ASC = 278,
+     AUTHORIZATION = 279,
+     BETWEEN = 280,
+     BY = 281,
+     CHARACTER = 282,
+     CHECK = 283,
+     CLOSE = 284,
+     COMMIT = 285,
+     CONTINUE = 286,
+     CREATE = 287,
+     CURRENT = 288,
+     CURSOR = 289,
+     IDB_DECIMAL = 290,
+     DECLARE = 291,
+     DEFAULT = 292,
+     DELETE = 293,
+     DESC = 294,
+     IDB_DOUBLE = 295,
+     ESCAPE = 296,
+     EXISTS = 297,
+     FETCH = 298,
+     IDB_FLOAT = 299,
+     FOR = 300,
+     FOREIGN = 301,
+     FOUND = 302,
+     FROM = 303,
+     GOTO = 304,
+     GRANT = 305,
+     IDB_GROUP = 306,
+     HAVING = 307,
+     IN = 308,
+     INSERT = 309,
+     INTEGER = 310,
+     INTO = 311,
+     IS = 312,
+     KEY = 313,
+     LANGUAGE = 314,
+     LIKE = 315,
+     NUMERIC = 316,
+     OF = 317,
+     ON = 318,
+     OPEN = 319,
+     OPTION = 320,
+     ORDER = 321,
+     PRECISION = 322,
+     PRIMARY = 323,
+     PRIVILEGES = 324,
+     PROCEDURE = 325,
+     PUBLIC = 326,
+     REAL = 327,
+     REFERENCES = 328,
+     ROLLBACK = 329,
+     SCHEMA = 330,
+     SET = 331,
+     SMALLINT = 332,
+     SQLCODE = 333,
+     SQLERROR = 334,
+     TABLE = 335,
+     TO = 336,
+     UNION = 337,
+     UNIQUE = 338,
+     UPDATE = 339,
+     VALUES = 340,
+     VIEW = 341,
+     WHENEVER = 342,
+     WHERE = 343,
+     WITH = 344,
+     WORK = 345
+   };
+#endif
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{
+
+
+	int intval;
+	double floatval;
+	char *strval;
+	int subtok;
+	dmlpackage::SqlStatementList *sqlStmtList;
+	dmlpackage::SqlStatement *sqlStmt;
+	dmlpackage::TableName* tblName;
+	dmlpackage::ColumnNameList* colNameList;
+	dmlpackage::ValuesOrQuery* valsOrQuery;
+	dmlpackage::ValuesList* valsList;
+	dmlpackage::QuerySpec* querySpec;
+	dmlpackage::TableNameList* tableNameList;
+	dmlpackage::TableExpression* tableExpression;
+	dmlpackage::WhereClause* whereClause;
+	dmlpackage::SearchCondition* searchCondition;
+	dmlpackage::ExistanceTestPredicate* existPredicate;
+	dmlpackage::AllOrAnyPredicate* allOrAnyPredicate;
+	dmlpackage::InPredicate* inPredicate;
+	dmlpackage::NullTestPredicate* nullTestPredicate;
+	dmlpackage::LikePredicate* likePredicate;
+	dmlpackage::BetweenPredicate* betweenPredicate;
+	dmlpackage::ComparisonPredicate* comparisonPredicate;
+	dmlpackage::Predicate* predicate;
+	dmlpackage::FromClause* fromClause;
+	dmlpackage::SelectFilter* selectFilter;
+	dmlpackage::GroupByClause* groupByClause;
+	dmlpackage::HavingClause* havingClause;
+	dmlpackage::Escape* escape;
+	dmlpackage::AtomList* atomList;
+	dmlpackage::ColumnAssignment* colAssignment;
+	dmlpackage::ColumnAssignmentList* colAssignmentList;
+
+
+
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+extern YYSTYPE dmllval;
+
+

dbcon/execplan/tdriver-sm.cpp

@@ -148,7 +148,7 @@ public:
 	void destroySemaphores()
 	{
 		key_t semkey;
-		char* semseed = "/usr/local/MariaDB/Columnstore/etc/Calpont.xml";
+		char* semseed = "/usr/local/mariadb/columnstore/etc/Calpont.xml";
 		int sems, err;
 		
 // 		semkey = ftok(semseed, 0x2149bdd2);   // these things must match in the SM constructor
@@ -166,7 +166,7 @@ public:
 	void destroyShmseg()
 	{
 		key_t shmkey;
-		char* shmseed = "/usr/local/MariaDB/Columnstore/etc/Calpont.xml";
+		char* shmseed = "/usr/local/mariadb/columnstore/etc/Calpont.xml";
 		int shms, err;
 		
 // 		shmkey = ftok(shmseed, 0x2149bdd2);   // these things much match in the SM constructor

dbcon/execplan/tdriver.cpp

@@ -1082,7 +1082,7 @@ public:
 		int oid, oidBase;
 
 		// fake out the objmgr...
-		setenv("CALPONT_CONFIG_FILE", "/usr/local/MariaDB/Columnstore/etc/Calpont.xml", 1);
+		setenv("CALPONT_CONFIG_FILE", "/usr/local/mariadb/columnstore/etc/Calpont.xml", 1);
 		Config* cf = Config::makeConfig();
 		cf->setConfig("OIDManager", "OIDBitmapFile", "./oidbitmap");
 		

dbcon/joblist/fdtests.pl

@@ -6,7 +6,7 @@ use DBI;
 use DBD::mysql;
 
 $databasename='calpont';
-$cnffile='/usr/local/MariaDB/Columnstore/mysql/my.cnf';
+$cnffile='/usr/local/mariadb/columnstore/mysql/my.cnf';
 
 $data_source = 'DBI:mysql:database=' . $databasename . ':mysql_read_default_file=' . $cnffile . '';
 $username = 'root';

dbcon/joblist/largehashjoin.cpp

@@ -42,7 +42,7 @@ namespace
 void logDiskIoInfo(uint64_t stepId, const AnyDataListSPtr& spdl)
 {
 	boost::mutex::scoped_lock lk(fileLock_g);
-	ofstream umDiskIoFile("/var/log/Columnstore/trace/umdiskio.log", ios_base::app);
+	ofstream umDiskIoFile("/var/log/mariadb/columnstore/trace/umdiskio.log", ios_base::app);
 
 	CalpontSystemCatalog::OID oid;
 	uint64_t maxBuckets = 0;
@@ -106,7 +106,7 @@ void logDiskIoInfo(uint64_t stepId, const AnyDataListSPtr& spdl)
 	// move the current file to bak when size above .5 G, so total log is 1 G
 	if (curPos > 0x20000000)
 	{
-		(void)system("/bin/mv /var/log/Columnstore/trace/umdiskio.log /var/log/Columnstore/trace/umdiskio.bak");
+		(void)system("/bin/mv /var/log/mariadb/columnstore/trace/umdiskio.log /var/log/mariadb/columnstore/trace/umdiskio.bak");
 	}
 }
 

dbcon/joblist/tdriver-agg.cpp

@@ -65,7 +65,7 @@ const uint32_t MAX_SIZE = 0x100000;
 const uint32_t MAX_ELEMENTS = 0x20000;
 const uint32_t NUM_THREADS = 4;
 const string datapath="/home/zzhu/genii/tools/dbbuilder/lineitem.tbl";
-//const string datapath="/usr/local/MariaDB/Columnstore/bin/lineitem.tbl";
+//const string datapath="/usr/local/mariadb/columnstore/bin/lineitem.tbl";
 int numConsumers = 1;
 int numRuns = 1;
 int printInterval = numRuns * 100000;

dbcon/mysql/dumpcat.pl

@@ -5,7 +5,7 @@
 use DBI;
 use DBD::mysql;
 
-$data_source = 'DBI:mysql:database=calpontsys:mysql_read_default_file=/usr/local/MariaDB/Columnstore/mysql/my.cnf';
+$data_source = 'DBI:mysql:database=calpontsys:mysql_read_default_file=/usr/local/mariadb/columnstore/mysql/my.cnf';
 $username = 'root';
 $auth = '';
 %attr = ();

dbcon/mysql/install_calpont_mysql.sh

@@ -4,14 +4,14 @@
 #
 
 prefix=/usr/local
-installdir=$prefix/MariaDB/Columnstore
+installdir=$prefix/mariadb/columnstore
 rpmmode=install
 pwprompt=" "
 
 for arg in "$@"; do
 	if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then
 		prefix="`echo $arg | awk -F= '{print $2}'`"
-		installdir=$prefix/MariaDB/Columnstore
+		installdir=$prefix/mariadb/columnstore
 	elif [ `expr -- "$arg" : '--rpmmode='` -eq 10 ]; then
 		rpmmode="`echo $arg | awk -F= '{print $2}'`"
 	elif [ `expr -- "$arg" : '--password='` -eq 11 ]; then

dbcon/mysql/my.cnf

@@ -20,15 +20,15 @@
 [client]
 #password	= your_password
 port		= 3306
-socket		= /usr/local/MariaDB/Columnstore/mysql/lib/mysql/mysql.sock
+socket		= /usr/local/mariadb/columnstore/mysql/lib/mysql/mysql.sock
 
 # Here follows entries for some specific programs
 
 # The MySQL server
 [mysqld]
 port		= 3306
-socket		= /usr/local/MariaDB/Columnstore/mysql/lib/mysql/mysql.sock
-datadir         = /usr/local/MariaDB/Columnstore/mysql/db
+socket		= /usr/local/mariadb/columnstore/mysql/lib/mysql/mysql.sock
+datadir         = /usr/local/mariadb/columnstore/mysql/db
 skip-external-locking
 key_buffer_size = 512M
 max_allowed_packet = 1M
@@ -62,10 +62,10 @@ infinidb_um_mem_limit=0
 infinidb_use_import_for_batchinsert=1
 infinidb_import_for_batchinsert_delimiter=7
 
-basedir                         = /usr/local/MariaDB/Columnstore/mysql/
-character-sets-dir              = /usr/local/MariaDB/Columnstore/mysql/share/mysql/charsets/
-language                        = /usr/local/MariaDB/Columnstore/mysql/share/mysql/english/
-plugin_dir                      = /usr/local/MariaDB/Columnstore/mysql/lib64/mysql/plugin
+basedir                         = /usr/local/mariadb/columnstore/mysql/
+character-sets-dir              = /usr/local/mariadb/columnstore/mysql/share/mysql/charsets/
+language                        = /usr/local/mariadb/columnstore/mysql/share/mysql/english/
+plugin_dir                      = /usr/local/mariadb/columnstore/mysql/lib64/mysql/plugin
 
 # Don't listen on a TCP/IP port at all. This can be a security enhancement,
 # if all processes that need to connect to mysqld run on the same host.
@@ -134,20 +134,20 @@ slave-skip-errors=all
 #master-port     =  <port>
 #
 # binary logging - not required for slaves, but recommended
-log-bin=/usr/local/MariaDB/Columnstore/mysql/db/mysql-bin
-relay-log=/usr/local/MariaDB/Columnstore/mysql/db/relay-bin
-relay-log-index = /usr/local/MariaDB/Columnstore/mysql/db/relay-bin.index 
-relay-log-info-file = /usr/local/MariaDB/Columnstore/mysql/db/relay-bin.info
+log-bin=/usr/local/mariadb/columnstore/mysql/db/mysql-bin
+relay-log=/usr/local/mariadb/columnstore/mysql/db/relay-bin
+relay-log-index = /usr/local/mariadb/columnstore/mysql/db/relay-bin.index 
+relay-log-info-file = /usr/local/mariadb/columnstore/mysql/db/relay-bin.info
 
 # Point the following paths to different dedicated disks
 #tmpdir		= /tmp/		
 #log-update 	= /path-to-dedicated-directory/hostname
 
 # Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = /usr/local/MariaDB/Columnstore/mysql/lib/mysql/
+#innodb_data_home_dir = /usr/local/mariadb/columnstore/mysql/lib/mysql/
 #innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend
-#innodb_log_group_home_dir = /usr/local/MariaDB/Columnstore/mysql/lib/mysql/
-#innodb_log_arch_dir = /usr/local/MariaDB/Columnstore/mysql/lib/mysql/
+#innodb_log_group_home_dir = /usr/local/mariadb/columnstore/mysql/lib/mysql/
+#innodb_log_arch_dir = /usr/local/mariadb/columnstore/mysql/lib/mysql/
 # You can set .._buffer_pool_size up to 50 - 80 %
 # of RAM but beware of setting memory usage too high
 #innodb_buffer_pool_size = 384M

dbcon/mysql/mysql-Columnstore

@@ -25,7 +25,7 @@
 # Description: MySQL is a very fast and reliable SQL database engine.
 ### END INIT INFO
 
-# If you install MySQL on some other places than /usr/local/MariaDB/Columnstore/mysql, then you
+# If you install MySQL on some other places than /usr/local/mariadb/columnstore/mysql, then you
 # have to do one of the following things for this script to work:
 #
 # - Run this script from within the MySQL installation directory
@@ -43,8 +43,8 @@
 # If you change base dir, you must also change datadir. These may get
 # overwritten by settings in the MySQL configuration files.
 
-basedir=/usr/local/MariaDB/Columnstore/mysql
-datadir=/usr/local/MariaDB/Columnstore/mysql/db
+basedir=/usr/local/mariadb/columnstore/mysql
+datadir=/usr/local/mariadb/columnstore/mysql/db
 
 # Default value, in seconds, afterwhich the script should timeout waiting
 # for server start. 
@@ -63,7 +63,7 @@ lock_file_path="$lockdir/mysql-Columnstore"
 mysqld_pid_file_path=
 if test -z "$basedir"
 then
-  basedir=/usr/local/MariaDB/Columnstore/mysql
+  basedir=/usr/local/mariadb/columnstore/mysql
   bindir=/usr/local/bin
   if test -z "$datadir"
   then
@@ -260,7 +260,7 @@ wait_for_ready () {
   i=0
   while test $i -ne $service_startup_timeout ; do
 
-    if $bindir/mysqladmin ping --socket=/usr/local/MariaDB/Columnstore/mysql/lib/mysql/mysql.sock >/dev/null 2>&1; then
+    if $bindir/mysqladmin ping --socket=/usr/local/mariadb/columnstore/mysql/lib/mysql/mysql.sock >/dev/null 2>&1; then
       log_success_msg
       return 0
     elif kill -0 $! 2>/dev/null ; then

dbcon/mysql/schemaSync.pl

@@ -7,7 +7,7 @@ use DBD::mysql;
 
 $| = 1;
 
-$cfgfile='/usr/local/MariaDB/Columnstore/mysql/my.cnf';
+$cfgfile='/usr/local/mariadb/columnstore/mysql/my.cnf';
 
 $username = 'root';
 $auth = '';