diff --git a/ChangeLog b/ChangeLog index 2fd30d5a9..03cae0741 100644 --- a/ChangeLog +++ b/ChangeLog @@ -101,7 +101,7 @@ Bug # Short Description 5785 While running a complex query a Control C aborts the query but may not clear ExeMgr memory 5804 mysql reset occurring following an install when /dev/shm permissions were not set correctly 5838 no prompt postConfigure does not work when mysql password is required. -5873 install failure - No Calpont.xml: failed to be written in config api +5873 install failure - No Columnstore.xml: failed to be written in config api 5881 with replication, delete with idbpm(colname) in where clause failed with an error. 5884 query returns incorrect results when using an on clause filter involving a table not directly involved in the outer join 5887 " Incorrect results of Is Null " @@ -181,7 +181,7 @@ Bug # Short Description 5808 colxml error reported on Windows system. 5811 selecting from a view which has a cross engine join produces an ERROR 122 (HY000): fatal error executing query in crossengine client lib(17)(17) 5817 addModule / altersystem-enablemodule fails on amazon with InfiniDB 4.x -5819 Calpont.xml and Calpont.xml.singleserver do not have the same parameters. +5819 Columnstore.xml and Columnstore.xml.singleserver do not have the same parameters. 5820 Inconsistent rounding on percentile_cont windowing function 5861 post-install reported to have run the setenv-hdfs-12 script on a CDH 4 install 5864 Include calpontSupport in the standard edition @@ -388,7 +388,7 @@ Enh # Short Description 5087 Enhance InfiniDB to support over 32 PMs. 5208 Change the Status Updates messages to have state show an ASCII value 5237 Remove restriction preventing user from dropping a logical partition (segment file) in the last physical partition for a DBRoot -5243 Add setting in Calpont.xml for enable/disable corefiles +5243 Add setting in Columnstore.xml for enable/disable corefiles 5300 calpontSupport script performance improvement and additional features 5316 Include schema name in SQL statement debug log entries 5410 Add support for InfiniDB on Apache Hadoop diff --git a/build/README b/build/README index b6d293d3b..0d5e6035a 100644 --- a/build/README +++ b/build/README @@ -3,7 +3,7 @@ How it Works Now There is a new toplevel directory called build. This contains a couple of scripts and a couple of previously (as far as I can tell) -unmanaged files: Calpont.xml and Doxyfile. It also contains a +unmanaged files: Columnstore.xml and Doxyfile. It also contains a top-level Makefile and a rules.tmpl, which is a template rules file for other makefiles to include. More on that later. @@ -23,7 +23,7 @@ these changes assume its use). b. Copies static elements into the export tree. Static elements are things we use but either don't build or don't build - routinely. This includes Doxyfile, Calpont.xml and + routinely. This includes Doxyfile, Columnstore.xml and net-snmp components. c. Generates a rules.mak from build/build/rules.tmpl to pwd (which diff --git a/build/build.kdevses b/build/build.kdevses index 68701928f..ede7c9f6b 100644 --- a/build/build.kdevses +++ b/build/build.kdevses @@ -104,7 +104,7 @@ - + diff --git a/build/columnstore.community.spec.in b/build/columnstore.community.spec.in index f288cbf7a..d43cf1509 100644 --- a/build/columnstore.community.spec.in +++ b/build/columnstore.community.spec.in @@ -129,12 +129,12 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}.%{release} # -%config /usr/local/mariadb/columnstore/etc/Calpont.xml +%config /usr/local/mariadb/columnstore/etc/Columnstore.xml %config /usr/local/mariadb/columnstore/etc/ConsoleCmds.xml %config /usr/local/mariadb/columnstore/etc/ProcessConfig.xml %config /usr/local/mariadb/columnstore/etc/snmpd.conf %config /usr/local/mariadb/columnstore/etc/snmptrapd.conf -%config /usr/local/mariadb/columnstore/etc/Calpont.xml.singleserver +%config /usr/local/mariadb/columnstore/etc/Columnstore.xml.singleserver %config /usr/local/mariadb/columnstore/etc/ProcessConfig.xml.singleserver %config /usr/local/mariadb/columnstore/etc/snmpd.conf.singleserver %config /usr/local/mariadb/columnstore/etc/snmptrapd.conf.singleserver diff --git a/build/columnstore.spec.in b/build/columnstore.spec.in index af6d5ce5d..9f87c6749 100644 --- a/build/columnstore.spec.in +++ b/build/columnstore.spec.in @@ -140,12 +140,12 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}.%{release} # -%config /usr/local/mariadb/columnstore/etc/Calpont.xml +%config /usr/local/mariadb/columnstore/etc/Columnstore.xml %config /usr/local/mariadb/columnstore/etc/ConsoleCmds.xml %config /usr/local/mariadb/columnstore/etc/ProcessConfig.xml %config /usr/local/mariadb/columnstore/etc/snmpd.conf %config /usr/local/mariadb/columnstore/etc/snmptrapd.conf -%config /usr/local/mariadb/columnstore/etc/Calpont.xml.singleserver +%config /usr/local/mariadb/columnstore/etc/Columnstore.xml.singleserver %config /usr/local/mariadb/columnstore/etc/ProcessConfig.xml.singleserver %config /usr/local/mariadb/columnstore/etc/snmpd.conf.singleserver %config /usr/local/mariadb/columnstore/etc/snmptrapd.conf.singleserver diff --git a/build/genVersion.sh b/build/genVersion.sh index b3998cbab..4d6c2eefd 100755 --- a/build/genVersion.sh +++ b/build/genVersion.sh @@ -29,7 +29,7 @@ . ./build/releasenum -mkdir -p ${prefix}/include +#mkdir -p ${prefix}/include echo " #ifndef VERSIONNUMBER_H_ diff --git a/build/infinidb.spec.in b/build/infinidb.spec.in index 3e5c73377..2531044a0 100644 --- a/build/infinidb.spec.in +++ b/build/infinidb.spec.in @@ -148,12 +148,12 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}-%{release} # -%config /usr/local/mariadb/columnstore/etc/Calpont.xml +%config /usr/local/mariadb/columnstore/etc/Columnstore.xml %config /usr/local/mariadb/columnstore/etc/ConsoleCmds.xml %config /usr/local/mariadb/columnstore/etc/ProcessConfig.xml %config /usr/local/mariadb/columnstore/etc/snmpd.conf %config /usr/local/mariadb/columnstore/etc/snmptrapd.conf -%config /usr/local/mariadb/columnstore/etc/Calpont.xml.singleserver +%config /usr/local/mariadb/columnstore/etc/Columnstore.xml.singleserver %config /usr/local/mariadb/columnstore/etc/ProcessConfig.xml.singleserver %config /usr/local/mariadb/columnstore/etc/snmpd.conf.singleserver %config /usr/local/mariadb/columnstore/etc/snmptrapd.conf.singleserver diff --git a/build/infinidb.spec.in.4.5 b/build/infinidb.spec.in.4.5 index 600dded91..b8145d580 100755 --- a/build/infinidb.spec.in.4.5 +++ b/build/infinidb.spec.in.4.5 @@ -152,12 +152,12 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}-%{release} /usr/local/Calpont/bin/remote_command_verify.sh # -%config /usr/local/Calpont/etc/Calpont.xml +%config /usr/local/Calpont/etc/Columnstore.xml %config /usr/local/Calpont/etc/ConsoleCmds.xml %config /usr/local/Calpont/etc/ProcessConfig.xml %config /usr/local/Calpont/etc/snmpd.conf %config /usr/local/Calpont/etc/snmptrapd.conf -%config /usr/local/Calpont/etc/Calpont.xml.singleserver +%config /usr/local/Calpont/etc/Columnstore.xml.singleserver %config /usr/local/Calpont/etc/ProcessConfig.xml.singleserver %config /usr/local/Calpont/etc/snmpd.conf.singleserver %config /usr/local/Calpont/etc/snmptrapd.conf.singleserver diff --git a/build/nightly-mini-tester.sh b/build/nightly-mini-tester.sh index 5469bf90e..d245d5bc3 100755 --- a/build/nightly-mini-tester.sh +++ b/build/nightly-mini-tester.sh @@ -71,8 +71,8 @@ if [ ! -e ${prefix}/Calpont/lib/libjemalloc.so ]; then popd >/dev/null fi -if [ ! -f ${prefix}/Calpont/etc/Calpont.xml.rpmsave ]; then - cp ${prefix}/Calpont/etc/Calpont.xml.singleserver ${prefix}/Calpont/etc/Calpont.xml.rpmsave +if [ ! -f ${prefix}/Calpont/etc/Columnstore.xml.rpmsave ]; then + cp ${prefix}/Calpont/etc/Columnstore.xml.singleserver ${prefix}/Calpont/etc/Columnstore.xml.rpmsave fi if [ ! -f ${prefix}/Calpont/mysql/my.cnf ]; then diff --git a/dbcon/execplan/calpontsystemcatalog.h b/dbcon/execplan/calpontsystemcatalog.h index c14cbd607..42b721d65 100644 --- a/dbcon/execplan/calpontsystemcatalog.h +++ b/dbcon/execplan/calpontsystemcatalog.h @@ -87,7 +87,7 @@ namespace messageqcpp class MessageQueueClient; } -// This is now set in the calpont xml file +// This is now set in the Columnstore.xml file // Use, e.g., 0x500 for uid 500 so it is easy to spot in ipcs list //const int32_t BRM_UID = 0x0; diff --git a/dbcon/execplan/sessionmanager.h b/dbcon/execplan/sessionmanager.h index b5100da67..bbcfc5bf5 100644 --- a/dbcon/execplan/sessionmanager.h +++ b/dbcon/execplan/sessionmanager.h @@ -47,7 +47,7 @@ namespace execplan { * Note: Added a macro 'DESTROYSHMSEG' which enables/disables the code to load/save * and deallocate the shared memory segment. * - * This class uses 3 parameters from the Calpont.xml file: + * This class uses 3 parameters from the Columnstore.xml file: * SessionManager/MaxConcurrentTransactions: defines how many active transactions the * system should support. When a new request comes in and there are already * MaxConcurrentTransactions active, the new request blocks by default. The diff --git a/dbcon/execplan/sessionmonitor.h b/dbcon/execplan/sessionmonitor.h index 9e144b89e..1daf2fea7 100644 --- a/dbcon/execplan/sessionmonitor.h +++ b/dbcon/execplan/sessionmonitor.h @@ -48,7 +48,7 @@ namespace execplan { /** @brief Identifies stale and orphaned transaction IDs. * * - * This class uses 2 parameters from the Calpont.xml file: + * This class uses 2 parameters from the Columnstore.xml file: * SessionManager/MaxConcurrentTransactions: defines how many active transactions the * system should support. When a new request comes in and there are already * MaxConcurrentTransactions active, the new request blocks by default. The diff --git a/dbcon/execplan/tdriver-sm.cpp b/dbcon/execplan/tdriver-sm.cpp index 433f1f74c..d462c6e4d 100644 --- a/dbcon/execplan/tdriver-sm.cpp +++ b/dbcon/execplan/tdriver-sm.cpp @@ -149,7 +149,7 @@ public: void destroySemaphores() { key_t semkey; - char* semseed = "/usr/local/mariadb/columnstore/etc/Calpont.xml"; + char* semseed = "/usr/local/mariadb/columnstore/etc/Columnstore.xml"; int sems, err; // semkey = ftok(semseed, 0x2149bdd2); // these things must match in the SM constructor @@ -167,7 +167,7 @@ public: void destroyShmseg() { key_t shmkey; - char* shmseed = "/usr/local/mariadb/columnstore/etc/Calpont.xml"; + char* shmseed = "/usr/local/mariadb/columnstore/etc/Columnstore.xml"; int shms, err; // shmkey = ftok(shmseed, 0x2149bdd2); // these things much match in the SM constructor diff --git a/dbcon/execplan/tdriver.cpp b/dbcon/execplan/tdriver.cpp index f2c6b8d80..6129bbf14 100644 --- a/dbcon/execplan/tdriver.cpp +++ b/dbcon/execplan/tdriver.cpp @@ -1083,7 +1083,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/Columnstore.xml", 1); Config* cf = Config::makeConfig(); cf->setConfig("OIDManager", "OIDBitmapFile", "./oidbitmap"); diff --git a/dbcon/joblist/joblist.h b/dbcon/joblist/joblist.h index 701882dbc..d5652ab13 100644 --- a/dbcon/joblist/joblist.h +++ b/dbcon/joblist/joblist.h @@ -134,7 +134,7 @@ protected: bool fIsExeMgr; int fPmsConnected; - // Dirty pool kludge. Contains the number of PMs configured in Calpont.xml. + // Dirty pool kludge. Contains the number of PMs configured in Columnstore.xml. // This kludge reduces the number of calls needed to config.Config, which are expensive. static int fPmsConfigured; diff --git a/dbcon/joblist/largehashjoin.h b/dbcon/joblist/largehashjoin.h index cab7ff7f3..196c13b5f 100644 --- a/dbcon/joblist/largehashjoin.h +++ b/dbcon/joblist/largehashjoin.h @@ -149,7 +149,7 @@ public: DataList* hashResult; }; - boost::scoped_array controls; //TODO: needs to be >= HJ threads from Calpont.xml + boost::scoped_array controls; //TODO: needs to be >= HJ threads from Columnstore.xml typedef struct thrParams_struct { HashJoin* hjptr; uint32_t startBucket; diff --git a/dbcon/joblist/rowestimator.h b/dbcon/joblist/rowestimator.h index b6d03524a..a477e90ab 100644 --- a/dbcon/joblist/rowestimator.h +++ b/dbcon/joblist/rowestimator.h @@ -128,7 +128,7 @@ private: const uint8_t BOP, const uint32_t& rowsInExtent); - // Configurables read from Calpont.xml - future. + // Configurables read from Columnstore.xml - future. uint32_t fExtentsToSample; uint32_t fIntDistinctAdjust; uint32_t fDecDistinctAdjust; diff --git a/dbcon/joblist/tdriver-bru.cpp b/dbcon/joblist/tdriver-bru.cpp index 98f33f304..521a9193b 100644 --- a/dbcon/joblist/tdriver-bru.cpp +++ b/dbcon/joblist/tdriver-bru.cpp @@ -168,12 +168,12 @@ void BucketReUseDriver::parseConfig() { cout << "ut: parseConfig start...\n" << endl; - // before run this test, make sure "tpch.lineitem.l_orderkey" is in the Calpont.xml + // before run this test, make sure "tpch.lineitem.l_orderkey" is in the Columnstore.xml BucketReuseManager* control = BucketReuseManager::instance(); ResourceManager rm; BucketReuseManager::instance()->startup(rm); - // list all the predicates if any listed in the Calpont.xml file + // list all the predicates if any listed in the Columnstore.xml file for (BucketReuseMap::iterator it = control->fControlMap.begin(); it != control->fControlMap.end(); it++) cout << *(it->second); @@ -530,7 +530,7 @@ void BucketReUseDriver::initControl(execplan::CalpontSystemCatalog::OID& oid) BucketReuseManager* control = BucketReuseManager::instance(); if (found == false) { - cout << "tpch.lineitem.l_orderkey is not in the Calpont.xml!)" << endl; + cout << "tpch.lineitem.l_orderkey is not in the Columnstore.xml!)" << endl; cout << "insert it to countinue unit test" << endl; size_t schemap = column.find_first_of("."); diff --git a/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp index 39b58ce96..6bce405bb 100755 --- a/dbcon/mysql/ha_calpont_impl.cpp +++ b/dbcon/mysql/ha_calpont_impl.cpp @@ -2325,7 +2325,7 @@ int ha_calpont_impl_rnd_init(TABLE* table) if (!getenv("CALPONT_CONFIG_FILE")) { - string calpontConfigFile(home + "/Calpont/etc/Calpont.xml"); + string calpontConfigFile(home + "/Calpont/etc/Columnstore.xml"); setenv("CALPONT_CONFIG_FILE", calpontConfigFile.c_str(), 1); } diff --git a/oam/cloud/IDBInstanceCmds.sh b/oam/cloud/IDBInstanceCmds.sh index 51e446092..1d7351594 100644 --- a/oam/cloud/IDBInstanceCmds.sh +++ b/oam/cloud/IDBInstanceCmds.sh @@ -192,7 +192,7 @@ getInstancePrivate() { getZone() { - #get from Calpont.xml if it's there, if not, get from instance then store + #get from Columnstore.xml if it's there, if not, get from instance then store zone=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonZone` if [ "$zone" = "unassigned" ] || [ "$zone" = "" ]; then diff --git a/oam/etc/AlarmConfig.xml b/oam/etc/AlarmConfig.xml index 9a08916d6..31c3ed64f 100644 --- a/oam/etc/AlarmConfig.xml +++ b/oam/etc/AlarmConfig.xml @@ -1,6 +1,6 @@ - + 1 CPU_USAGE_HIGH @@ -325,4 +325,4 @@ 0 0 - + diff --git a/oam/etc/Calpont.xml b/oam/etc/Calpont.xml index d647d4d7d..5350eafab 100755 --- a/oam/etc/Calpont.xml +++ b/oam/etc/Calpont.xml @@ -1,5 +1,5 @@ - + + 127.0.0.1 diff --git a/oam/etc/Columnstore.xml b/oam/etc/Columnstore.xml new file mode 100644 index 000000000..a063e0b56 --- /dev/null +++ b/oam/etc/Columnstore.xml @@ -0,0 +1,545 @@ + + + + + + 0.0.0.0 + 8601 + unassigned + + + 0.0.0.0 + 8602 + + + 0.0.0.0 + 8603 + + + 0.0.0.0 + 8604 + + + 0.0.0.0 + 8605 + + + + + 127.0.0.1 + 8800 + + + 0.0.0.0 + 8800 + + + 0.0.0.0 + 8800 + + + 0.0.0.0 + 8800 + + + 0.0.0.0 + 8622 + + + 0.0.0.0 + 8622 + + + 0.0.0.0 + 8622 + + + 0.0.0.0 + 8630 + + + 0.0.0.0 + 8612 + + + 0.0.0.0 + 8614 + + + 10000 + + + 1 + 8 + 128 + 10K + 0 + 13 + 512 + 512 + + 1 + 0 + y + + + + y + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + 0.0.0.0 + 8620 + + + C + columnstore-1 + pm1 + unassigned + unassigned + 1 + 3 + 6 // 2.5 minutes + + + 1 + $INSTALLDIR/data1 + $INSTALLDIR/data1/systemFiles/dbrm/BRM_saves + $INSTALLDIR/data1/systemFiles/dbrm/tablelocks + 20 + 100000 + 90 + 80 + 70 + /tmp + /tmp + 10 + 0.0.0.0 + 128M + 10 + /tmp/columnstore_tmp_files + $INSTALLDIR + 10 + 120 + restartSystem + n + 95 + OFF + + /tmp/rdwrscratch + + + dm + Director Module + SIMPLEX + 0 + 0.0.0.0 + unassigned + ENABLED + 0 + 0 + 0 + 0 + 90 + 80 + 70 + 90 + 0 + 0 + 90 + 80 + 70 + / + unassigned + unassigned + um + User Module + SIMPLEX + 1 + 0.0.0.0 + unassigned + ENABLED + 0 + 0 + 0 + 0 + 90 + 80 + 70 + 90 + 0 + 0 + 90 + 80 + 70 + / + unassigned + unassigned + pm + Performance Module + SIMPLEX + 1 + 0.0.0.0 + unassigned + ENABLED + 0 + 0 + 0 + 0 + 90 + 80 + 70 + 90 + 0 + 0 + 90 + 80 + 70 + / + 1 + 1 + + + 0 + unassigned + 0.0.0.0 + ENABLED + + + 1000 + $INSTALLDIR/data1/systemFiles/dbrm/SMTxnID + + + + 1GB + + + + $INSTALLDIR/data1/systemFiles/dbrm/oidbitmap + + 3000 + + + $INSTALLDIR/data/bulk + $INSTALLDIR/data1/systemFiles/bulkRollback + 98 + 1 + + + 1 + 0.0.0.0 + 8616 + + + + 0.0.0.0 + 8700 + unassigned + + + 0.0.0.0 + 8700 + unassigned + + + 0.0.0.0 + 8700 + unassigned + + + 0.0.0.0 + 8700 + unassigned + + + 0.0.0.0 + 8700 + unassigned + + + 0.0.0.0 + 8700 + unassigned + + + 0.0.0.0 + 8700 + unassigned + + + 0.0.0.0 + 8700 + unassigned + + + 0.0.0.0 + 8700 + unassigned + + + 0.0.0.0 + 8700 + unassigned + + + + + + 1 + 0 + 0 + 65536 + 2K + 200 + 0 + + + n + n + n + 2 + n + n + internal + internal + rpm + unassigned + mariadb1 + unassigned + unassigned + unassigned + us-east-1 + unassigned + unassigned + autoassign + y + unassigned + unassigned + unassigned + standard + unassigned + unassigned + unassigned + standard + unassigned + y + y + 0 + unassigned + unassigned + n + 0 + unassigned + n + unassigned + unassigned + 3306 + unassigned + /dev/xvd + + + + 4 + 2 + 0x0 + + + 128 + 128K + 128 + 64M + 50% + 10% + 100 + N + + $INSTALLDIR/tmp + Y + + + 16K + 32 + 1 + + + 20 + + + 1M + 1M + 512 + + + + + + + + unassigned + 3306 + unassigned + + + + N + + + N + + + Y + + + 127.0.0.1 + 0 + + + diff --git a/oam/etc/Columnstore.xml.singleserver b/oam/etc/Columnstore.xml.singleserver new file mode 100644 index 000000000..3cc0832ca --- /dev/null +++ b/oam/etc/Columnstore.xml.singleserver @@ -0,0 +1,531 @@ + + + + + 127.0.0.1 + 8601 + pm1 + + + 0.0.0.0 + 8602 + + + 127.0.0.1 + 8603 + + + 127.0.0.1 + 8604 + + + 0.0.0.0 + 8605 + + + 127.0.0.1 + 8800 + + + 0.0.0.0 + 8800 + + + 0.0.0.0 + 8800 + + + 127.0.0.1 + 8800 + + + 0.0.0.0 + 8622 + + + 0.0.0.0 + 8622 + + + 127.0.0.1 + 8622 + + + 127.0.0.1 + 8630 + + + 127.0.0.1 + 8612 + + + 127.0.0.1 + 8614 + + + 10000 + + + 1 + 8 + 128 + + 10K + 0 + 13 + 512 + 512 + + 1 + 0 + n + + + + 95 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + 127.0.0.1 + 8620 + + + C + columnstore-1 + pm1 + unassigned + + + 1 + $INSTALLDIR/data1 + $INSTALLDIR/data1/systemFiles/dbrm/BRM_saves + $INSTALLDIR/data1/systemFiles/dbrm/tablelocks + 20 + 100000 + 90 + 80 + 70 + /tmp + /tmp + 10 + 0.0.0.0 + 128M + 10 + /tmp/columnstore_tmp_files + $INSTALLDIR + 10 + 3 + 10 + 120 + restartSystem + n + 95 + OFF + + /tmp/rdwrscratch + + + dm + Director Module + SIMPLEX + 0 + 0.0.0.0 + unassigned + ENABLED + 0 + 0 + 0 + 0 + 90 + 80 + 70 + 90 + 0 + 0 + 90 + 80 + 70 + / + unassigned + unassigned + um + User Module + SIMPLEX + 0 + 0.0.0.0 + unassigned + ENABLED + 0 + 0 + 0 + 0 + 90 + 80 + 70 + 90 + 0 + 0 + 90 + 80 + 70 + / + unassigned + unassigned + pm + Performance Module + SIMPLEX + 1 + 127.0.0.1 + localhost + ENABLED + 0 + 0 + 0 + 0 + 90 + 80 + 70 + 90 + 0 + 0 + 90 + 80 + 70 + / + 1 + 1 + + + 0 + unassigned + 0.0.0.0 + ENABLED + + + 1000 + $INSTALLDIR/data1/systemFiles/dbrm/CalpontShm + $INSTALLDIR/data1/systemFiles/dbrm/SMTxnID + + + $INSTALLDIR/data1/systemFiles/dbrm/CalpontSessionMonitorShm + 10 + + + + 1GB + + + + + $INSTALLDIR/data1/systemFiles/dbrm/oidbitmap + + 3000 + + + $INSTALLDIR/data/bulk + $INSTALLDIR/data/bulk/rollback + 98 + 1 + + + 1 + 127.0.0.1 + 8616 + + + + 127.0.0.1 + 8700 + pm1 + + + 0.0.0.0 + 8700 + unassigned + + + 0.0.0.0 + 8700 + unassigned + + + 0.0.0.0 + 8700 + unassigned + + + 0.0.0.0 + 8700 + unassigned + + + 0.0.0.0 + 8700 + unassigned + + + 0.0.0.0 + 8700 + unassigned + + + 0.0.0.0 + 8700 + unassigned + + + 0.0.0.0 + 8700 + unassigned + + + 0.0.0.0 + 8700 + unassigned + + + + 50 + + 1 + 0 + 0 + 65536 + 2K + 200 + 0 + + + n + y + y + 2 + n + n + internal + internal + unassigned + unassigned + unassigned + rpm + y + unassigned + unassigned + us-east-1 + unassigned + unassigned + unassigned + unassigned + unassigned + unassigned + unassigned + unassigned + n + n + 0 + unassigned + unassigned + n + unassigned + unassigned + 3306 + unassigned + + + + 4 + 2 + 0x0 + + + 128 + 128K + 128 + 64M + 25% + 10% + 100 + N + + $INSTALLDIR/tmp + Y + + + 16K + 32 + 1 + + + 20 + + + 1M + 1M + 512 + + + + + + + + unassigned + 3306 + unassigned + + + + N + + + N + + + Y + + + 127.0.0.1 + 0 + + diff --git a/oam/etc/ConsoleCmds.xml b/oam/etc/ConsoleCmds.xml index 8a2c58175..1e1db49a6 100644 --- a/oam/etc/ConsoleCmds.xml +++ b/oam/etc/ConsoleCmds.xml @@ -1,6 +1,6 @@ - + help Get help on the Console Commands @@ -418,4 +418,4 @@ AVAILABLE - + diff --git a/oam/etc/Doxyfile b/oam/etc/Doxyfile new file mode 100644 index 000000000..fef1ae387 --- /dev/null +++ b/oam/etc/Doxyfile @@ -0,0 +1,275 @@ +# Doxyfile 1.4.1-KDevelop + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- +PROJECT_NAME = etc.kdevelop +PROJECT_NUMBER = $VERSION$ +OUTPUT_DIRECTORY = +CREATE_SUBDIRS = NO +OUTPUT_LANGUAGE = English +USE_WINDOWS_ENCODING = NO +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ABBREVIATE_BRIEF = "The $name class" \ + "The $name widget" \ + "The $name file" \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the +ALWAYS_DETAILED_SEC = NO +INLINE_INHERITED_MEMB = NO +FULL_PATH_NAMES = YES +STRIP_FROM_PATH = /home/dhill/InfiniDB/oam/cloud/ +STRIP_FROM_INC_PATH = +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = NO +MULTILINE_CPP_IS_BRIEF = NO +DETAILS_AT_TOP = NO +INHERIT_DOCS = YES +DISTRIBUTE_GROUP_DOC = NO +TAB_SIZE = 8 +ALIASES = +OPTIMIZE_OUTPUT_FOR_C = NO +OPTIMIZE_OUTPUT_JAVA = NO +SUBGROUPING = YES +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- +EXTRACT_ALL = NO +EXTRACT_PRIVATE = NO +EXTRACT_STATIC = NO +EXTRACT_LOCAL_CLASSES = YES +EXTRACT_LOCAL_METHODS = NO +HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_CLASSES = NO +HIDE_FRIEND_COMPOUNDS = NO +HIDE_IN_BODY_DOCS = NO +INTERNAL_DOCS = NO +CASE_SENSE_NAMES = YES +HIDE_SCOPE_NAMES = NO +SHOW_INCLUDE_FILES = YES +INLINE_INFO = YES +SORT_MEMBER_DOCS = YES +SORT_BRIEF_DOCS = NO +SORT_BY_SCOPE_NAME = NO +GENERATE_TODOLIST = YES +GENERATE_TESTLIST = YES +GENERATE_BUGLIST = YES +GENERATE_DEPRECATEDLIST= YES +ENABLED_SECTIONS = +MAX_INITIALIZER_LINES = 30 +SHOW_USED_FILES = YES +SHOW_DIRECTORIES = YES +FILE_VERSION_FILTER = +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- +QUIET = NO +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES +WARN_NO_PARAMDOC = NO +WARN_FORMAT = "$file:$line: $text" +WARN_LOGFILE = +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- +INPUT = /home/dhill/mariadb-columnstore-engine/oam/etc +FILE_PATTERNS = *.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.java \ + *.ii \ + *.ixx \ + *.ipp \ + *.i++ \ + *.inl \ + *.h \ + *.hh \ + *.hxx \ + *.hpp \ + *.h++ \ + *.idl \ + *.odl \ + *.cs \ + *.php \ + *.php3 \ + *.inc \ + *.m \ + *.mm \ + *.dox \ + *.C \ + *.CC \ + *.C++ \ + *.II \ + *.I++ \ + *.H \ + *.HH \ + *.H++ \ + *.CS \ + *.PHP \ + *.PHP3 \ + *.M \ + *.MM \ + *.C \ + *.H \ + *.tlh \ + *.diff \ + *.patch \ + *.moc \ + *.xpm \ + *.dox +RECURSIVE = yes +EXCLUDE = +EXCLUDE_SYMLINKS = NO +EXCLUDE_PATTERNS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = * +EXAMPLE_RECURSIVE = NO +IMAGE_PATH = +INPUT_FILTER = +FILTER_PATTERNS = +FILTER_SOURCE_FILES = NO +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- +SOURCE_BROWSER = NO +INLINE_SOURCES = NO +STRIP_CODE_COMMENTS = YES +REFERENCED_BY_RELATION = YES +REFERENCES_RELATION = YES +VERBATIM_HEADERS = YES +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- +ALPHABETICAL_INDEX = NO +COLS_IN_ALPHA_INDEX = 5 +IGNORE_PREFIX = +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- +GENERATE_HTML = YES +HTML_OUTPUT = html +HTML_FILE_EXTENSION = .html +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = +HTML_ALIGN_MEMBERS = YES +GENERATE_HTMLHELP = NO +CHM_FILE = +HHC_LOCATION = +GENERATE_CHI = NO +BINARY_TOC = NO +TOC_EXPAND = NO +DISABLE_INDEX = NO +ENUM_VALUES_PER_LINE = 4 +GENERATE_TREEVIEW = NO +TREEVIEW_WIDTH = 250 +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- +GENERATE_LATEX = YES +LATEX_OUTPUT = latex +LATEX_CMD_NAME = latex +MAKEINDEX_CMD_NAME = makeindex +COMPACT_LATEX = NO +PAPER_TYPE = a4wide +EXTRA_PACKAGES = +LATEX_HEADER = +PDF_HYPERLINKS = NO +USE_PDFLATEX = NO +LATEX_BATCHMODE = NO +LATEX_HIDE_INDICES = NO +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- +GENERATE_RTF = NO +RTF_OUTPUT = rtf +COMPACT_RTF = NO +RTF_HYPERLINKS = NO +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- +GENERATE_MAN = NO +MAN_OUTPUT = man +MAN_EXTENSION = .3 +MAN_LINKS = NO +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- +GENERATE_XML = yes +XML_OUTPUT = xml +XML_SCHEMA = +XML_DTD = +XML_PROGRAMLISTING = YES +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- +GENERATE_AUTOGEN_DEF = NO +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- +GENERATE_PERLMOD = NO +PERLMOD_LATEX = NO +PERLMOD_PRETTY = YES +PERLMOD_MAKEVAR_PREFIX = +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- +ENABLE_PREPROCESSING = YES +MACRO_EXPANSION = NO +EXPAND_ONLY_PREDEF = NO +SEARCH_INCLUDES = YES +INCLUDE_PATH = +INCLUDE_FILE_PATTERNS = +PREDEFINED = +EXPAND_AS_DEFINED = +SKIP_FUNCTION_MACROS = YES +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- +TAGFILES = +GENERATE_TAGFILE = etc.tag +ALLEXTERNALS = NO +EXTERNAL_GROUPS = YES +PERL_PATH = /usr/bin/perl +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- +CLASS_DIAGRAMS = YES +HIDE_UNDOC_RELATIONS = YES +HAVE_DOT = NO +CLASS_GRAPH = YES +COLLABORATION_GRAPH = YES +GROUP_GRAPHS = YES +UML_LOOK = NO +TEMPLATE_RELATIONS = NO +INCLUDE_GRAPH = YES +INCLUDED_BY_GRAPH = YES +CALL_GRAPH = NO +GRAPHICAL_HIERARCHY = YES +DIRECTORY_GRAPH = YES +DOT_IMAGE_FORMAT = png +DOT_PATH = +DOTFILE_DIRS = +MAX_DOT_GRAPH_WIDTH = 1024 +MAX_DOT_GRAPH_HEIGHT = 1024 +MAX_DOT_GRAPH_DEPTH = 1000 +DOT_TRANSPARENT = NO +DOT_MULTI_TARGETS = NO +GENERATE_LEGEND = YES +DOT_CLEANUP = YES +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO diff --git a/oam/etc/Makefile.am b/oam/etc/Makefile.am index 98f3f45af..c1baa8ab7 100644 --- a/oam/etc/Makefile.am +++ b/oam/etc/Makefile.am @@ -15,7 +15,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301, USA. -dist_sysconf_DATA = AlarmConfig.xml Calpont.xml ProcessConfig.xml ConsoleCmds.xml Calpont.xml.singleserver ProcessConfig.xml.singleserver +dist_sysconf_DATA = AlarmConfig.xml Columnstore.xml ProcessConfig.xml ConsoleCmds.xml Columnstore.xml.singleserver ProcessConfig.xml.singleserver test: diff --git a/oam/etc/Makefile.in b/oam/etc/Makefile.in index 14500c0f7..5e706e412 100644 --- a/oam/etc/Makefile.in +++ b/oam/etc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -31,57 +31,15 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301, USA. +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -96,73 +54,32 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = oam/etc -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_sysconf_DATA) +DIST_COMMON = $(dist_sysconf_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = SOURCES = DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(sysconfdir)" +dist_sysconfDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_sysconf_DATA) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -180,22 +97,18 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ +ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -INSTALL = @INSTALL@ +F77 = @F77@ +FFLAGS = @FFLAGS@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -203,24 +116,15 @@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POW_LIB = @POW_LIB@ @@ -234,15 +138,16 @@ XML2_CONFIG = @XML2_CONFIG@ XML_CPPFLAGS = @XML_CPPFLAGS@ XML_LIBS = @XML_LIBS@ YACC = @YACC@ -YFLAGS = @YFLAGS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -254,11 +159,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -builddir = @builddir@ datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ etcdir = @etcdir@ exec_prefix = @exec_prefix@ host = @host@ @@ -266,7 +167,6 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -htmldir = @htmldir@ idb_brm_libs = @idb_brm_libs@ idb_cflags = @idb_cflags@ idb_common_includes = @idb_common_includes@ @@ -285,7 +185,6 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localdir = @localdir@ -localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ march_flags = @march_flags@ @@ -294,22 +193,16 @@ mkdir_p = @mkdir_p@ mysqldir = @mysqldir@ netsnmp_libs = @netsnmp_libs@ oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ postdir = @postdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ -psdir = @psdir@ sbindir = @sbindir@ sharedir = @sharedir@ sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ toolsdir = @toolsdir@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -dist_sysconf_DATA = AlarmConfig.xml Calpont.xml ProcessConfig.xml ConsoleCmds.xml Calpont.xml.singleserver ProcessConfig.xml.singleserver +dist_sysconf_DATA = AlarmConfig.xml Columnstore.xml ProcessConfig.xml ConsoleCmds.xml Columnstore.xml.singleserver ProcessConfig.xml.singleserver all: all-am .SUFFIXES: @@ -317,14 +210,14 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu oam/etc/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu oam/etc/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu oam/etc/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu oam/etc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -342,68 +235,64 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: install-dist_sysconfDATA: $(dist_sysconf_DATA) @$(NORMAL_INSTALL) - @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ - fi; \ - for p in $$list; do \ + test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" + @list='$(dist_sysconf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ + f=$(am__strip_dir) \ + echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ + $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ done uninstall-dist_sysconfDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir) -tags TAGS: + @list='$(dist_sysconf_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \ + done +tags: TAGS +TAGS: -ctags CTAGS: - -cscope cscopelist: +ctags: CTAGS +CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ || exit 1; \ fi; \ done @@ -412,7 +301,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(sysconfdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -424,22 +313,16 @@ install-am: all-am installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -450,7 +333,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic +distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -458,38 +341,18 @@ dvi-am: html: html-am -html-am: - info: info-am info-am: install-data-am: -install-dvi: install-dvi-am - -install-dvi-am: - install-exec-am: install-dist_sysconfDATA -install-html: install-html-am - -install-html-am: - install-info: install-info-am -install-info-am: - install-man: -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - installcheck-am: maintainer-clean: maintainer-clean-am @@ -508,22 +371,18 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_sysconfDATA - -.MAKE: install-am install-strip +uninstall-am: uninstall-dist_sysconfDATA uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-dist_sysconfDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ - uninstall-am uninstall-dist_sysconfDATA + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dist_sysconfDATA \ + install-exec install-exec-am install-info install-info-am \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-dist_sysconfDATA \ + uninstall-info-am test: @@ -535,7 +394,6 @@ leakcheck: docs: bootstrap: install-data-am - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/oam/etc/ProcessConfig.xml b/oam/etc/ProcessConfig.xml index 1a83d6910..8b6a56f91 100644 --- a/oam/etc/ProcessConfig.xml +++ b/oam/etc/ProcessConfig.xml @@ -1,6 +1,6 @@ - + ProcessMonitor ChildExtOAMModule @@ -179,4 +179,4 @@ LOADSHARE off - + diff --git a/oam/etc/ProcessConfig.xml.singleserver b/oam/etc/ProcessConfig.xml.singleserver index 92d8048e4..82d622c53 100644 --- a/oam/etc/ProcessConfig.xml.singleserver +++ b/oam/etc/ProcessConfig.xml.singleserver @@ -1,6 +1,6 @@ - + ProcessMonitor ChildExtOAMModule @@ -179,4 +179,4 @@ LOADSHARE off - + diff --git a/oam/etc/etc.kdevelop b/oam/etc/etc.kdevelop new file mode 100644 index 000000000..1e7891a4f --- /dev/null +++ b/oam/etc/etc.kdevelop @@ -0,0 +1,102 @@ + + + + + dhill@srvhill04.calpont.com + $VERSION$ + KDevCustomProject + C + + + + + etc + executable + + + + + + + + + + ada + ada_bugs_gcc + bash + bash_bugs + clanlib + fortran_bugs_gcc + gnome1 + gnustep + gtk + gtk_bugs + haskell + haskell_bugs_ghc + java_bugs_gcc + java_bugs_sun + kde2book + libstdc++ + opengl + pascal_bugs_fp + php + php_bugs + perl + perl_bugs + python + python_bugs + qt-kdev3 + ruby + ruby_bugs + sdl + stl + sw + w3c-dom-level2-html + w3c-svg + w3c-uaag10 + wxwidgets_bugs + + + Guide to the Qt Translation Tools + Qt Assistant Manual + Qt Designer Manual + Qt Reference Documentation + qmake User Guide + + + KDE Libraries (Doxygen) + + + + + + + + + + + + + true + true + true + false + true + true + true + 250 + 400 + 250 + + + + + false + false + + + *.o,*.lo,CVS + false + + + diff --git a/oam/etc/etc.kdevelop.filelist b/oam/etc/etc.kdevelop.filelist new file mode 100644 index 000000000..4e56559b4 --- /dev/null +++ b/oam/etc/etc.kdevelop.filelist @@ -0,0 +1,3 @@ +# KDevelop Custom Project File List +Makefile.am +Makefile.in diff --git a/oam/etc/etc.kdevelop.pcs b/oam/etc/etc.kdevelop.pcs new file mode 100644 index 000000000..e311b7a3f Binary files /dev/null and b/oam/etc/etc.kdevelop.pcs differ diff --git a/oam/etc/etc.kdevses b/oam/etc/etc.kdevses new file mode 100644 index 000000000..f07af08d4 --- /dev/null +++ b/oam/etc/etc.kdevses @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/oam/install_scripts/calpontInstall.sh b/oam/install_scripts/calpontInstall.sh index 487866519..0933b9009 100755 --- a/oam/install_scripts/calpontInstall.sh +++ b/oam/install_scripts/calpontInstall.sh @@ -33,8 +33,8 @@ while true { send_user " infinidb-version - InfiniDB Version, i.e. 1.0.0-1\n" send_user " password - root password on the servers being installed'\n" send_user " package-type - Package Type being installed (rpm, deb, or binary)\n" - send_user " config-file - Optional: Calpont.xml config file with directory location, i.e. /root/Calpont.xml\n" - send_user " Default version is $INSTALLDIR/etc/Calpont.xml.rpmsave\n" + send_user " config-file - Optional: Columnstore.xml config file with directory location, i.e. /root/Columnstore.xml\n" + send_user " Default version is $INSTALLDIR/etc/Columnstore.xml.rpmsave\n" send_user " mysql-password - MySQL password on the servers being installed'\n" send_user " -d - Debug flag, output verbose information\n" exit 0 @@ -78,16 +78,16 @@ expect { } if { $CONFIGFILE == " " } { - set CONFIGFILE $INSTALLDIR/etc/Calpont.xml.rpmsave + set CONFIGFILE $INSTALLDIR/etc/Columnstore.xml.rpmsave } if { [catch { open $CONFIGFILE "r"} handle ] } { puts "Calpont Config file not found: $CONFIGFILE"; exit 1 } -exec rm -f $INSTALLDIR/etc/Calpont.xml.new > /dev/null 2>&1 -exec mv -f $INSTALLDIR/etc/Calpont.xml $INSTALLDIR/etc/Calpont.xml.new > /dev/null 2>&1 -exec /bin/cp -f $CONFIGFILE $INSTALLDIR/etc/Calpont.xml > /dev/null 2>&1 +exec rm -f $INSTALLDIR/etc/Columnstore.xml.new > /dev/null 2>&1 +exec mv -f $INSTALLDIR/etc/Columnstore.xml $INSTALLDIR/etc/Columnstore.xml.new > /dev/null 2>&1 +exec /bin/cp -f $CONFIGFILE $INSTALLDIR/etc/Columnstore.xml > /dev/null 2>&1 set timeout 2 set INSTALL 2 diff --git a/oam/install_scripts/calpontLogRotate b/oam/install_scripts/calpontLogRotate index 193d8f6b6..39f51f770 100644 --- a/oam/install_scripts/calpontLogRotate +++ b/oam/install_scripts/calpontLogRotate @@ -19,7 +19,7 @@ compress olddir /var/log/mariadb/columnstore/archive } -/usr/local/Calpont/etc/Calpont.xml { +/usr/local/Calpont/etc/Columnstore.xml { daily dateext copy diff --git a/oam/install_scripts/columnstore b/oam/install_scripts/columnstore index 6f45dac2b..dc585cda9 100644 --- a/oam/install_scripts/columnstore +++ b/oam/install_scripts/columnstore @@ -68,7 +68,7 @@ if [ -z "$user" ]; then fi checkInstallSetup() { - InitialInstallFlag=`$InstallDir/bin/getConfig -c $InstallDir/etc/Calpont.xml Installation InitialInstallFlag` + InitialInstallFlag=`$InstallDir/bin/getConfig -c $InstallDir/etc/Columnstore.xml Installation InitialInstallFlag` if [ $InitialInstallFlag != "y" ]; then echo "Please run the postConfigure install script, check the Installation Guide" echo "for additional details" @@ -97,7 +97,7 @@ start() { fi checkInstallSetup - CoreFileFlag=`$InstallDir/bin/getConfig -c $InstallDir/etc/Calpont.xml Installation CoreFileFlag` + CoreFileFlag=`$InstallDir/bin/getConfig -c $InstallDir/etc/Columnstore.xml Installation CoreFileFlag` if [ $CoreFileFlag = "y" ]; then SUDO= if [ "$user" != "root" ]; then diff --git a/oam/install_scripts/columnstoreInstall.sh b/oam/install_scripts/columnstoreInstall.sh index 487866519..0933b9009 100755 --- a/oam/install_scripts/columnstoreInstall.sh +++ b/oam/install_scripts/columnstoreInstall.sh @@ -33,8 +33,8 @@ while true { send_user " infinidb-version - InfiniDB Version, i.e. 1.0.0-1\n" send_user " password - root password on the servers being installed'\n" send_user " package-type - Package Type being installed (rpm, deb, or binary)\n" - send_user " config-file - Optional: Calpont.xml config file with directory location, i.e. /root/Calpont.xml\n" - send_user " Default version is $INSTALLDIR/etc/Calpont.xml.rpmsave\n" + send_user " config-file - Optional: Columnstore.xml config file with directory location, i.e. /root/Columnstore.xml\n" + send_user " Default version is $INSTALLDIR/etc/Columnstore.xml.rpmsave\n" send_user " mysql-password - MySQL password on the servers being installed'\n" send_user " -d - Debug flag, output verbose information\n" exit 0 @@ -78,16 +78,16 @@ expect { } if { $CONFIGFILE == " " } { - set CONFIGFILE $INSTALLDIR/etc/Calpont.xml.rpmsave + set CONFIGFILE $INSTALLDIR/etc/Columnstore.xml.rpmsave } if { [catch { open $CONFIGFILE "r"} handle ] } { puts "Calpont Config file not found: $CONFIGFILE"; exit 1 } -exec rm -f $INSTALLDIR/etc/Calpont.xml.new > /dev/null 2>&1 -exec mv -f $INSTALLDIR/etc/Calpont.xml $INSTALLDIR/etc/Calpont.xml.new > /dev/null 2>&1 -exec /bin/cp -f $CONFIGFILE $INSTALLDIR/etc/Calpont.xml > /dev/null 2>&1 +exec rm -f $INSTALLDIR/etc/Columnstore.xml.new > /dev/null 2>&1 +exec mv -f $INSTALLDIR/etc/Columnstore.xml $INSTALLDIR/etc/Columnstore.xml.new > /dev/null 2>&1 +exec /bin/cp -f $CONFIGFILE $INSTALLDIR/etc/Columnstore.xml > /dev/null 2>&1 set timeout 2 set INSTALL 2 diff --git a/oam/install_scripts/columnstoreLogRotate b/oam/install_scripts/columnstoreLogRotate index dbce1f98b..efcf30fcf 100644 --- a/oam/install_scripts/columnstoreLogRotate +++ b/oam/install_scripts/columnstoreLogRotate @@ -19,7 +19,7 @@ compress olddir /var/log/mariadb/columnstore/archive } -/usr/local/mariadb/columnstore/etc/Calpont.xml { +/usr/local/mariadb/columnstore/etc/Columnstore.xml { daily dateext copy diff --git a/oam/install_scripts/infinidb b/oam/install_scripts/infinidb index 0ac0152a8..5250710a6 100644 --- a/oam/install_scripts/infinidb +++ b/oam/install_scripts/infinidb @@ -68,7 +68,7 @@ if [ -z "$user" ]; then fi checkInstallSetup() { - InitialInstallFlag=`$InstallDir/bin/getConfig -c $InstallDir/etc/Calpont.xml Installation InitialInstallFlag` + InitialInstallFlag=`$InstallDir/bin/getConfig -c $InstallDir/etc/Columnstore.xml Installation InitialInstallFlag` if [ $InitialInstallFlag != "y" ]; then echo "Please run the postConfigure install script, check the Installation Guide" echo "for additional details" @@ -97,7 +97,7 @@ start() { fi checkInstallSetup - CoreFileFlag=`$InstallDir/bin/getConfig -c $InstallDir/etc/Calpont.xml Installation CoreFileFlag` + CoreFileFlag=`$InstallDir/bin/getConfig -c $InstallDir/etc/Columnstore.xml Installation CoreFileFlag` if [ $CoreFileFlag = "y" ]; then SUDO= if [ "$user" != "root" ]; then diff --git a/oam/install_scripts/post-install b/oam/install_scripts/post-install index 79350f7be..2d57b91f4 100755 --- a/oam/install_scripts/post-install +++ b/oam/install_scripts/post-install @@ -60,8 +60,8 @@ if [ $is64bitpkg -eq 1 -a $is64bitos -ne 1 ]; then exit 1 fi -if [ ! -f $installdir/etc/Calpont.xml ]; then - echo "$installdir/etc/Calpont.xml not found, exiting" +if [ ! -f $installdir/etc/Columnstore.xml ]; then + echo "$installdir/etc/Columnstore.xml not found, exiting" exit 1 fi @@ -169,7 +169,7 @@ if [ $user = "root" ]; then rm -f /etc/default/columnstore else sudo $installdir/bin/syslogSetup.sh --installdir=$installdir install > /tmp/syslog_install.log 2>&1 - sudo chown $user:$user $installdir/etc/Calpont.xml + sudo chown $user:$user $installdir/etc/Columnstore.xml sudo chmod 755 /var/log sudo chmod -R 755 /var/log/mariadb/columnstore sudo chmod -R 777 /dev/shm diff --git a/oam/install_scripts/postInstall.sh b/oam/install_scripts/postInstall.sh index bd2461601..beb00734f 100755 --- a/oam/install_scripts/postInstall.sh +++ b/oam/install_scripts/postInstall.sh @@ -33,7 +33,7 @@ while true { send_user "Usage: postInstaller.sh -r 'calpont-rpm' -p 'password' -c 'config-file' -d\n" send_user " calpont-rpm - Calpont RPM with directory locatation, i.e. /root/calpont.x.x.x.x\n" send_user " password - root password on the servers being installed'\n" - send_user " config-file - Optional: Calpont.xml config file with directory location, i.e. /root/Calpont.xml\n" + send_user " config-file - Optional: Columnstore.xml config file with directory location, i.e. /root/Columnstore.xml\n" send_user " -d - Debug flag\n" exit } elseif { $arg($i) == "-r" } { @@ -62,7 +62,7 @@ log_user $DEBUG if { $RPMPACKAGE == " " || $PASSWORD == " "} {puts "please enter both RPM and password, enter ./postInstaller.sh -h for additional info"; exit -1} if { $CONFIGFILE == " " } { - set CONFIGFILE $INSTALLDIR/etc/Calpont.xml.rpmsave + set CONFIGFILE $INSTALLDIR/etc/Columnstore.xml.rpmsave } if { [catch { open $CONFIGFILE "r"} handle ] } { puts "Calpont Config file not found: $CONFIGFILE"; exit -1 @@ -113,8 +113,8 @@ expect { } expect -re "# " log_user 0 -exec mv -f $INSTALLDIR/etc/Calpont.xml $INSTALLDIR/etc/Calpont.xml.new > /dev/null 2>&1 -exec mv -f $CONFIGFILE $INSTALLDIR/etc/Calpont.xml > /dev/null 2>&1 +exec mv -f $INSTALLDIR/etc/Columnstore.xml $INSTALLDIR/etc/Columnstore.xml.new > /dev/null 2>&1 +exec mv -f $CONFIGFILE $INSTALLDIR/etc/Columnstore.xml > /dev/null 2>&1 send_user "\n" set timeout 380 diff --git a/oam/install_scripts/pre-uninstall b/oam/install_scripts/pre-uninstall index 3dfe0ff46..b46f0ff96 100755 --- a/oam/install_scripts/pre-uninstall +++ b/oam/install_scripts/pre-uninstall @@ -136,8 +136,8 @@ elif [ -x /usr/sbin/update-rc.d ]; then fi if [ $quiet != 1 ]; then - #make copy of Calpont.xml - /bin/cp -f $installdir/etc/Calpont.xml $installdir/etc/Calpont.xml.rpmsave > /dev/null 2>&1 + #make copy of Columnstore.xml + /bin/cp -f $installdir/etc/Columnstore.xml $installdir/etc/Columnstore.xml.rpmsave > /dev/null 2>&1 /bin/cp -f $installdir/mysql/my.cnf $installdir/mysql/my.cnf.rpmsave > /dev/null 2>&1 fi diff --git a/oam/install_scripts/remote_command_verify.sh b/oam/install_scripts/remote_command_verify.sh index d7ceb5207..22915caa2 100755 --- a/oam/install_scripts/remote_command_verify.sh +++ b/oam/install_scripts/remote_command_verify.sh @@ -39,14 +39,14 @@ expect { -re "word: " { send "$PASSWORD\n" } abort -re $GOOD_RESPONSE { send_user " " ; exit 0 } -re $BAD_RESPONSE { send_user "FAILED\n" ; exit 1 } - -re "parser error" { send_user "FAILED: System Calpont.xml parse error\n" ; exit 1 } + -re "parser error" { send_user "FAILED: System Columnstore.xml parse error\n" ; exit 1 } } expect { timeout { send_user "FAILED-TIMEOUT\n" ; exit 1 } -re $GOOD_RESPONSE { send_user " " ; exit 0 } -re $BAD_RESPONSE { send_user "FAILED\n" ; exit 1 } -re "No such file" { send_user "FAILED\n" ; exit 1 } - -re "parser error" { send_user "FAILED: System Calpont.xml parse error\n" ; exit 1 } + -re "parser error" { send_user "FAILED: System Columnstore.xml parse error\n" ; exit 1 } } exit 1 diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp index 511bbfb88..23f6504a9 100644 --- a/oam/oamcpp/liboamcpp.cpp +++ b/oam/oamcpp/liboamcpp.cpp @@ -123,7 +123,7 @@ namespace oam if (cf != 0 && *cf != 0) calpontfiledir = cf; - CalpontConfigFile = calpontfiledir + "/Calpont.xml"; + CalpontConfigFile = calpontfiledir + "/Columnstore.xml"; AlarmConfigFile = calpontfiledir + "/AlarmConfig.xml"; @@ -5398,7 +5398,7 @@ namespace oam cout << endl << "ERROR: mountDBRoot api failure" << endl; } - //get updated Calpont.xml distributed + //get updated Columnstore.xml distributed distributeConfigFile("system"); return; @@ -6209,7 +6209,7 @@ namespace oam } } - //update Calpont.xml entries + //update Columnstore.xml entries DBRootConfigList::iterator pt2 = dbrootlist.begin(); for( ; pt2 != dbrootlist.end() ; pt2++) { @@ -6240,7 +6240,7 @@ namespace oam if (!checkLogStatus("/tmp/status.log", "MariaDB Columnstore is running") ) return; - //get updated Calpont.xml distributed + //get updated Columnstore.xml distributed distributeConfigFile("system"); // @@ -6504,7 +6504,7 @@ namespace oam exceptionControl("assignPmDbrootConfig", API_FAILURE); } - //get updated Calpont.xml distributed + //get updated Columnstore.xml distributed distributeConfigFile("system"); return; @@ -6876,7 +6876,7 @@ namespace oam exceptionControl("sysConfig->write", API_FAILURE); } - //get updated Calpont.xml distributed + //get updated Columnstore.xml distributed distributeConfigFile("system"); // @@ -6980,7 +6980,7 @@ namespace oam * Purpose: set FilesPerColumnPartition * This function takes the old DBRootCount as an input arg * and expects that the new DBRootCount has been set in the - * Calpont.xml file. Function assumes oldSystemDBRootCount + * Columnstore.xml file. Function assumes oldSystemDBRootCount * has already been validated to be > 0 (else we could get a * divide by 0 error). * diff --git a/oam/oamcpp/liboamcpp.h b/oam/oamcpp/liboamcpp.h index eb4466cb8..3d77c0086 100644 --- a/oam/oamcpp/liboamcpp.h +++ b/oam/oamcpp/liboamcpp.h @@ -2199,7 +2199,7 @@ namespace oam /** *@brief Distribute Calpont Configure File */ - EXPORT void distributeConfigFile(std::string name = "system", std::string file = "Calpont.xml"); + EXPORT void distributeConfigFile(std::string name = "system", std::string file = "Columnstore.xml"); /** *@brief Switch Parent OAM Module diff --git a/oam/post/test-004.sh b/oam/post/test-004.sh index ec13d5bf3..8ea7bd567 100644 --- a/oam/post/test-004.sh +++ b/oam/post/test-004.sh @@ -30,7 +30,7 @@ exit 0 cplogger -i 48 $scrname "$tname" -# Get the FilesPerColumnPartition setting from Calpont.xml. +# Get the FilesPerColumnPartition setting from Columnstore.xml. filesPer=$(getConfig ExtentMap FilesPerColumnPartition) # Get the maximum segment number for all column files. diff --git a/oamapps/calpontSupport/calpontSupport.cpp b/oamapps/calpontSupport/calpontSupport.cpp index 9d9e5d61b..fcfe58b85 100644 --- a/oamapps/calpontSupport/calpontSupport.cpp +++ b/oamapps/calpontSupport/calpontSupport.cpp @@ -301,11 +301,11 @@ void reportThread(string reporttype) system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - cmd = "echo '################# cat /etc/Calpont.xml ################# ' >> " + outputFile; + cmd = "echo '################# cat /etc/Columnstore.xml ################# ' >> " + outputFile; system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - cmd = "cat " + installDir + "/etc/Calpont.xml >> " + outputFile; + cmd = "cat " + installDir + "/etc/Columnstore.xml >> " + outputFile; system(cmd.c_str()); } diff --git a/oamapps/columnstoreSupport/columnstoreSupport.cpp b/oamapps/columnstoreSupport/columnstoreSupport.cpp index 50e7eb976..87826dba4 100644 --- a/oamapps/columnstoreSupport/columnstoreSupport.cpp +++ b/oamapps/columnstoreSupport/columnstoreSupport.cpp @@ -301,11 +301,11 @@ void reportThread(string reporttype) system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - cmd = "echo '################# cat /etc/Calpont.xml ################# ' >> " + outputFile; + cmd = "echo '################# cat /etc/Columnstore.xml ################# ' >> " + outputFile; system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - cmd = "cat " + installDir + "/etc/Calpont.xml >> " + outputFile; + cmd = "cat " + installDir + "/etc/Columnstore.xml >> " + outputFile; system(cmd.c_str()); } diff --git a/oamapps/postConfigure/amazonInstaller.cpp b/oamapps/postConfigure/amazonInstaller.cpp index df5c55c89..617af94e4 100644 --- a/oamapps/postConfigure/amazonInstaller.cpp +++ b/oamapps/postConfigure/amazonInstaller.cpp @@ -441,9 +441,9 @@ int main(int argc, char *argv[]) exit (0); } - //backup current Calpont.xml - string configFile = installDir + "/etc/Calpont.xml"; - string saveFile = installDir + "/etc/Calpont.xml.save"; + //backup current Columnstore.xml + string configFile = installDir + "/etc/Columnstore.xml"; + string saveFile = installDir + "/etc/Columnstore.xml.save"; cmd = "rm -f " + saveFile; system(cmd.c_str()); cmd = "cp " + configFile + " " + saveFile; @@ -455,8 +455,8 @@ int main(int argc, char *argv[]) cmd = installDir + "/bin/post-uninstall > /dev/null 2>&1"; system(cmd.c_str()); - //backup original Calpont.xml if it doesn't exist - //if it does exist copy to Calpont.xml + //backup original Columnstore.xml if it doesn't exist + //if it does exist copy to Columnstore.xml ifstream file (saveFile.c_str()); if (!file) { @@ -1879,10 +1879,10 @@ int main(int argc, char *argv[]) } // - // update /root/Calpont.xml + // update /root/Columnstore.xml // - cout << "----- Updating InfiniDB Configuration File (Calpont.xml) -----" << endl << endl; + cout << "----- Updating InfiniDB Configuration File (Columnstore.xml) -----" << endl << endl; //setup for multi-server install try { @@ -2165,13 +2165,13 @@ int main(int argc, char *argv[]) cleanupSystem(); } - //copy Calpont.xml to Calpont.xml.rpmsave for postConfigure no-prompt option - cmd = "rm -f " + installDir + "/etc/Calpont.xml.rpmsave"; + //copy Columnstore.xml to Columnstore.xml.rpmsave for postConfigure no-prompt option + cmd = "rm -f " + installDir + "/etc/Columnstore.xml.rpmsave"; system(cmd.c_str()); - cmd = "cp " + installDir + "/etc/Calpont.xml " + installDir + "/etc/Calpont.xml.rpmsave"; + cmd = "cp " + installDir + "/etc/Columnstore.xml " + installDir + "/etc/Columnstore.xml.rpmsave"; int rtnCode = system(cmd.c_str()); if (WEXITSTATUS(rtnCode) != 0) { - cout << "Error copying Calpont.xml to Calpont.xml.rpmsave" << endl; + cout << "Error copying Columnstore.xml to Columnstore.xml.rpmsave" << endl; cleanupSystem(); } diff --git a/oamapps/postConfigure/helpers.cpp b/oamapps/postConfigure/helpers.cpp index e8793b156..db0fd4fd1 100644 --- a/oamapps/postConfigure/helpers.cpp +++ b/oamapps/postConfigure/helpers.cpp @@ -99,7 +99,7 @@ bool waitForActive() void dbrmDirCheck() { - const string fname = installDir + "/etc/Calpont.xml.rpmsave"; + const string fname = installDir + "/etc/Columnstore.xml.rpmsave"; ifstream oldFile (fname.c_str()); if (!oldFile) return; diff --git a/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp index cf9f2db6a..12743d725 100644 --- a/oamapps/postConfigure/installer.cpp +++ b/oamapps/postConfigure/installer.cpp @@ -154,11 +154,11 @@ int main(int argc, char *argv[]) mysqlpw = " "; pwprompt = "--password=" + mysqlpw; - //copy Calpont.xml.rpmsave if upgrade option is selected + //copy Columnstore.xml.rpmsave if upgrade option is selected if ( installType == "upgrade" ) { - cmd = "/bin/cp -f " + installDir + "/etc/Calpont.xml " + installDir + "/etc/Calpont.xml.new 2>&1"; + cmd = "/bin/cp -f " + installDir + "/etc/Columnstore.xml " + installDir + "/etc/Columnstore.xml.new 2>&1"; system(cmd.c_str()); - cmd = "/bin/cp -f " + installDir + "/etc/Calpont.xml.rpmsave " + installDir + "/etc/Calpont.xml 2>&1"; + cmd = "/bin/cp -f " + installDir + "/etc/Columnstore.xml.rpmsave " + installDir + "/etc/Columnstore.xml 2>&1"; system(cmd.c_str()); } @@ -1196,11 +1196,11 @@ bool makeRClocal(string moduleName, int IserverTypeInstall) /* - * Uncomment entry in Calpont.xml + * Uncomment entry in Columnstore.xml */ bool uncommentCalpontXml( string entry) { - string fileName = installDir + "/etc/Calpont.xml"; + string fileName = installDir + "/etc/Columnstore.xml"; ifstream oldFile (fileName.c_str()); if (!oldFile) return true; diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp index cdf940080..918cad4b3 100644 --- a/oamapps/postConfigure/postConfigure.cpp +++ b/oamapps/postConfigure/postConfigure.cpp @@ -23,7 +23,7 @@ * List of files being updated by post-install configure: * Calpont/etc/snmpd.conf * Calpont/etc/snmptrapd.conf -* Calpont/etc/Calpont.xml +* Calpont/etc/Columnstore.xml * Calpont/etc/ProcessConfig.xml * /etc/rc.local * @@ -284,8 +284,8 @@ int main(int argc, char *argv[]) cout << endl; cout << "Usage: postConfigure [-h][-c][-u][-p][-mp][-s][-port]" << endl; cout << " -h Help" << endl; - cout << " -c Config File to use to extract configuration data, default is Calpont.xml.rpmsave" << endl; - cout << " -u Upgrade, Install using the Config File from -c, default to Calpont.xml.rpmsave" << endl; + cout << " -c Config File to use to extract configuration data, default is Columnstore.xml.rpmsave" << endl; + cout << " -u Upgrade, Install using the Config File from -c, default to Columnstore.xml.rpmsave" << endl; cout << " If ssh-keys aren't setup, you should provide passwords as command line arguments" << endl; cout << " -p Unix Password, used with no-prompting option" << endl; cout << " -mp MySQL Password" << endl; @@ -306,8 +306,8 @@ int main(int argc, char *argv[]) exit (1); } oldFileName = argv[i]; - if ( oldFileName.find("Calpont.xml") == string::npos ) { - cout << " ERROR: Config File is not a Calpont.xml file name" << endl; + if ( oldFileName.find("Columnstore.xml") == string::npos ) { + cout << " ERROR: Config File is not a Columnstore.xml file name" << endl; exit (1); } } @@ -381,7 +381,7 @@ int main(int argc, char *argv[]) exit(1); } - oldFileName = installDir + "/etc/Calpont.xml.rpmsave"; + oldFileName = installDir + "/etc/Columnstore.xml.rpmsave"; cout << endl; cout << "This is the MariaDB Columnstore System Configuration and Installation tool." << endl; @@ -416,7 +416,7 @@ int main(int argc, char *argv[]) cout << endl; cout << " 1. Root user ssh keys setup between all nodes in the system or" << endl; cout << " use the password command line option." << endl; - cout << " 2. A Configure File to use to retrieve configure data, default to Calpont.xml.rpmsave" << endl; + cout << " 2. A Configure File to use to retrieve configure data, default to Columnstore.xml.rpmsave" << endl; cout << " or use the '-c' option to point to a configuration file." << endl; cout << endl; // cout << " Output if being redirected to " << postConfigureLog << endl; @@ -540,20 +540,20 @@ int main(int argc, char *argv[]) cout << endl << "Performing the Single Server Install." << endl; if ( reuseConfig == "n" ) { - //setup to use the single server Calpont.xml file + //setup to use the single server Columnstore.xml file // we know that our Config instance just timestamped itself in the getConfig // call above. if postConfigure is running non-interactively we may get here // within the same second which means the changes that are about to happen - // when Calpont.xml gets overwritten will be ignored because of the Config + // when Columnstore.xml gets overwritten will be ignored because of the Config // instance won't know to reload sleep(2); - cmd = "rm -f " + installDir + "/etc/Calpont.xml.installSave > /dev/null 2>&1"; + cmd = "rm -f " + installDir + "/etc/Columnstore.xml.installSave > /dev/null 2>&1"; system(cmd.c_str()); - cmd = "mv -f " + installDir + "/etc/Calpont.xml " + installDir + "/etc/Calpont.xml.installSave > /dev/null 2>&1"; + cmd = "mv -f " + installDir + "/etc/Columnstore.xml " + installDir + "/etc/Columnstore.xml.installSave > /dev/null 2>&1"; system(cmd.c_str()); - cmd = "/bin/cp -f " + installDir + "/etc/Calpont.xml.singleserver " + installDir + "/etc/Calpont.xml > /dev/null 2>&1"; + cmd = "/bin/cp -f " + installDir + "/etc/Columnstore.xml.singleserver " + installDir + "/etc/Columnstore.xml > /dev/null 2>&1"; system(cmd.c_str()); } @@ -1165,7 +1165,7 @@ int main(int argc, char *argv[]) // are we using settings from previous config file? if ( reuseConfig == "n" ) { if( !uncommentCalpontXml("NumBlocksPct") ) { - cout << "Update Calpont.xml NumBlocksPct Section" << endl; + cout << "Update Columnstore.xml NumBlocksPct Section" << endl; exit(1); } @@ -3398,7 +3398,7 @@ int main(int argc, char *argv[]) //run remote command script cout << endl << "----- Starting MariaDB Columnstore on '" + remoteModuleName + "' -----" << endl << endl; - cmd = installDir + "/bin/remote_scp_put.sh " + remoteModuleIP + " " + installDir + "/etc/Calpont.xml " + installDir + "/etc/. > /dev/null 2>&1"; + cmd = installDir + "/bin/remote_scp_put.sh " + remoteModuleIP + " " + installDir + "/etc/Columnstore.xml " + installDir + "/etc/. > /dev/null 2>&1"; int rtnCode = system(cmd.c_str()); cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + @@ -3553,16 +3553,16 @@ int main(int argc, char *argv[]) } /* - * Check for reuse of RPM saved Calpont.xml + * Check for reuse of RPM saved Columnstore.xml */ bool checkSaveConfigFile() { - string rpmFileName = installDir + "/etc/Calpont.xml"; - string newFileName = installDir + "/etc/Calpont.xml.new"; + string rpmFileName = installDir + "/etc/Columnstore.xml"; + string newFileName = installDir + "/etc/Columnstore.xml.new"; string extentMapCheckOnly = " "; - //check if Calpont.xml.rpmsave exist + //check if Columnstore.xml.rpmsave exist ifstream File (oldFileName.c_str()); if (!File) { if ( noPrompting ) { @@ -3648,11 +3648,11 @@ bool checkSaveConfigFile() string cmd; if ( reuseConfig == "y" ) { if ( singleServerInstall == "1") { - cmd = "rm -f " + installDir + "/etc/Calpont.xml.installSave > /dev/null 2>&1"; + cmd = "rm -f " + installDir + "/etc/Columnstore.xml.installSave > /dev/null 2>&1"; system(cmd.c_str()); - cmd = "mv -f " + installDir + "/etc/Calpont.xml " + installDir + "/etc/Calpont.xml.installSave > /dev/null 2>&1"; + cmd = "mv -f " + installDir + "/etc/Columnstore.xml " + installDir + "/etc/Columnstore.xml.installSave > /dev/null 2>&1"; system(cmd.c_str()); - cmd = "/bin/cp -f " + installDir + "/etc/Calpont.xml.singleserver " + installDir + "/etc/Calpont.xml > /dev/null 2>&1"; + cmd = "/bin/cp -f " + installDir + "/etc/Columnstore.xml.singleserver " + installDir + "/etc/Columnstore.xml > /dev/null 2>&1"; system(cmd.c_str()); } break; @@ -3675,7 +3675,7 @@ bool checkSaveConfigFile() string cmd = "mv -f " + rpmFileName + " " + newFileName; int rtnCode = system(cmd.c_str()); if (WEXITSTATUS(rtnCode) != 0) { - cout << "Error moving installed version of Calpont.xml" << endl; + cout << "Error moving installed version of Columnstore.xml" << endl; return false; } @@ -3702,7 +3702,7 @@ bool checkSaveConfigFile() //check to see if updates were made if ( sysConfig->getConfig("ExeMgr1", "IPAddr") != "0.0.0.0") { - //Calpont.xml is ready to go, get feature options + //Columnstore.xml is ready to go, get feature options if ( MySQLRep == "n" ) { @@ -3737,7 +3737,7 @@ bool checkSaveConfigFile() if ( reuseConfig == "n" ) return true; - cout << "ERROR: Failed to copy data to Calpont.xml" << endl; + cout << "ERROR: Failed to copy data to Columnstore.xml" << endl; return false; } @@ -3947,11 +3947,11 @@ bool updateProcessConfig(int serverTypeInstall) } /* - * Uncomment entry in Calpont.xml + * Uncomment entry in Columnstore.xml */ bool uncommentCalpontXml( string entry) { - string fileName = installDir + "/etc/Calpont.xml"; + string fileName = installDir + "/etc/Columnstore.xml"; ifstream oldFile (fileName.c_str()); if (!oldFile) return true; diff --git a/primitives/primproc/batchprimitiveprocessor.cpp b/primitives/primproc/batchprimitiveprocessor.cpp index 177e57142..f934e5e2a 100644 --- a/primitives/primproc/batchprimitiveprocessor.cpp +++ b/primitives/primproc/batchprimitiveprocessor.cpp @@ -1994,7 +1994,7 @@ void BatchPrimitiveProcessor::asyncLoadProjectColumns() // relLBID is the LBID related to the primMsg->LBID, // it is used to keep the read ahead boundary for asyncLoads // 1. scan driven case: load blocks in # to (# + blocksReadAhead - 1) range, - // where # is a multiple of ColScanReadAheadBlocks in Calpont.xml + // where # is a multiple of ColScanReadAheadBlocks in Columnstore.xml // 2. non-scan driven case: load blocks in the logical block. // because 1 logical block per primMsg, asyncLoad only once per message. for (uint64_t i = 0; i < projectCount; ++i) { diff --git a/primitives/primproc/primitiveserver.cpp b/primitives/primproc/primitiveserver.cpp index 6e11c08bb..d736ab806 100644 --- a/primitives/primproc/primitiveserver.cpp +++ b/primitives/primproc/primitiveserver.cpp @@ -1687,7 +1687,7 @@ struct ReadThread if (bRotateDest) { // If we tried adding an IP address not listed as UM in config // file; probably a DMLProc connection. We allow the connection - // but disable destination rotation since not in Calpont.xml. + // but disable destination rotation since not in Columnstore.xml. if (!pUmSocketSelector->addConnection(outIosDefault, writeLockDefault)) { bRotateDest = false; } diff --git a/primitives/primproc/tdriver-umsocksel.cpp b/primitives/primproc/tdriver-umsocksel.cpp index e6796a853..2c6d4358b 100644 --- a/primitives/primproc/tdriver-umsocksel.cpp +++ b/primitives/primproc/tdriver-umsocksel.cpp @@ -41,14 +41,14 @@ using namespace primitiveprocessor; int main() { - // Calpont.xml file should be configured as follows: + // Columnstore.xml file should be configured as follows: // um1: 10.100.4.85 and 10.100.5.85 // um2: 10.101.4.85 and 10.101.5.85 sockaddr_in sa = { 1, 0, {0} , {' '} }; char* ips[] = {"10.100.4.85", "10.100.5.85", "10.101.4.85", "10.101.5.85"}; // These are the IP addresses we use to test runtime connections - // "not" in the Calpont.xml file. + // "not" in the Columnstore.xml file. sockaddr_in saUnknown = { 1, 0, {0} , {' '} }; char* ipsUnknown[]={"10.102.1.1", "10.102.2.1", "10.102.3.1", "10.102.4.1"}; diff --git a/primitives/primproc/umsocketselector.cpp b/primitives/primproc/umsocketselector.cpp index d77fbfd90..b7dc538e7 100644 --- a/primitives/primproc/umsocketselector.cpp +++ b/primitives/primproc/umsocketselector.cpp @@ -84,8 +84,8 @@ UmSocketSelector::UmSocketSelector() } //------------------------------------------------------------------------------ -// Returns the number of IP addresses defined in the Calpont.xml file -// return - uint32_t; the total number of IP addresses in the Calpont.xml file +// Returns the number of IP addresses defined in the Columnstore.xml file +// return - uint32_t; the total number of IP addresses in the Columnstore.xml file //------------------------------------------------------------------------------ uint32_t UmSocketSelector::ipAddressCount() const @@ -101,7 +101,7 @@ UmSocketSelector::ipAddressCount() const } //------------------------------------------------------------------------------ -// Loads the UM module information from the Calpont.xml file, so that we have +// Loads the UM module information from the Columnstore.xml file, so that we have // the list of IP addresses that are valid for each UM. Note that this method // does not insure thread safeness, but that's okay because it is assumed that // it will only be called once from the first call to instance(). diff --git a/primitives/primproc/umsocketselector.h b/primitives/primproc/umsocketselector.h index 40d5d9420..7236d7245 100644 --- a/primitives/primproc/umsocketselector.h +++ b/primitives/primproc/umsocketselector.h @@ -97,9 +97,9 @@ class UmSocketSelector ~UmSocketSelector() { }; - /** @brief Accessor to total number of UM IP's in Calpont.xml. + /** @brief Accessor to total number of UM IP's in Columnstore.xml. * - * @return Number of UM IP addresses read from Calpont.xml. + * @return Number of UM IP addresses read from Columnstore.xml. */ uint32_t ipAddressCount() const; @@ -180,9 +180,9 @@ class UmModuleIPs ~UmModuleIPs ( ) { }; - /** @brief Accessor to number of IP's from Calpont.xml for this UM. + /** @brief Accessor to number of IP's from Columnstore.xml for this UM. * - * @return Number of IP addresses read from Calpont.xml for this UM. + * @return Number of IP addresses read from Columnstore.xml for this UM. */ uint32_t ipAddressCount() const { return fUmIPSocketConns.size(); } diff --git a/procmgr/main.cpp b/procmgr/main.cpp index b87df641d..56201113c 100644 --- a/procmgr/main.cpp +++ b/procmgr/main.cpp @@ -267,7 +267,7 @@ int main(int argc, char **argv) } else { //running active after startup - //Update DBRM section of Calpont.xml + //Update DBRM section of Columnstore.xml processManager.updateWorkerNodeconfig(); // processManager.distributeConfigFile("system"); diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp index fbe3acb38..4441a1342 100644 --- a/procmgr/processmanager.cpp +++ b/procmgr/processmanager.cpp @@ -3297,7 +3297,7 @@ int ProcessManager::disableModule(string target, bool manualFlag) setModuleState(target, newState); - //set Calpont.xml enbale state + //set Columnstore.xml enbale state setEnableState( target, SnewState); log.writeLog(__LINE__, "disableModule - setEnableState", LOG_TYPE_DEBUG); @@ -3313,7 +3313,7 @@ int ProcessManager::disableModule(string target, bool manualFlag) log.writeLog(__LINE__, "disableModule - Updated PM server Count", LOG_TYPE_DEBUG); } - //Update DBRM section of Calpont.xml + //Update DBRM section of Columnstore.xml if ( updateWorkerNodeconfig() != API_SUCCESS ) return API_FAILURE; @@ -3406,7 +3406,7 @@ int ProcessManager::enableModule(string target, int state) log.writeLog(__LINE__, "enableModule - Updated PM server Count", LOG_TYPE_DEBUG); } - //Update DBRM section of Calpont.xml + //Update DBRM section of Columnstore.xml if ( updateWorkerNodeconfig() != API_SUCCESS ) return API_FAILURE; @@ -4826,7 +4826,7 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str return API_FAILURE; } - //write Calpont.xml Module section + //write Columnstore.xml Module section try { oam.setSystemConfig(moduleType, setmoduletypeconfig); log.writeLog(__LINE__, "addModule - Updated Module Section of Config file", LOG_TYPE_DEBUG); @@ -5539,7 +5539,7 @@ int ProcessManager::removeModule(oam::DeviceNetworkList devicenetworklist, bool return API_FAILURE; } - //write Calpont.xml Module section + //write Columnstore.xml Module section try { oam.setSystemConfig(moduleType, setmoduletypeconfig); log.writeLog(__LINE__, "removeModule - Updated Module Section of Config file", LOG_TYPE_DEBUG); @@ -5598,7 +5598,7 @@ int ProcessManager::removeModule(oam::DeviceNetworkList devicenetworklist, bool return API_FAILURE; } - //Update DBRM section of Calpont.xml + //Update DBRM section of Columnstore.xml if ( updateWorkerNodeconfig() != API_SUCCESS ) return API_FAILURE; @@ -5785,7 +5785,7 @@ int ProcessManager::reconfigureModule(oam::DeviceNetworkList devicenetworklist) return API_FAILURE; } - //write Calpont.xml Module section + //write Columnstore.xml Module section try { oam.setSystemConfig(reconfigureModuleType, setreconfiguremoduletypeconfig); log.writeLog(__LINE__, "reconfigureModule - Updated Module Section of Config file", LOG_TYPE_DEBUG); @@ -5877,7 +5877,7 @@ int ProcessManager::reconfigureModule(oam::DeviceNetworkList devicenetworklist) return API_FAILURE; } - //write Calpont.xml Module section + //write Columnstore.xml Module section try { oam.setSystemConfig(moduleType, setmoduletypeconfig); log.writeLog(__LINE__, "reconfigureModule - Updated Module Section of Config file", LOG_TYPE_DEBUG); @@ -5944,7 +5944,7 @@ int ProcessManager::reconfigureModule(oam::DeviceNetworkList devicenetworklist) return API_FAILURE; } - //Update DBRM section of Calpont.xml + //Update DBRM section of Columnstore.xml if ( updateWorkerNodeconfig() != API_SUCCESS ) return API_FAILURE; @@ -7617,7 +7617,7 @@ int ProcessManager::updateWorkerNodeconfig() { Config* sysConfig3 = Config::makeConfig();; - //update Calpont.xml + //update Columnstore.xml sysConfig3->setConfig("DBRM_Controller", "NumWorkers", oam.itoa(module.size())); std::vector::iterator pt = module.begin(); @@ -7726,12 +7726,12 @@ void ProcessManager::clearNICAlarms(std::string hostName) /****************************************************************************************** * @brief updateExtentMap * -* purpose: update Extent Map section in Calpont.xml +* purpose: update Extent Map section in Columnstore.xml * ******************************************************************************************/ bool ProcessManager::updateExtentMap() { - string fileName = startup::StartUp::installDir() + "/etc/Calpont.xml"; + string fileName = startup::StartUp::installDir() + "/etc/Columnstore.xml"; ifstream oldFile (fileName.c_str()); if (!oldFile) return false; @@ -7832,7 +7832,7 @@ bool ProcessManager::makeXMInittab(std::string moduleName, std::string systemID, /****************************************************************************************** * @brief setPMProcIPs * -* purpose: Updates the Calpont.xml file for DDL/DMLProc IPs during PM switchover +* purpose: Updates the Columnstore.xml file for DDL/DMLProc IPs during PM switchover * * ******************************************************************************************/ @@ -8401,7 +8401,7 @@ int ProcessManager::switchParentOAMModule(std::string newActiveModuleName) int moduleID = atoi(newActiveModuleName.substr(MAX_MODULE_TYPE_SIZE,MAX_MODULE_ID_SIZE).c_str()); - // update Calpont.xml entries + // update Columnstore.xml entries string newActiveIPaddr; try { @@ -8489,7 +8489,7 @@ int ProcessManager::switchParentOAMModule(std::string newActiveModuleName) catch(...) {} } - log.writeLog(__LINE__, "Calpont.xml entries update to local IP address of " + newActiveIPaddr, LOG_TYPE_DEBUG); + log.writeLog(__LINE__, "Columnstore.xml entries update to local IP address of " + newActiveIPaddr, LOG_TYPE_DEBUG); //distribute config file processManager.distributeConfigFile("system"); @@ -8965,8 +8965,8 @@ int ProcessManager::OAMParentModuleChange() } else { - // update the Calpont.xml with the new IP Address - string cmd = "sed -i s/" + downOAMParentIPAddress + "/" + currentIPAddr + "/g " + startup::StartUp::installDir() + "/etc/Calpont.xml"; + // update the Columnstore.xml with the new IP Address + string cmd = "sed -i s/" + downOAMParentIPAddress + "/" + currentIPAddr + "/g " + startup::StartUp::installDir() + "/etc/Columnstore.xml"; system(cmd.c_str()); // get parent hotsname and IP address in case it changed @@ -9027,7 +9027,7 @@ int ProcessManager::OAMParentModuleChange() gdownActiveOAMModule = downOAMParentName; - // update Calpont.xml entries + // update Columnstore.xml entries string localIPaddr; string newStandbyModule = downOAMParentName; string standbyIPaddr = downOAMParentIPAddress; @@ -9088,8 +9088,8 @@ int ProcessManager::OAMParentModuleChange() Configuration config; oam.setHotStandbyPM(standbyIPaddr); - log.writeLog(__LINE__, "Calpont.xml Standby OAM updated : " + newStandbyModule + ":" + standbyIPaddr, LOG_TYPE_DEBUG); - log.writeLog(__LINE__, "Calpont.xml entries update to local IP address of " + localIPaddr, LOG_TYPE_DEBUG); + log.writeLog(__LINE__, "Columnstore.xml Standby OAM updated : " + newStandbyModule + ":" + standbyIPaddr, LOG_TYPE_DEBUG); + log.writeLog(__LINE__, "Columnstore.xml entries update to local IP address of " + localIPaddr, LOG_TYPE_DEBUG); } catch (exception& ex) { @@ -9509,7 +9509,7 @@ std::string ProcessManager::getStandbyModule() /****************************************************************************************** * @brief setStandbyModule * -* purpose: set Standby Module info in Calpont.xml +* purpose: set Standby Module info in Columnstore.xml * * ******************************************************************************************/ @@ -9546,7 +9546,7 @@ bool ProcessManager::setStandbyModule(std::string newStandbyModule, bool send) //distribute config file distributeConfigFile("system"); - log.writeLog(__LINE__, "Calpont.xml Standby OAM updated to : " + newStandbyModule + ":" + standbyIPaddr, LOG_TYPE_DEBUG); + log.writeLog(__LINE__, "Columnstore.xml Standby OAM updated to : " + newStandbyModule + ":" + standbyIPaddr, LOG_TYPE_DEBUG); if (send) { log.writeLog(__LINE__, "Send Message for new Hot-Standby ProcessManager to module = " + newStandbyModule, LOG_TYPE_DEBUG); @@ -9578,7 +9578,7 @@ bool ProcessManager::setStandbyModule(std::string newStandbyModule, bool send) /****************************************************************************************** * @brief clearStandbyModule * -* purpose: clear Standby Module info in Calpont.xml +* purpose: clear Standby Module info in Columnstore.xml * * ******************************************************************************************/ @@ -9602,7 +9602,7 @@ bool ProcessManager::clearStandbyModule() pthread_mutex_unlock(&THREAD_LOCK); oam.setHotStandbyPM(" "); - log.writeLog(__LINE__, "Clear Calpont.xml Standby OAM", LOG_TYPE_DEBUG); + log.writeLog(__LINE__, "Clear Columnstore.xml Standby OAM", LOG_TYPE_DEBUG); //distribute config file distributeConfigFile("system"); @@ -9632,7 +9632,7 @@ bool ProcessManager::clearStandbyModule() /****************************************************************************************** * @brief setEnableState * -* purpose: set Enable State info in Calpont.xml +* purpose: set Enable State info in Columnstore.xml * * ******************************************************************************************/ diff --git a/procmgr/processmanager.h b/procmgr/processmanager.h index 5d0a71b01..9ee077b57 100644 --- a/procmgr/processmanager.h +++ b/procmgr/processmanager.h @@ -461,7 +461,7 @@ public: std::string sendMsgProcMon1( std::string module, messageqcpp::ByteStream msg, int requestID ); /* - * Updates the Calpont.xml file for DDL/DMLProc IPs during PM switchover + * Updates the Columnstore.xml file for DDL/DMLProc IPs during PM switchover */ int setPMProcIPs( std::string moduleName, std::string processName = oam::UnassignedName); @@ -474,11 +474,11 @@ public: */ std::string getStandbyModule(); - /** @brief set Standby Module info in Calpont.xml + /** @brief set Standby Module info in Columnstore.xml */ bool setStandbyModule(std::string newStandbyModule, bool send = true); - /** @brief clear Standby Module info in Calpont.xml + /** @brief clear Standby Module info in Columnstore.xml */ bool clearStandbyModule(); @@ -486,7 +486,7 @@ public: /** @brief Distribute Calpont Config File to system modules */ - int distributeConfigFile(std::string name, std::string file = "Calpont.xml"); + int distributeConfigFile(std::string name, std::string file = "Columnstore.xml"); /** @brief Switch OAM Parent Module */ @@ -562,7 +562,7 @@ private: bool createModuleFile(std::string remoteModuleName); /** - *@brief pdate Extent Map section in Calpont.xml + *@brief pdate Extent Map section in Columnstore.xml */ bool updateExtentMap(); diff --git a/procmon/main.cpp b/procmon/main.cpp index 8b0b07152..3a1942c50 100644 --- a/procmon/main.cpp +++ b/procmon/main.cpp @@ -275,7 +275,7 @@ int main(int argc, char **argv) log.writeLog(__LINE__, "ERROR: makeConfig failed", LOG_TYPE_ERROR); } - // get updated Calpont.xml, retry in case ProcMgr isn't up yet + // get updated Columnstore.xml, retry in case ProcMgr isn't up yet if (!HDFS) { int count = 0; @@ -295,7 +295,7 @@ int main(int argc, char **argv) sleep(1); } } - //re-read local system info with new Calpont.xml + //re-read local system info with new Columnstore.xml sleep(1); MonitorConfig config; } @@ -326,7 +326,7 @@ int main(int argc, char **argv) } else { - // not active Parent, get updated Calpont.xml, retry in case ProcMgr isn't up yet + // not active Parent, get updated Columnstore.xml, retry in case ProcMgr isn't up yet if (!HDFS) { int count = 0; @@ -346,7 +346,7 @@ int main(int argc, char **argv) sleep(1); } } - //re-read local system info with new Calpont.xml + //re-read local system info with new Columnstore.xml sleep(1); MonitorConfig config; } @@ -534,7 +534,7 @@ int main(int argc, char **argv) oam.setHotStandbyPM(standbyIPaddr); - log.writeLog(__LINE__, "Calpont.xml Standby OAM updated : " + standbyPM + ":" + standbyIPaddr, LOG_TYPE_DEBUG); + log.writeLog(__LINE__, "Columnstore.xml Standby OAM updated : " + standbyPM + ":" + standbyIPaddr, LOG_TYPE_DEBUG); log.writeLog(__LINE__, "Set Standby Module = " + standbyPM, LOG_TYPE_DEBUG); try { diff --git a/procmon/processmonitor.cpp b/procmon/processmonitor.cpp index adf27b4c2..a14c38dc6 100644 --- a/procmon/processmonitor.cpp +++ b/procmon/processmonitor.cpp @@ -3829,7 +3829,7 @@ int ProcessMonitor::createDataDirs(std::string cloud) t = oam.getStorageConfig(); if ( boost::get<1>(t) == 0 ) { - log.writeLog(__LINE__, "No dbroots are configured in Calpont.xml file at proc mon startup time", LOG_TYPE_WARNING); + log.writeLog(__LINE__, "No dbroots are configured in Columnstore.xml file at proc mon startup time", LOG_TYPE_WARNING); return API_INVALID_PARAMETER; } @@ -5467,10 +5467,10 @@ bool ProcessMonitor::amazonIPCheck() else { if ( currentIPAddr != IPAddr ) { - log.writeLog(__LINE__, "Module is Running: '" + moduleName + "' / Instance '" + instanceID + "' current IP being reconfigured in Calpont.xml. old = " + IPAddr + ", new = " + currentIPAddr, LOG_TYPE_DEBUG); + log.writeLog(__LINE__, "Module is Running: '" + moduleName + "' / Instance '" + instanceID + "' current IP being reconfigured in Columnstore.xml. old = " + IPAddr + ", new = " + currentIPAddr, LOG_TYPE_DEBUG); - // update the Calpont.xml with the new IP Address - string cmd = "sed -i s/" + IPAddr + "/" + currentIPAddr + "/g /usr/local/mariadb/columnstore/etc/Calpont.xml"; + // update the Columnstore.xml with the new IP Address + string cmd = "sed -i s/" + IPAddr + "/" + currentIPAddr + "/g /usr/local/mariadb/columnstore/etc/Columnstore.xml"; system(cmd.c_str()); } else @@ -5796,7 +5796,7 @@ int ProcessMonitor::checkDataMount() t = oam.getStorageConfig(); if ( boost::get<1>(t) == 0 ) { - log.writeLog(__LINE__, "getStorageConfig return: No dbroots are configured in Calpont.xml file", LOG_TYPE_WARNING); + log.writeLog(__LINE__, "getStorageConfig return: No dbroots are configured in Columnstore.xml file", LOG_TYPE_WARNING); return API_INVALID_PARAMETER; } @@ -5833,7 +5833,7 @@ int ProcessMonitor::checkDataMount() } if ( dbrootList.size() == 0 ) { - log.writeLog(__LINE__, "No dbroots are configured in Calpont.xml file", LOG_TYPE_WARNING); + log.writeLog(__LINE__, "No dbroots are configured in Columnstore.xml file", LOG_TYPE_WARNING); return API_INVALID_PARAMETER; } diff --git a/procmon/root@192.168.1.126 b/procmon/root@192.168.1.126 index d6de5c9c8..acb2ae968 100755 Binary files a/procmon/root@192.168.1.126 and b/procmon/root@192.168.1.126 differ diff --git a/tools/cleartablelock/cleartablelock.cpp b/tools/cleartablelock/cleartablelock.cpp index ea38f0df7..1a907510e 100644 --- a/tools/cleartablelock/cleartablelock.cpp +++ b/tools/cleartablelock/cleartablelock.cpp @@ -184,14 +184,14 @@ int constructPMList( const std::vector& dbRootList, catch (std::exception& ex) { std::cout << "Error mapping DBRoot " << dbRoot << " to a PM. " << - ex.what() << ". Verify that this DBRoot is in Calpont.xml."<< + ex.what() << ". Verify that this DBRoot is in Columnstore.xml."<< std::endl; return 5; } catch (...) { std::cout << "Error mapping DBRoot " << dbRoot << " to a PM. " << - "Unknown exception. Verify that this DBRoot is in Calpont.xml"<< + "Unknown exception. Verify that this DBRoot is in Columnstore.xml"<< std::endl; return 5; } diff --git a/tools/configMgt/README b/tools/configMgt/README index 1d908119f..f1307af56 100644 --- a/tools/configMgt/README +++ b/tools/configMgt/README @@ -23,7 +23,7 @@ buildTester.sh - Installs a Calpont system with a New Latest Built or Execute './buildTester -h' for addition help. configure - Interactively reads and Configures a local version of the - Calpont.xml file based on user inputs. + Columnstore.xml file based on user inputs. Usage ./configure Supported Command Scipts. These scripts are called by the User Command scripts: @@ -32,7 +32,7 @@ autoConfigure, parent_installer.sh, remote_command.sh, and remote_scp_get.sh Directories: -systems - Contains directories of the systems with associated Calpont.xml +systems - Contains directories of the systems with associated Columnstore.xml files for that system. Also contains the CalpontSystem.xml file, which contains the support systems that can be installed using the autoInstaller diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp index 12dbac4f3..84976e4aa 100644 --- a/tools/configMgt/autoConfigure.cpp +++ b/tools/configMgt/autoConfigure.cpp @@ -21,7 +21,7 @@ * * * List of files being updated by configure: -* Calpont/etc/Calpont.xml +* Calpont/etc/Columnstore.xml * * ******************************************************************************************/ @@ -91,12 +91,12 @@ int main(int argc, char *argv[]) systemName = oam::UnassignedName; try { - sysConfigOld = Config::makeConfig("./Calpont.xml"); // system version - sysConfigNew = Config::makeConfig("./Calpont.xml.new"); // released version + sysConfigOld = Config::makeConfig("./Columnstore.xml"); // system version + sysConfigNew = Config::makeConfig("./Columnstore.xml.new"); // released version } catch(...) { - cout << "ERROR: Problem reading Calpont.xml files"; + cout << "ERROR: Problem reading Columnstore.xml files"; exit(-1); } @@ -944,9 +944,9 @@ int main(int argc, char *argv[]) if ( moduleName == systemParentOAMModuleName ) { parentOAMModuleIPAddr = moduleIPAddr; - //exit out if parentOAMModuleIPAddr is NOT set, this means the System Calpont.xml isn't configured + //exit out if parentOAMModuleIPAddr is NOT set, this means the System Columnstore.xml isn't configured if ( parentOAMModuleIPAddr == "0.0.0.0" ) { - cout << "ERROR: System Calpont.xml not configured" << endl; + cout << "ERROR: System Columnstore.xml not configured" << endl; exit(-1); } diff --git a/tools/configMgt/autoInstaller.cpp b/tools/configMgt/autoInstaller.cpp index a6ab46599..fc3fcd0d8 100644 --- a/tools/configMgt/autoInstaller.cpp +++ b/tools/configMgt/autoInstaller.cpp @@ -98,8 +98,8 @@ int main(int argc, char *argv[]) cout << endl; cout << "The list of systems are located in '" << sysConfig->configFile() << "'" << endl; cout << endl; - cout << "The 'Calpont.xml' used in the install will default to system" << endl; - cout << "configuration of the 'Calpont.xml' located on the system being" << endl; + cout << "The 'Columnstore.xml' used in the install will default to system" << endl; + cout << "configuration of the 'Columnstore.xml' located on the system being" << endl; cout << "or can be passed as an argument into 'quickInstaller'." << endl; cout << endl; cout << "Usage: autoInstaller -s system [-h][-ce][-r release][-c configFile][-n][-d][-p package-type][-m mysql-password][-port mysql-port][-pr product-name]" << endl; @@ -516,43 +516,43 @@ cout << "systemPackage = " << systemPackage << endl; exit(0); #endif - //get release and system Calpont.xml and generate a new Calpont.xml file for installation + //get release and system Columnstore.xml and generate a new Columnstore.xml file for installation if ( configFile == "NULL" ) { - cout << "Get Release Calpont.xml " << flush; + cout << "Get Release Columnstore.xml " << flush; - // get release Calpont.xml - string cmd = "cd " + systemDir + ";smbclient " + SHARED + " -WMARIADB -U root%Calpont1 -c 'cd packages/" + release + "/;prompt OFF;mget Calpont.xml' > /dev/null 2>&1"; + // get release Columnstore.xml + string cmd = "cd " + systemDir + ";smbclient " + SHARED + " -WMARIADB -U root%Calpont1 -c 'cd packages/" + release + "/;prompt OFF;mget Columnstore.xml' > /dev/null 2>&1"; rtnCode = system(cmd.c_str()); if (rtnCode != 0) { - cout << "FAILED: no Release Calpont.xml found for release '" + release + "', exiting" << endl; - cerr << "FAILED: no Release Calpont.xml found for release '" + release + "', exiting" << endl; + cout << "FAILED: no Release Columnstore.xml found for release '" + release + "', exiting" << endl; + cerr << "FAILED: no Release Columnstore.xml found for release '" + release + "', exiting" << endl; exit(1); } else { - cmd = "cd " + systemDir + ";mv -f Calpont.xml Calpont.xml.new > /dev/null 2>&1"; + cmd = "cd " + systemDir + ";mv -f Columnstore.xml Columnstore.xml.new > /dev/null 2>&1"; rtnCode = system(cmd.c_str()); if (rtnCode != 0) { - cout << "FAILED: no Release Calpont.xml found for release '" + release + "', exiting" << endl; - cerr << "FAILED: no Release Calpont.xml found for release '" + release + "', exiting" << endl; + cout << "FAILED: no Release Columnstore.xml found for release '" + release + "', exiting" << endl; + cerr << "FAILED: no Release Columnstore.xml found for release '" + release + "', exiting" << endl; exit(1); } else { cout << "DONE" << endl; - //get system Calpont.xml - cout << "Get System Calpont.xml " << flush; + //get system Columnstore.xml + cout << "Get System Columnstore.xml " << flush; for ( int retry = 0 ; retry < 5 ; retry++ ) { - cmd = "./remote_scp_get.sh " + installParentModuleIPAddr + " " + password + " " + installDir + "" + installLocation + "/etc/Calpont.xml " + systemUser + " " + debug_flag; + cmd = "./remote_scp_get.sh " + installParentModuleIPAddr + " " + password + " " + installDir + "" + installLocation + "/etc/Columnstore.xml " + systemUser + " " + debug_flag; rtnCode = system(cmd.c_str()); sleep(2); if (rtnCode == 0) { - cmd = "mv Calpont.xml " + systemDir + "/."; + cmd = "mv Columnstore.xml " + systemDir + "/."; rtnCode = system(cmd.c_str()); if ( rtnCode == 0 ) { - // Calpont.xml found + // Columnstore.xml found //try to parse it Config* sysConfigOld; @@ -566,22 +566,22 @@ exit(0); // redirect cout to /dev/null cerr.rdbuf(file.rdbuf()); - sysConfigOld = Config::makeConfig( systemDir + "/Calpont.xml"); + sysConfigOld = Config::makeConfig( systemDir + "/Columnstore.xml"); // restore cout stream buffer cerr.rdbuf (strm_buffer); - //update release Calpont.xml with System Configuration info from system Calpont.xml - cout << "Run Calpont.xml autoConfigure " << flush; + //update release Columnstore.xml with System Configuration info from system Columnstore.xml + cout << "Run Columnstore.xml autoConfigure " << flush; cmd = "cd " + systemDir + ";../../autoConfigure"; rtnCode = system(cmd.c_str()); if (rtnCode != 0) { - cout << " FAILED, try Calpont.xml.rpmsave" << endl; + cout << " FAILED, try Columnstore.xml.rpmsave" << endl; goto RPMSAVE; } else { cout << "DONE" << endl; - configFile = "Calpont.xml.new"; + configFile = "Columnstore.xml.new"; goto CONFIGDONE; } } @@ -597,22 +597,22 @@ exit(0); } RPMSAVE: - //try Calpont.xml.rpmsave - cout << "Get System Calpont.xml.rpmsave " << flush; - cmd = "./remote_scp_get.sh " + installParentModuleIPAddr + " " + password + " " + installDir + "" + installLocation + "/etc/Calpont.xml.rpmsave " + systemUser + " " + debug_flag; + //try Columnstore.xml.rpmsave + cout << "Get System Columnstore.xml.rpmsave " << flush; + cmd = "./remote_scp_get.sh " + installParentModuleIPAddr + " " + password + " " + installDir + "" + installLocation + "/etc/Columnstore.xml.rpmsave " + systemUser + " " + debug_flag; rtnCode = system(cmd.c_str()); if (rtnCode == 0) { - cmd = "mv Calpont.xml.rpmsave " + systemDir + "Calpont.xml"; + cmd = "mv Columnstore.xml.rpmsave " + systemDir + "Columnstore.xml"; rtnCode = system(cmd.c_str()); if ( rtnCode != 0 ) { - cout << "ERROR: No system Calpont.xml or Calpont.xml.rpmsave found, exiting" << endl; - cerr << "ERROR: No system Calpont.xml or Calpont.xml.rpmsave found, exiting" << endl; + cout << "ERROR: No system Columnstore.xml or Columnstore.xml.rpmsave found, exiting" << endl; + cerr << "ERROR: No system Columnstore.xml or Columnstore.xml.rpmsave found, exiting" << endl; exit(1); } } - //update release Calpont.xml with System Configuration info from system Calpont.xml.rpmsave - cout << "Run Calpont.xml autoConfigure " << flush; + //update release Columnstore.xml with System Configuration info from system Columnstore.xml.rpmsave + cout << "Run Columnstore.xml autoConfigure " << flush; cmd = "cd " + systemDir + ";../../autoConfigure"; rtnCode = system(cmd.c_str()); if (rtnCode != 0) { @@ -622,7 +622,7 @@ RPMSAVE: } else { cout << "DONE" << endl; - configFile = "Calpont.xml.new"; + configFile = "Columnstore.xml.new"; } } } @@ -632,12 +632,12 @@ CONFIGDONE: Config* sysConfigOld; try { - sysConfigOld = Config::makeConfig( systemDir + "/Calpont.xml"); + sysConfigOld = Config::makeConfig( systemDir + "/Columnstore.xml"); } catch(...) { - cout << "ERROR: Problem reading Calpont.xml files, exiting" << endl; - cerr << "ERROR: Problem reading Calpont.xml files, exiting" << endl; + cout << "ERROR: Problem reading Columnstore.xml files, exiting" << endl; + cerr << "ERROR: Problem reading Columnstore.xml files, exiting" << endl; exit(1); } @@ -716,8 +716,8 @@ CONFIGDONE: } if ( parentOAMModuleIPAddr == "0.0.0.0" ) { - cout << "System Calpont.xml is un-configured, exiting" << endl; - cerr << "System Calpont.xml is un-configured, exiting" << endl; + cout << "System Columnstore.xml is un-configured, exiting" << endl; + cerr << "System Columnstore.xml is un-configured, exiting" << endl; exit (0); } @@ -728,8 +728,8 @@ CONFIGDONE: } catch(...) { - cout << "ERROR: Problem reading Calpont.xml files, exiting" << endl; - cerr << "ERROR: Problem reading Calpont.xml files, exiting" << endl; + cout << "ERROR: Problem reading Columnstore.xml files, exiting" << endl; + cerr << "ERROR: Problem reading Columnstore.xml files, exiting" << endl; exit(1); } diff --git a/tools/configMgt/calpont-build b/tools/configMgt/calpont-build index 43bf25af6..6b0408e15 100755 --- a/tools/configMgt/calpont-build +++ b/tools/configMgt/calpont-build @@ -83,8 +83,8 @@ if [ $REL != "Latest" ] ; then smbclient //calweb/shared -Wcalpont -Uoamuser%Calpont1 -c "cd Iterations;mkdir $REL;cd $REL;rm *.$OS.rpm;prompt OFF;mput *" smbclient //calweb/shared -Wcalpont -Uoamuser%Calpont1 -c "cd Iterations/nightly;mkdir $REL-$DATE;cd $REL-$DATE;rm *.$OS.rpm;prompt OFF;mput *" cd /home/nightly/$DIR/export/etc/ - smbclient //calweb/shared -Wcalpont -Uoamuser%Calpont1 -c "cd Iterations/$REL;rm Calpont.xml;prompt OFF;mput Calpont.xml" - smbclient //calweb/shared -Wcalpont -Uoamuser%Calpont1 -c "cd Iterations/nightly/$REL-$DATE;rm Calpont.xml;prompt OFF;mput Calpont.xml" + smbclient //calweb/shared -Wcalpont -Uoamuser%Calpont1 -c "cd Iterations/$REL;rm Columnstore.xml;prompt OFF;mput Columnstore.xml" + smbclient //calweb/shared -Wcalpont -Uoamuser%Calpont1 -c "cd Iterations/nightly/$REL-$DATE;rm Columnstore.xml;prompt OFF;mput Columnstore.xml" else # copy nightly on calweb @@ -93,8 +93,8 @@ else smbclient //calweb/shared -Wcalpont -Uoamuser%Calpont1 -c "cd Iterations/Latest;rm *.$OS.rpm;prompt OFF;mput *" smbclient //calweb/shared -Wcalpont -Uoamuser%Calpont1 -c "cd Iterations/nightly;mkdir genii-$DATE;cd genii-$DATE;prompt OFF;mput *" cd /home/nightly/$DIR/export/etc/ - smbclient //calweb/shared -Wcalpont -Uoamuser%Calpont1 -c "cd Iterations/Latest;rm Calpont.xml;prompt OFF;mput Calpont.xml" - smbclient //calweb/shared -Wcalpont -Uoamuser%Calpont1 -c "cd Iterations/nightly/genii-$DATE;prompt OFF;mput Calpont.xml" + smbclient //calweb/shared -Wcalpont -Uoamuser%Calpont1 -c "cd Iterations/Latest;rm Columnstore.xml;prompt OFF;mput Columnstore.xml" + smbclient //calweb/shared -Wcalpont -Uoamuser%Calpont1 -c "cd Iterations/nightly/genii-$DATE;prompt OFF;mput Columnstore.xml" fi } 2> /root/infinidb-build-$REL-$DIR.log # diff --git a/tools/configMgt/configure.cpp b/tools/configMgt/configure.cpp index c14358e3b..a9b1698e5 100644 --- a/tools/configMgt/configure.cpp +++ b/tools/configMgt/configure.cpp @@ -21,7 +21,7 @@ * * * List of files being updated by configure: -* Calpont/etc/Calpont.xml +* Calpont/etc/Columnstore.xml * * ******************************************************************************************/ @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) cout << endl; cout << "This is the Calpont System Configuration tool." << endl; - cout << "It will generate a Calpont System specific Calpont.xml file." << endl; + cout << "It will generate a Calpont System specific Columnstore.xml file." << endl; cout << "The file can then be used by the autoInstaller tool" << endl; cout << endl; @@ -172,14 +172,14 @@ int main(int argc, char *argv[]) cout << "Invalid System Name, please re-enter" << endl; } - //determine which Calpont.xml to use as a base + //determine which Columnstore.xml to use as a base while(true) { cout << endl; - cout << "Enter the Calpont.xml file do you want to use as a based version" << endl; + cout << "Enter the Columnstore.xml file do you want to use as a based version" << endl; cout << "Enter: 1 for System version (meaning copy from the system)" << endl; cout << " 2 for Release version" << endl; - cout << " 3 for Calpont.xml version already located in the systems directory" << endl; + cout << " 3 for Columnstore.xml version already located in the systems directory" << endl; int option; prompt = "Enter (1,2,or 3) > "; @@ -192,7 +192,7 @@ int main(int argc, char *argv[]) free(pcommand); pcommand = 0; switch(option) { - case 1: //get system Calpont.xml + case 1: //get system Columnstore.xml { cout << "Copying from system, please wait... " << flush; //get Network IP Address @@ -214,13 +214,13 @@ int main(int argc, char *argv[]) exit (-1); } - cmd = "./remote_scp_get.sh " + parentOAMModuleIPAddr + " " + password + " /usr/local/mariadb/columnstore/etc/Calpont.xml 0 "; + cmd = "./remote_scp_get.sh " + parentOAMModuleIPAddr + " " + password + " /usr/local/mariadb/columnstore/etc/Columnstore.xml 0 "; rtnCode = system(cmd.c_str()); if (rtnCode == 0) { - cmd = "mv Calpont.xml systems/" + systemName + "/."; + cmd = "mv Columnstore.xml systems/" + systemName + "/."; rtnCode = system(cmd.c_str()); if ( rtnCode != 0 ) { - cout << "ERROR: No system Calpont.xml found" << endl; + cout << "ERROR: No system Columnstore.xml found" << endl; continue; } else @@ -228,7 +228,7 @@ int main(int argc, char *argv[]) } break; } - case 2: //get release Calpont.xml + case 2: //get release Columnstore.xml { string release; while (true) @@ -243,16 +243,16 @@ int main(int argc, char *argv[]) free(pcommand); pcommand = 0; if (release.empty()) continue; - string cmd = "cd systems/" + systemName + ";rm -f Calpont.xml;smbclient //cal6500/shared -Wcalpont -U" + oam::USERNAME + "%" + oam::PASSWORD + " -c 'cd Iterations/" + release + "/;prompt OFF;mget Calpont.xml' > /dev/null 2>&1"; + string cmd = "cd systems/" + systemName + ";rm -f Columnstore.xml;smbclient //cal6500/shared -Wcalpont -U" + oam::USERNAME + "%" + oam::PASSWORD + " -c 'cd Iterations/" + release + "/;prompt OFF;mget Columnstore.xml' > /dev/null 2>&1"; int rtnCode = system(cmd.c_str()); if (rtnCode != 0) - cout << "FAILED: no Release Calpont.xml found for " + release << endl; + cout << "FAILED: no Release Columnstore.xml found for " + release << endl; else { - cmd = "cd systems/" + systemName + ";ls Calpont.xml > /dev/null 2>&1"; + cmd = "cd systems/" + systemName + ";ls Columnstore.xml > /dev/null 2>&1"; rtnCode = system(cmd.c_str()); if (rtnCode != 0) { - cout << "FAILED: no Release Calpont.xml found for " + release << endl; + cout << "FAILED: no Release Columnstore.xml found for " + release << endl; continue; } else @@ -262,7 +262,7 @@ int main(int argc, char *argv[]) } break; } - case 3: //use Calpont.xml alyread in system directory + case 3: //use Columnstore.xml alyread in system directory break; default: @@ -279,7 +279,7 @@ int main(int argc, char *argv[]) setenv("CALPONT_HOME", env.c_str() , 1); Oam oam; - Config* sysConfig = Config::makeConfig(env + "/Calpont.xml"); + Config* sysConfig = Config::makeConfig(env + "/Columnstore.xml"); // make DBRM backwards compatiable for pre 1.0.0.157 load string dbrmMainProc = "DBRM_Controller"; @@ -1523,7 +1523,7 @@ int main(int argc, char *argv[]) } // - //Update oidbitmap in Calpont.xml + //Update oidbitmap in Columnstore.xml // try { @@ -1538,5 +1538,5 @@ int main(int argc, char *argv[]) //Write out Updated System Configuration File sysConfig->write(); - cout << endl << "Configure is successfuly completed, Calpont.xml is located in systems/" + systemName << endl << endl; + cout << endl << "Configure is successfuly completed, Columnstore.xml is located in systems/" + systemName << endl << endl; } diff --git a/tools/configMgt/dm_parent_installer.sh b/tools/configMgt/dm_parent_installer.sh index 91994768e..57498924c 100755 --- a/tools/configMgt/dm_parent_installer.sh +++ b/tools/configMgt/dm_parent_installer.sh @@ -142,7 +142,7 @@ expect -re {[$#] } # if { $CONFIGFILE != "NULL"} { # - # copy over Calpont.xml file + # copy over Columnstore.xml file # send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/$INSTALLLOCATION/etc/$CONFIG.xml\n" expect -re "word: " @@ -178,13 +178,13 @@ if { $CONFIGFILE != "NULL"} { # rename previous installed config file # send_user "Copy RPM-saved InfiniDB Configuration File " - send "ssh $USERNAME@$SERVER 'cd /usr/local/$INSTALLLOCATION/etc/;mv -f Calpont.xml Calpont.xml.install;cp -v Calpont.xml.rpmsave Calpont.xml'\n" + send "ssh $USERNAME@$SERVER 'cd /usr/local/$INSTALLLOCATION/etc/;mv -f Columnstore.xml Columnstore.xml.install;cp -v Columnstore.xml.rpmsave Columnstore.xml'\n" expect -re "word: " # password for ssh send "$PASSWORD\n" # check return expect { - -re "Calpont.xml" { send_user "DONE" } + -re "Columnstore.xml" { send_user "DONE" } -re "Permission denied, please try again" { send_user "FAILED: Invalid password\n" ; exit -1 } } } diff --git a/tools/configMgt/dm_parent_installer_v3.sh b/tools/configMgt/dm_parent_installer_v3.sh index fc4e2cdf7..8bb899705 100755 --- a/tools/configMgt/dm_parent_installer_v3.sh +++ b/tools/configMgt/dm_parent_installer_v3.sh @@ -140,10 +140,10 @@ expect -re "# " # if { $CONFIGFILE != "NULL"} { # - # copy over Calpont.xml file + # copy over Columnstore.xml file # send_user "Copy Calpont Configuration File " - send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/mariadb/columnstore/etc/Calpont.xml.rpmsave\n" + send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/mariadb/columnstore/etc/Columnstore.xml.rpmsave\n" expect -re "word: " # send the password send "$PASSWORD\n" @@ -153,7 +153,7 @@ if { $CONFIGFILE != "NULL"} { -re "Permission denied, please try again" { send_user "FAILED: Invalid password\n" ; exit -1 } -re "No such file or directory" { send_user "FAILED: Invalid package\n" ; exit -1 } } - send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/mariadb/columnstore/etc/Calpont.xml\n" + send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/mariadb/columnstore/etc/Columnstore.xml\n" expect -re "word: " # send the password send "$PASSWORD\n" @@ -163,7 +163,7 @@ if { $CONFIGFILE != "NULL"} { -re "Permission denied, please try again" { send_user "FAILED: Invalid password\n" ; exit -1 } -re "No such file or directory" { send_user "FAILED: Invalid package\n" ; exit -1 } } - send "scp $CONFIGFILE $USERNAME@$SERVER:/tmp/Calpont.xml\n" + send "scp $CONFIGFILE $USERNAME@$SERVER:/tmp/Columnstore.xml\n" expect -re "word: " # send the password send "$PASSWORD\n" @@ -175,13 +175,13 @@ if { $CONFIGFILE != "NULL"} { # rename previous installed config file # send_user "Copy RPM-saved Calpont Configuration File " - send "ssh $USERNAME@$SERVER 'cd /usr/local/mariadb/columnstore/etc/;mv -f Calpont.xml Calpont.xml.install;cp -v Calpont.xml.rpmsave Calpont.xml'\n" + send "ssh $USERNAME@$SERVER 'cd /usr/local/mariadb/columnstore/etc/;mv -f Columnstore.xml Columnstore.xml.install;cp -v Columnstore.xml.rpmsave Columnstore.xml'\n" expect -re "word: " # password for ssh send "$PASSWORD\n" # check return expect { - -re "Calpont.xml" { send_user "DONE" } abort + -re "Columnstore.xml" { send_user "DONE" } abort -re "Permission denied, please try again" { send_user "FAILED: Invalid password\n" ; exit -1 } } } diff --git a/tools/configMgt/parent_binary_installer_v3.sh b/tools/configMgt/parent_binary_installer_v3.sh index 0b98656a6..155004a90 100755 --- a/tools/configMgt/parent_binary_installer_v3.sh +++ b/tools/configMgt/parent_binary_installer_v3.sh @@ -164,10 +164,10 @@ sleep 10 # if { $CONFIGFILE != "NULL"} { # - # copy over Calpont.xml file + # copy over Columnstore.xml file # send_user "Copy Calpont Configuration File " - send "scp $CONFIGFILE $USERNAME@$SERVER:$INSTALLDIR/Calpont/etc/Calpont.xml.rpmsave\n" + send "scp $CONFIGFILE $USERNAME@$SERVER:$INSTALLDIR/Calpont/etc/Columnstore.xml.rpmsave\n" expect -re "word: " # send the password send "$PASSWORD\n" @@ -179,7 +179,7 @@ if { $CONFIGFILE != "NULL"} { -re "Permission denied, please try again" { send_user "FAILED: Invalid password\n" ; exit -1 } -re "No such file or directory" { send_user "FAILED: Invalid package\n" ; exit -1 } } - send "scp $CONFIGFILE $USERNAME@$SERVER:$INSTALLDIR/Calpont/etc/Calpont.xml\n" + send "scp $CONFIGFILE $USERNAME@$SERVER:$INSTALLDIR/Calpont/etc/Columnstore.xml\n" expect -re "word: " # send the password send "$PASSWORD\n" @@ -196,13 +196,13 @@ if { $CONFIGFILE != "NULL"} { # rename previous installed config file # send_user "Copy RPM-saved Calpont Configuration File " - send "ssh $USERNAME@$SERVER 'cd $INSTALLDIR/Calpont/etc/;mv -f Calpont.xml Calpont.xml.install;cp -v Calpont.xml.rpmsave Calpont.xml'\n" + send "ssh $USERNAME@$SERVER 'cd $INSTALLDIR/Calpont/etc/;mv -f Columnstore.xml Columnstore.xml.install;cp -v Columnstore.xml.rpmsave Columnstore.xml'\n" expect -re "word: " # password for ssh send "$PASSWORD\n" # check return expect { - -re "Calpont.xml" { send_user "DONE" } abort + -re "Columnstore.xml" { send_user "DONE" } abort -re "Permission denied, please try again" { send_user "FAILED: Invalid password\n" ; exit -1 } } } diff --git a/tools/configMgt/parent_installer.sh b/tools/configMgt/parent_installer.sh index 464ffca93..d2a9a0e73 100755 --- a/tools/configMgt/parent_installer.sh +++ b/tools/configMgt/parent_installer.sh @@ -186,10 +186,10 @@ send "rm -f $PACKAGE\n" # if { $CONFIGFILE != "NULL"} { # - # copy over Calpont.xml file + # copy over Columnstore.xml file # send_user "Copy Calpont Configuration File " - send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/mariadb/columnstore/etc/Calpont.xml\n" + send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/mariadb/columnstore/etc/Columnstore.xml\n" expect -re "word: " # send the password send "$PASSWORD\n" @@ -206,13 +206,13 @@ if { $CONFIGFILE != "NULL"} { # rename previous installed config file # send_user "Copy RPM-saved Calpont Configuration File " - send "ssh $USERNAME@$SERVER 'cd /usr/local/mariadb/columnstore/etc/;mv -f Calpont.xml Calpont.xml.install;cp -v Calpont.xml.rpmsave Calpont.xml'\n" + send "ssh $USERNAME@$SERVER 'cd /usr/local/mariadb/columnstore/etc/;mv -f Columnstore.xml Columnstore.xml.install;cp -v Columnstore.xml.rpmsave Columnstore.xml'\n" expect -re "word: " # password for ssh send "$PASSWORD\n" # check return expect { - -re "Calpont.xml" { send_user "DONE" } abort + -re "Columnstore.xml" { send_user "DONE" } abort -re "Permission denied, please try again" { send_user "FAILED: Invalid password\n" ; exit -1 } } } diff --git a/tools/configMgt/pm_parent_installer_v3.sh b/tools/configMgt/pm_parent_installer_v3.sh index b1b0428c4..88931ba38 100755 --- a/tools/configMgt/pm_parent_installer_v3.sh +++ b/tools/configMgt/pm_parent_installer_v3.sh @@ -127,10 +127,10 @@ send "rm -f $PACKAGE\n" # if { $CONFIGFILE != "NULL"} { # - # copy over Calpont.xml file + # copy over Columnstore.xml file # send_user "Copy Calpont Configuration File " - send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/mariadb/columnstore/etc/Calpont.xml.rpmsave\n" + send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/mariadb/columnstore/etc/Columnstore.xml.rpmsave\n" expect -re "word: " # send the password send "$PASSWORD\n" @@ -140,7 +140,7 @@ if { $CONFIGFILE != "NULL"} { -re "Permission denied, please try again" { send_user "FAILED: Invalid password\n" ; exit -1 } -re "No such file or directory" { send_user "FAILED: Invalid package\n" ; exit -1 } } - send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/mariadb/columnstore/etc/Calpont.xml\n" + send "scp $CONFIGFILE $USERNAME@$SERVER:/usr/local/mariadb/columnstore/etc/Columnstore.xml\n" expect -re "word: " # send the password send "$PASSWORD\n" @@ -150,7 +150,7 @@ if { $CONFIGFILE != "NULL"} { -re "Permission denied, please try again" { send_user "FAILED: Invalid password\n" ; exit -1 } -re "No such file or directory" { send_user "FAILED: Invalid package\n" ; exit -1 } } - send "scp $CONFIGFILE $USERNAME@$SERVER:/tmp/Calpont.xml\n" + send "scp $CONFIGFILE $USERNAME@$SERVER:/tmp/Columnstore.xml\n" expect -re "word: " # send the password send "$PASSWORD\n" @@ -162,13 +162,13 @@ if { $CONFIGFILE != "NULL"} { # rename previous installed config file # send_user "Copy RPM-saved Calpont Configuration File " - send "ssh $USERNAME@$SERVER 'cd /usr/local/mariadb/columnstore/etc/;mv -f Calpont.xml Calpont.xml.install;cp -v Calpont.xml.rpmsave Calpont.xml'\n" + send "ssh $USERNAME@$SERVER 'cd /usr/local/mariadb/columnstore/etc/;mv -f Columnstore.xml Columnstore.xml.install;cp -v Columnstore.xml.rpmsave Columnstore.xml'\n" expect -re "word: " # password for ssh send "$PASSWORD\n" # check return expect { - -re "Calpont.xml" { send_user "DONE" } abort + -re "Columnstore.xml" { send_user "DONE" } abort -re "Permission denied, please try again" { send_user "FAILED: Invalid password\n" ; exit -1 } } } diff --git a/tools/configMgt/stackReleaseChecker.cpp b/tools/configMgt/stackReleaseChecker.cpp index 8bc0ef7bd..404aff92a 100644 --- a/tools/configMgt/stackReleaseChecker.cpp +++ b/tools/configMgt/stackReleaseChecker.cpp @@ -21,7 +21,7 @@ * * * List of files being updated by configure: -* Calpont/etc/Calpont.xml +* Calpont/etc/Columnstore.xml * * ******************************************************************************************/ diff --git a/tools/dbbuilder/dbbuilder.cpp b/tools/dbbuilder/dbbuilder.cpp index a79032d86..845ac5ef5 100644 --- a/tools/dbbuilder/dbbuilder.cpp +++ b/tools/dbbuilder/dbbuilder.cpp @@ -203,10 +203,10 @@ int main(int argc, char* argv[]) return 1; } - //@bug5554, make sure IDBPolicy matches the Calpont.xml config + //@bug5554, make sure IDBPolicy matches the Columnstore.xml config try { - string calpontConfigFile(startup::StartUp::installDir() + "/etc/Calpont.xml"); + string calpontConfigFile(startup::StartUp::installDir() + "/etc/Columnstore.xml"); config::Config* sysConfig = config::Config::makeConfig(calpontConfigFile.c_str()); string tmp = sysConfig->getConfig("Installation", "DBRootStorageType"); if (boost::iequals(tmp, "hdfs")) diff --git a/tools/dbloadxml/colxml.cpp b/tools/dbloadxml/colxml.cpp index 65a9ed1ce..ff1223b9d 100644 --- a/tools/dbloadxml/colxml.cpp +++ b/tools/dbloadxml/colxml.cpp @@ -49,7 +49,7 @@ int main(int argc, char **argv) setuid( 0 ); // set effective ID to root; ignore return status #endif setlocale(LC_ALL, ""); - WriteEngine::Config::initConfigCache(); // load Calpont.xml config settings + WriteEngine::Config::initConfigCache(); // load Columnstore.xml config settings //Bug 6137 std::string aBulkRoot = WriteEngine::Config::getBulkRoot(); diff --git a/tools/notificationTester/main.cpp b/tools/notificationTester/main.cpp index 070716a6c..e48d5a014 100644 --- a/tools/notificationTester/main.cpp +++ b/tools/notificationTester/main.cpp @@ -65,7 +65,7 @@ int main (int argc, char** argv) string ipaddr = sysConfig->getConfig(msgPort, "IPAddr"); if (ipaddr.empty()) { - cerr << "CMP1 not configured in Calpont.xml, example of what to add to Calpont.xml:" << endl; + cerr << "CMP1 not configured in Columnstore.xml, example of what to add to Columnstore.xml:" << endl; cerr << "" << endl; cerr << " 127.0.0.1" << endl; cerr << " 8650" << endl; diff --git a/tools/setConfig/configxml.sh b/tools/setConfig/configxml.sh index 2b9dcaadb..959f79ae5 100755 --- a/tools/setConfig/configxml.sh +++ b/tools/setConfig/configxml.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# configxml set/get an entry in Calpont.xml file +# configxml set/get an entry in Columnstore.xml file # # @@ -32,13 +32,13 @@ case "$1" in oldvalue=$($InstallDir/bin/getConfig $2 $3) #if [ -z $oldvalue ]; then - # echo "$2 / $3 not found in Calpont.xml" + # echo "$2 / $3 not found in Columnstore.xml" # exit 1 #fi echo "Old value of $2 / $3 is $oldvalue" - calxml=$InstallDir/etc/Calpont.xml + calxml=$InstallDir/etc/Columnstore.xml seconds=$(date +%s) cp $calxml $calxml.$seconds @@ -70,7 +70,7 @@ case "$1" in value=$($InstallDir/bin/getConfig $2 $3) if [ -z $value ]; then - echo "$2 / $3 not found in Calpont.xml" + echo "$2 / $3 not found in Columnstore.xml" exit 1 fi diff --git a/utils/configcpp/configcpp.cpp b/utils/configcpp/configcpp.cpp index 862f225d1..edac6f069 100644 --- a/utils/configcpp/configcpp.cpp +++ b/utils/configcpp/configcpp.cpp @@ -63,7 +63,7 @@ namespace fs=boost::filesystem; namespace { -const fs::path defaultCalpontConfigFile("Calpont.xml"); +const fs::path defaultCalpontConfigFile("Columnstore.xml"); } namespace config @@ -203,7 +203,7 @@ void Config::parseDoc(void) throw runtime_error("Config::parseDoc: error parsing config file " + fConfigFile); } - if (xmlStrcmp(cur->name, (const xmlChar *)"Calpont")) + if (xmlStrcmp(cur->name, (const xmlChar *)"Columnstore")) { xmlFreeDoc(fDoc); fDoc = 0; @@ -345,9 +345,9 @@ void Config::writeConfig(const string& configFile) const fs::rename(outFilePth, configFilePth); #else - const fs::path defaultCalpontConfigFileTemp("Calpont.xml.temp"); - const fs::path saveCalpontConfigFileTemp("Calpont.xml.calpontSave"); - const fs::path tmpCalpontConfigFileTemp("Calpont.xml.temp1"); + const fs::path defaultCalpontConfigFileTemp("Columnstore.xml.temp"); + const fs::path saveCalpontConfigFileTemp("Columnstore.xml.calpontSave"); + const fs::path tmpCalpontConfigFileTemp("Columnstore.xml.temp1"); fs::path etcdir = fs::path(fInstallDir) / fs::path("etc"); @@ -355,7 +355,7 @@ void Config::writeConfig(const string& configFile) const fs::path dcft = etcdir / fs::path(defaultCalpontConfigFileTemp); fs::path scft = etcdir / fs::path(saveCalpontConfigFileTemp); fs::path tcft = etcdir / fs::path(tmpCalpontConfigFileTemp); - //perform a temp write first if Calpont.xml file to prevent possible corruption + //perform a temp write first if Columnstore.xml file to prevent possible corruption if ( configFile == dcf ) { if (exists(dcft)) fs::remove(dcft); @@ -378,7 +378,7 @@ void Config::writeConfig(const string& configFile) const string value; value = c1->getConfig("SystemConfig", "SystemName"); - //good read, save copy, copy temp file tp tmp then to Calpont.xml + //good read, save copy, copy temp file tp tmp then to Columnstore.xml //move to /tmp to get around a 'same file error' in mv command try { if (exists(scft)) fs::remove(scft); @@ -402,7 +402,7 @@ void Config::writeConfig(const string& configFile) const } } else - { // non Calpont.xml, perform update + { // non Columnstore.xml, perform update if ((fi = fopen(configFile.c_str(), "w")) == NULL) throw runtime_error("Config::writeConfig: error writing config file " + configFile); diff --git a/utils/configcpp/configcpp.cpp.nonroottest b/utils/configcpp/configcpp.cpp.nonroottest index 66e6bd8f3..eedcac9f5 100644 --- a/utils/configcpp/configcpp.cpp.nonroottest +++ b/utils/configcpp/configcpp.cpp.nonroottest @@ -63,7 +63,7 @@ namespace fs=boost::filesystem; namespace { -const fs::path defaultCalpontConfigFile("Calpont.xml"); +const fs::path defaultCalpontConfigFile("Columnstore.xml"); } namespace config @@ -345,9 +345,9 @@ void Config::writeConfig(const string& configFile) const fs::rename(outFilePth, configFilePth); #else - const fs::path defaultCalpontConfigFileTemp("Calpont.xml.temp"); - const fs::path saveCalpontConfigFileTemp("Calpont.xml.calpontSave"); - const fs::path tmpCalpontConfigFileTemp("Calpont.xml.temp1"); + const fs::path defaultCalpontConfigFileTemp("Columnstore.xml.temp"); + const fs::path saveCalpontConfigFileTemp("Columnstore.xml.calpontSave"); + const fs::path tmpCalpontConfigFileTemp("Columnstore.xml.temp1"); fs::path etcdir = fs::path(fInstallDir) / fs::path("etc"); @@ -355,7 +355,7 @@ void Config::writeConfig(const string& configFile) const fs::path dcft = etcdir / fs::path(defaultCalpontConfigFileTemp); fs::path scft = etcdir / fs::path(saveCalpontConfigFileTemp); fs::path tcft = etcdir / fs::path(tmpCalpontConfigFileTemp); - //perform a temp write first if Calpont.xml file to prevent possible corruption + //perform a temp write first if Columnstore.xml file to prevent possible corruption if ( configFile == dcf ) { if (exists(dcft)) fs::remove(dcft); @@ -378,7 +378,7 @@ void Config::writeConfig(const string& configFile) const string value; value = c1->getConfig("SystemConfig", "SystemName"); - //good read, save copy, copy temp file tp tmp then to Calpont.xml + //good read, save copy, copy temp file tp tmp then to Columnstore.xml //move to /tmp to get around a 'same file error' in mv command try { if (exists(scft)) fs::remove(scft); @@ -415,7 +415,7 @@ void Config::writeConfig(const string& configFile) const } } else - { // non Calpont.xml, perform update + { // non Columnstore.xml, perform update if ((fi = fopen(configFile.c_str(), "w")) == NULL) throw runtime_error("Config::writeConfig: error writing config file " + configFile); diff --git a/utils/configcpp/tdriver.cpp b/utils/configcpp/tdriver.cpp index ab5eeb32a..9698d667e 100644 --- a/utils/configcpp/tdriver.cpp +++ b/utils/configcpp/tdriver.cpp @@ -68,7 +68,7 @@ public: } void test1() { - Config* c1 = Config::makeConfig("./Calpont.xml"); + Config* c1 = Config::makeConfig("./Columnstore.xml"); string value; value = c1->getConfig("Message", "Name"); CPPUNIT_ASSERT(value == "Message"); @@ -97,7 +97,7 @@ public: for (int i = 0; i < 1000; i++) { - c1 = Config::makeConfig("./Calpont.xml"); + c1 = Config::makeConfig("./Columnstore.xml"); value = c1->getConfig("Message", "Name"); assert(value == "Message"); } @@ -105,7 +105,7 @@ public: } void test4() { - Config* c1 = Config::makeConfig("./Calpont.xml"); + Config* c1 = Config::makeConfig("./Columnstore.xml"); string value; value = c1->getConfig("SystemConfig", "SystemVersion"); @@ -113,8 +113,8 @@ public: value = c1->getConfig("SystemConfig", "SystemVersion"); CPPUNIT_ASSERT(value == "2.2.versionversionversion"); - ::unlink("./Calpont.xml.new"); - c1->write("./Calpont.xml.new"); + ::unlink("./Columnstore.xml.new"); + c1->write("./Columnstore.xml.new"); value = c1->getConfig("SystemConfig", "SystemVersion"); CPPUNIT_ASSERT(value == "2.2.versionversionversion"); @@ -127,8 +127,8 @@ public: value = c1->getConfig("SystemConfig1", "SystemVersion1"); CPPUNIT_ASSERT(value == "Vx.x"); - c1->write("./Calpont.xml.new"); - Config* c2 = Config::makeConfig("./Calpont.xml.new"); + c1->write("./Columnstore.xml.new"); + Config* c2 = Config::makeConfig("./Columnstore.xml.new"); value = c2->getConfig("SystemConfig1", "SystemVersion1"); CPPUNIT_ASSERT(value == "Vx.x"); c2->setConfig("SystemConfig", "SystemVersion1", "V1.1"); @@ -139,19 +139,19 @@ public: } void test5() { - Config* c1 = Config::makeConfig("./Calpont.xml"); + Config* c1 = Config::makeConfig("./Columnstore.xml"); c1->write("/cantwritethis"); Config::deleteInstanceMap(); } void test6() { - Config* c1 = Config::makeConfig("./XCalpont.xml"); + Config* c1 = Config::makeConfig("./XColumnstore.xml"); // compiler warning...we won't actually get here c1 = 0; } void test7() { - Config* c1 = Config::makeConfig("./Calpont.xml"); + Config* c1 = Config::makeConfig("./Columnstore.xml"); string s; string n; string v; @@ -160,7 +160,7 @@ public: } void test8() { - Config* c1 = Config::makeConfig("./Calpont.xml"); + Config* c1 = Config::makeConfig("./Columnstore.xml"); string s; string n; string v; @@ -171,8 +171,8 @@ public: void test9() { string value; - Config* c1 = Config::makeConfig("./Calpont.xml"); - Config* c2 = Config::makeConfig("./Calpont.xml.new"); + Config* c1 = Config::makeConfig("./Columnstore.xml"); + Config* c2 = Config::makeConfig("./Columnstore.xml.new"); value = c1->getConfig("Message", "Name"); CPPUNIT_ASSERT(value == "Message"); @@ -185,7 +185,7 @@ public: void test10() { string value; - setenv("CALPONT_CONFIG_FILE", "./Calpont.xml", 1); + setenv("CALPONT_CONFIG_FILE", "./Columnstore.xml", 1); Config* c1 = Config::makeConfig(); value = c1->getConfig("Message", "Name"); @@ -199,15 +199,15 @@ public: struct stat stat_buf; struct utimbuf utime_buf; - CPPUNIT_ASSERT(stat("./Calpont.xml.new", &stat_buf) == 0); + CPPUNIT_ASSERT(stat("./Columnstore.xml.new", &stat_buf) == 0); - Config* c1 = Config::makeConfig("./Calpont.xml.new"); + Config* c1 = Config::makeConfig("./Columnstore.xml.new"); value = c1->getConfig("Message", "Name"); CPPUNIT_ASSERT(value == "Message"); utime_buf.actime = utime_buf.modtime = stat_buf.st_mtime + 1; - CPPUNIT_ASSERT(utime("./Calpont.xml.new", &utime_buf) == 0); + CPPUNIT_ASSERT(utime("./Columnstore.xml.new", &utime_buf) == 0); value = c1->getConfig("Message", "Name"); CPPUNIT_ASSERT(value == "Message"); @@ -317,7 +317,7 @@ public: void test14() { ByteStream bs; - ifstream ifs("./Calpont.xml"); + ifstream ifs("./Columnstore.xml"); ifs >> bs; string id("."); string value; diff --git a/utils/funcexp/utils_utf8.h b/utils/funcexp/utils_utf8.h index 534a0a62b..9f0e3c8d8 100644 --- a/utils/funcexp/utils_utf8.h +++ b/utils/funcexp/utils_utf8.h @@ -56,7 +56,7 @@ const int MAX_UTF8_BYTES_PER_CHAR=4; //Infinidb version of strlocale BUG 5362 //set System Locale "C" by default -//return the system Locale currently set in from Calpont.xml +//return the system Locale currently set in from Columnstore.xml inline std::string idb_setlocale() { diff --git a/utils/idbdatafile/IDBPolicy.h b/utils/idbdatafile/IDBPolicy.h index e78cc8576..81891104c 100644 --- a/utils/idbdatafile/IDBPolicy.h +++ b/utils/idbdatafile/IDBPolicy.h @@ -50,7 +50,7 @@ public: }; /** - * Config the IDBPolicy based on the Calpont.xml + * Config the IDBPolicy based on the Columnstore.xml */ static void configIDBPolicy(); diff --git a/utils/infinidb_hadoop/infinidb_hadoop_bulkload.sh b/utils/infinidb_hadoop/infinidb_hadoop_bulkload.sh index ae8036362..65ba5b85c 100755 --- a/utils/infinidb_hadoop/infinidb_hadoop_bulkload.sh +++ b/utils/infinidb_hadoop/infinidb_hadoop_bulkload.sh @@ -1,6 +1,6 @@ #!/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 CALPONT_CONFIG_FILE=/usr/local/mariadb/columnstore/etc/Columnstore.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 diff --git a/utils/loggingcpp/ErrorMessage.txt b/utils/loggingcpp/ErrorMessage.txt index 1086a3400..2cd0a59f6 100644 --- a/utils/loggingcpp/ErrorMessage.txt +++ b/utils/loggingcpp/ErrorMessage.txt @@ -74,7 +74,7 @@ 2035 ERR_ASSERTION_FAILURE An internal error occurred. Check the error log file & contact support. 2036 ERR_PARTITION_NO_SCHEMA No schema is specified for this partition function. 2037 ERR_INVALID_FUNC_ARGUMENT %1% in function arguments. -2038 ERR_O_DIRECT Failed to open file. The DirectIO setting in Calpont.xml may not be compatible with the file system. +2038 ERR_O_DIRECT Failed to open file. The DirectIO setting in Columnstore.xml may not be compatible with the file system. 2039 ERR_ENOENT Data file does not exist, please contact your system administrator for more information. 2040 WARN_NO_PARTITION_FOUND No partition found for the given value range. 2041 SYSTABLE_PARTITION Systables' partition cannot be modified. @@ -159,7 +159,7 @@ 7001 ERR_NON_IDB_TABLE Non Calpont table(s) on the FROM clause. # Cross Engine Errors -8001 ERR_CROSS_ENGINE_CONFIG CrossEngineSupport section in Calpont.xml is not properly configured. +8001 ERR_CROSS_ENGINE_CONFIG CrossEngineSupport section in Columnstore.xml is not properly configured. 8002 ERR_CROSS_ENGINE_CONNECT Error: %1%. # Window Function Errors diff --git a/utils/loggingcpp/tdriver.cpp b/utils/loggingcpp/tdriver.cpp index 3a5d02c9f..a1552c2e9 100644 --- a/utils/loggingcpp/tdriver.cpp +++ b/utils/loggingcpp/tdriver.cpp @@ -45,7 +45,7 @@ private: public: void setUp() { - setenv("CALPONT_CONFIG_FILE", "./Calpont.xml", 1); + setenv("CALPONT_CONFIG_FILE", "./Columnstore.xml", 1); } void tearDown() { diff --git a/utils/messageqcpp/cli.cpp b/utils/messageqcpp/cli.cpp index c2ed5199b..c5c2af12a 100644 --- a/utils/messageqcpp/cli.cpp +++ b/utils/messageqcpp/cli.cpp @@ -10,7 +10,7 @@ using namespace config; int main(int argc, char** argv) { - Config* cf = Config::makeConfig("./Calpont.xml"); + Config* cf = Config::makeConfig("./Columnstore.xml"); MessageQueueClient mqc("server1", cf); ByteStream obs; diff --git a/utils/messageqcpp/srv.cpp b/utils/messageqcpp/srv.cpp index 183bb624a..dc5297855 100644 --- a/utils/messageqcpp/srv.cpp +++ b/utils/messageqcpp/srv.cpp @@ -9,7 +9,7 @@ using namespace config; int main(int argc, char** argv) { - Config* cf = Config::makeConfig("./Calpont.xml"); + Config* cf = Config::makeConfig("./Columnstore.xml"); MessageQueueServer mqs("server1", cf); cout << "server ready..." << endl; diff --git a/utils/messageqcpp/tdriver.cpp b/utils/messageqcpp/tdriver.cpp index 376775665..e5c330018 100644 --- a/utils/messageqcpp/tdriver.cpp +++ b/utils/messageqcpp/tdriver.cpp @@ -915,7 +915,7 @@ static void startServer() do { try { retry = false; - inMq = new MessageQueueServer(normServ, "./Calpont.xml"); + inMq = new MessageQueueServer(normServ, "./Columnstore.xml"); } catch (exception& ex) { //cout << endl << "MessageQueueServer ctor threw!: " << ex.what() << endl; @@ -975,7 +975,7 @@ static void startServer() static void startServer_16() { - MessageQueueServer server("server3", "./Calpont.xml"); + MessageQueueServer server("server3", "./Columnstore.xml"); ByteStream msg; struct timespec ts = {1, 0}; // 1 second // const ByteStream::byte *bMsg; @@ -1012,7 +1012,7 @@ static void startServer_16() static void startServer_17() { - MessageQueueServer server("server3", "./Calpont.xml"); + MessageQueueServer server("server3", "./Columnstore.xml"); server.syncProto(false); ByteStream msg; struct timespec ts = {1, 0}; // 1 second @@ -1076,7 +1076,7 @@ volatile bool* fKeepRunning; static void startServer_18() { boost::thread_group tg; - MessageQueueServer server("server3", "./Calpont.xml"); + MessageQueueServer server("server3", "./Columnstore.xml"); struct timespec ts = {1, 0}; IOSocket sock; isRunning = true; @@ -1098,7 +1098,7 @@ static void startBrokenServer() do { try { retry = false; - inMq = new MessageQueueServer(brokeServ, "./Calpont.xml"); + inMq = new MessageQueueServer(brokeServ, "./Columnstore.xml"); } catch (...) { //cout << endl << "MessageQueueServer ctor threw!" << endl; @@ -1136,7 +1136,7 @@ static void startWriteServer() do { try { retry = false; - inMq = new MessageQueueServer(writeServ, "./Calpont.xml"); + inMq = new MessageQueueServer(writeServ, "./Columnstore.xml"); } catch (...) { //cout << endl << "MessageQueueServer ctor threw!" << endl; @@ -1196,7 +1196,7 @@ public: bs.reset(); bs1.reset(); srvThread = 0; - //setenv("CALPONT_CONFIG_FILE", "./Calpont.xml", 1); + //setenv("CALPONT_CONFIG_FILE", "./Columnstore.xml", 1); } void tearDown() { @@ -1219,7 +1219,7 @@ void mq_1() ::usleep(2500000); } - Config* cf = Config::makeConfig("./Calpont.xml"); + Config* cf = Config::makeConfig("./Columnstore.xml"); MessageQueueClient outMq(normServ, cf); string msg = "This is a test"; ByteStream outBs; @@ -1324,7 +1324,7 @@ void mq_2() struct timespec ts = { 0, TS_MS(20) }; - MessageQueueClient outMq(brokeServ, "./Calpont.xml"); + MessageQueueClient outMq(brokeServ, "./Columnstore.xml"); bs1 = outMq.read(&ts); keepRunning = false; @@ -1351,7 +1351,7 @@ void mq_3() void mq_4() { - boost::scoped_ptr outMq(new MessageQueueClient("server4", "./Calpont.xml")); + boost::scoped_ptr outMq(new MessageQueueClient("server4", "./Columnstore.xml")); // Should throw runtime_exception for connect failed bs1 = outMq->read(); @@ -1361,7 +1361,7 @@ void mq_4() void mq_5() { - boost::scoped_ptr outMq(new MessageQueueClient("server4", "./Calpont.xml")); + boost::scoped_ptr outMq(new MessageQueueClient("server4", "./Columnstore.xml")); string msg = "This is a test"; bs1.load(reinterpret_cast(msg.c_str()), msg.length()); // Should throw runtime_exception for connect failed @@ -1373,7 +1373,7 @@ void mq_5() void mq_6() { - Config* cf = Config::makeConfig("./Calpont.xml"); + Config* cf = Config::makeConfig("./Columnstore.xml"); boost::scoped_ptr outMq(new MessageQueueServer("server4", cf)); // Should throw runtime_exception for addr in use MessageQueueServer* outMq1 = new MessageQueueServer("server4", cf); @@ -1408,7 +1408,7 @@ void mq_8() ::usleep(2500000); } - MessageQueueClient outMq(writeServ, "./Calpont.xml"); + MessageQueueClient outMq(writeServ, "./Columnstore.xml"); bs1 = outMq.read(); CPPUNIT_ASSERT(memcmp(bs1.buf(), "This is a test", bs1.length()) == 0); @@ -1428,7 +1428,7 @@ void mq_8() void mq_9() { InetStreamSocket* iss; - boost::scoped_ptr mq1(new MessageQueueServer("server5", "./Calpont.xml")); + boost::scoped_ptr mq1(new MessageQueueServer("server5", "./Columnstore.xml")); struct timespec ts = { 0, TS_MS(200) }; // this should block in accept() for ts IOSocket sock = mq1->accept(&ts); @@ -1449,7 +1449,7 @@ void mq_9() cerr << "Runtime error (OK)..." << ex.what() << endl; } - boost::scoped_ptr mq2(new MessageQueueClient("server5", "./Calpont.xml")); + boost::scoped_ptr mq2(new MessageQueueClient("server5", "./Columnstore.xml")); bs.reset(); bs << "This is a test"; //close(mq2->fClientSock.fSocketParms.fSd); @@ -1523,7 +1523,7 @@ void mq_13a() void mq_14() { InetStreamSocket* iss; - boost::scoped_ptr mq1(new MessageQueueServer("server6", "./Calpont.xml")); + boost::scoped_ptr mq1(new MessageQueueServer("server6", "./Columnstore.xml")); // Set a bogus fd int fd; fd = open("/dev/null", O_RDONLY); @@ -1552,7 +1552,7 @@ void mq_16() const char msg1[] = "Message 1"; const char msg2[] = "message 2"; string sTmp; - MessageQueueClient client("server3", "./Calpont.xml"); + MessageQueueClient client("server3", "./Columnstore.xml"); ByteStream bs, bs2; char buf[1000]; int len, err, socketfd; @@ -1604,7 +1604,7 @@ void mq_17() const char msg1[] = "Message 1"; const char msg2[] = "message 2"; string sTmp; - MessageQueueClient client("server3", "./Calpont.xml"); + MessageQueueClient client("server3", "./Columnstore.xml"); client.syncProto(false); ByteStream bs, bs2; char buf[1000]; @@ -1654,8 +1654,8 @@ void mq_17() void mq_18() { - MessageQueueClient client1("server3", "./Calpont.xml"); - MessageQueueClient client2("server3", "./Calpont.xml"); + MessageQueueClient client1("server3", "./Columnstore.xml"); + MessageQueueClient client2("server3", "./Columnstore.xml"); isRunning = false; keepRunning = true; diff --git a/utils/querystats/querystats.cpp b/utils/querystats/querystats.cpp index 858e4621b..ef593b3fc 100644 --- a/utils/querystats/querystats.cpp +++ b/utils/querystats/querystats.cpp @@ -193,7 +193,7 @@ void QueryStats::unserialize(ByteStream& b) void QueryStats::insert() { ResourceManager rm; - // check if query stats is enabled in Calpont.xml + // check if query stats is enabled in Columnstore.xml if (!rm.queryStatsEnabled()) return; @@ -277,7 +277,7 @@ uint32_t QueryStats::userPriority(string _host, const string _user) fPriorityLevel = DEFAULT_USER_PRIORITY_LEVEL; fPriority = DEFAULT_USER_PRIORITY; - // check if query stats is enabled in Calpont.xml + // check if query stats is enabled in Columnstore.xml if (!rm.userPriorityEnabled()) { fPriority = DEFAULT_USER_PRIORITY; diff --git a/utils/scenarios/common/sh/collExecResult.sh b/utils/scenarios/common/sh/collExecResult.sh index 3c61f5aaf..4506a29aa 100755 --- a/utils/scenarios/common/sh/collExecResult.sh +++ b/utils/scenarios/common/sh/collExecResult.sh @@ -24,7 +24,7 @@ function getTestInfo { fileName=`basename $scriptName` fileExt=${scriptName##*.} testRunDesc="" - stackName=`cat 1/Calpont.xml |grep ""|sed "s//g"|awk -F">" '{print $3}'` + stackName=`cat 1/Columnstore.xml |grep ""|sed "s//g"|awk -F">" '{print $3}'` stackConfig="" # IOType=$grpTestType diff --git a/utils/scenarios/common/sh/testExecEngine.sh b/utils/scenarios/common/sh/testExecEngine.sh index e21bd1bec..f618b3998 100755 --- a/utils/scenarios/common/sh/testExecEngine.sh +++ b/utils/scenarios/common/sh/testExecEngine.sh @@ -59,7 +59,7 @@ 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/. + cp /usr/local/mariadb/columnstore/etc/Columnstore.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 diff --git a/utils/scenarios/perf/source/pf/common/exeStreamTest.sh b/utils/scenarios/perf/source/pf/common/exeStreamTest.sh index 4471a5da2..993ad3a4a 100755 --- a/utils/scenarios/perf/source/pf/common/exeStreamTest.sh +++ b/utils/scenarios/perf/source/pf/common/exeStreamTest.sh @@ -55,7 +55,7 @@ do fi mkdir $k cd $k - cp /usr/local/mariadb/columnstore/etc/Calpont.xml . + cp /usr/local/mariadb/columnstore/etc/Columnstore.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 diff --git a/utils/scenarios/perf/source/pf/common/setDBRoots.sh b/utils/scenarios/perf/source/pf/common/setDBRoots.sh index b7ea3de61..b30a21001 100755 --- a/utils/scenarios/perf/source/pf/common/setDBRoots.sh +++ b/utils/scenarios/perf/source/pf/common/setDBRoots.sh @@ -4,7 +4,7 @@ #* Script Name: setDBRoots.sh #* Date Created: 2008.11.21 #* Author: Stephen Cargile -#* Purpose: Set the proper device names in Calpont.xml and then unmount & mount +#* Purpose: Set the proper device names in Columnstore.xml and then unmount & mount #* the devices to the appropriate mount points #* #* Parameters: setNum - 1 or 2: dbroot set number diff --git a/utils/scenarios/perf/source/pf/common/step2.sh b/utils/scenarios/perf/source/pf/common/step2.sh index a32a995f3..b489005eb 100755 --- a/utils/scenarios/perf/source/pf/common/step2.sh +++ b/utils/scenarios/perf/source/pf/common/step2.sh @@ -51,7 +51,7 @@ do fi mkdir $k cd $k - cp /usr/local/mariadb/columnstore/etc/Calpont.xml . + cp /usr/local/mariadb/columnstore/etc/Columnstore.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 diff --git a/utils/winport/fixup.cpp b/utils/winport/fixup.cpp index b8848005c..4101e9fdd 100644 --- a/utils/winport/fixup.cpp +++ b/utils/winport/fixup.cpp @@ -388,7 +388,7 @@ int fixupConfig(const string& installDir, const string& mysqlPort) cFilePath = installDir; cFilePath /= "etc"; - cFilePath /= "Calpont.xml"; + cFilePath /= "Columnstore.xml"; tmpPath = cFilePath; tmpPath.replace_extension(".tmp"); fs::remove(tmpPath); diff --git a/utils/winport/idb_64_enterprise-Debug.nsi b/utils/winport/idb_64_enterprise-Debug.nsi index 60df65a83..30c6efc72 100644 --- a/utils/winport/idb_64_enterprise-Debug.nsi +++ b/utils/winport/idb_64_enterprise-Debug.nsi @@ -138,11 +138,11 @@ File win_setup_mysql_part3.1.sql File win_setup_mysql_part4.sql File win_setup_mysql_part5.sql File CalpontVersion.txt -IfFileExists $INSTDIR\etc\Calpont.xml 0 CfgNotExists -File /oname=$INSTDIR\etc\Calpont_dist.xml Calpont.xml +IfFileExists $INSTDIR\etc\Columnstore.xml 0 CfgNotExists +File /oname=$INSTDIR\etc\Calpont_dist.xml Columnstore.xml Goto CfgExists CfgNotExists: -File Calpont.xml +File Columnstore.xml CfgExists: File ..\..\utils\loggingcpp\ErrorMessage.txt File ..\..\utils\loggingcpp\MessageFile.txt @@ -184,7 +184,7 @@ File ..\..\dbcon\mysql\calshowprocesslist.sql WriteRegStr HKLM Software\Calpont\InfiniDB "" $INSTDIR WriteRegStr HKLM Software\Calpont\InfiniDB "CalpontHome" $INSTDIR\etc -WriteRegStr HKLM Software\Calpont\InfiniDB "ConfigFile" $INSTDIR\etc\Calpont.xml +WriteRegStr HKLM Software\Calpont\InfiniDB "ConfigFile" $INSTDIR\etc\Columnstore.xml StrCmp $ApndSysPathChoice 'yes' 0 DontAppendSysPath Push "PATH" @@ -335,7 +335,7 @@ Delete $INSTDIR\etc\win_setup_mysql_part3.1.sql Delete $INSTDIR\etc\win_setup_mysql_part4.sql Delete $INSTDIR\etc\win_setup_mysql_part5.sql Delete $INSTDIR\etc\Calpont_save.xml -Rename $INSTDIR\etc\Calpont.xml $INSTDIR\etc\Calpont_save.xml +Rename $INSTDIR\etc\Columnstore.xml $INSTDIR\etc\Calpont_save.xml RMDir /r $INSTDIR\share\charsets RMDir /r $INSTDIR\share\czech diff --git a/utils/winport/idb_64_enterprise.nsi b/utils/winport/idb_64_enterprise.nsi index 2de90ba85..c11d0a27f 100644 --- a/utils/winport/idb_64_enterprise.nsi +++ b/utils/winport/idb_64_enterprise.nsi @@ -138,11 +138,11 @@ File win_setup_mysql_part3.1.sql File win_setup_mysql_part4.sql File win_setup_mysql_part5.sql File CalpontVersion.txt -IfFileExists $INSTDIR\etc\Calpont.xml 0 CfgNotExists -File /oname=$INSTDIR\etc\Calpont_dist.xml Calpont.xml +IfFileExists $INSTDIR\etc\Columnstore.xml 0 CfgNotExists +File /oname=$INSTDIR\etc\Calpont_dist.xml Columnstore.xml Goto CfgExists CfgNotExists: -File Calpont.xml +File Columnstore.xml CfgExists: File ..\..\utils\loggingcpp\ErrorMessage.txt File ..\..\utils\loggingcpp\MessageFile.txt @@ -184,7 +184,7 @@ File ..\..\dbcon\mysql\calshowprocesslist.sql WriteRegStr HKLM Software\Calpont\InfiniDB "" $INSTDIR WriteRegStr HKLM Software\Calpont\InfiniDB "CalpontHome" $INSTDIR\etc -WriteRegStr HKLM Software\Calpont\InfiniDB "ConfigFile" $INSTDIR\etc\Calpont.xml +WriteRegStr HKLM Software\Calpont\InfiniDB "ConfigFile" $INSTDIR\etc\Columnstore.xml StrCmp $ApndSysPathChoice 'yes' 0 DontAppendSysPath Push "PATH" @@ -335,7 +335,7 @@ Delete $INSTDIR\etc\win_setup_mysql_part3.1.sql Delete $INSTDIR\etc\win_setup_mysql_part4.sql Delete $INSTDIR\etc\win_setup_mysql_part5.sql Delete $INSTDIR\etc\Calpont_save.xml -Rename $INSTDIR\etc\Calpont.xml $INSTDIR\etc\Calpont_save.xml +Rename $INSTDIR\etc\Columnstore.xml $INSTDIR\etc\Calpont_save.xml RMDir /r $INSTDIR\share\charsets RMDir /r $INSTDIR\share\czech diff --git a/utils/winport/idb_64_standard.nsi b/utils/winport/idb_64_standard.nsi index 54f92bedc..f8f849c43 100644 --- a/utils/winport/idb_64_standard.nsi +++ b/utils/winport/idb_64_standard.nsi @@ -136,11 +136,11 @@ File win_setup_mysql_part3.1.sql File win_setup_mysql_part4.sql File win_setup_mysql_part5.sql File CalpontVersion.txt -IfFileExists $INSTDIR\etc\Calpont.xml 0 CfgNotExists -File /oname=$INSTDIR\etc\Calpont_dist.xml Calpont.xml +IfFileExists $INSTDIR\etc\Columnstore.xml 0 CfgNotExists +File /oname=$INSTDIR\etc\Calpont_dist.xml Columnstore.xml Goto CfgExists CfgNotExists: -File Calpont.xml +File Columnstore.xml CfgExists: File ..\..\utils\loggingcpp\ErrorMessage.txt File ..\..\utils\loggingcpp\MessageFile.txt @@ -182,7 +182,7 @@ File ..\..\dbcon\mysql\calshowprocesslist.sql WriteRegStr HKLM Software\Calpont\InfiniDB "" $INSTDIR WriteRegStr HKLM Software\Calpont\InfiniDB "CalpontHome" $INSTDIR\etc -WriteRegStr HKLM Software\Calpont\InfiniDB "ConfigFile" $INSTDIR\etc\Calpont.xml +WriteRegStr HKLM Software\Calpont\InfiniDB "ConfigFile" $INSTDIR\etc\Columnstore.xml StrCmp $ApndSysPathChoice 'yes' 0 DontAppendSysPath Push "PATH" @@ -326,7 +326,7 @@ Delete $INSTDIR\etc\win_setup_mysql_part3.1.sql Delete $INSTDIR\etc\win_setup_mysql_part4.sql Delete $INSTDIR\etc\win_setup_mysql_part5.sql Delete $INSTDIR\etc\Calpont_save.xml -Rename $INSTDIR\etc\Calpont.xml $INSTDIR\etc\Calpont_save.xml +Rename $INSTDIR\etc\Columnstore.xml $INSTDIR\etc\Calpont_save.xml RMDir /r $INSTDIR\share\charsets RMDir /r $INSTDIR\share\czech diff --git a/versioning/BRM/Calpont.xml b/versioning/BRM/Calpont.xml index 1bee8d812..f12dbf58f 100644 --- a/versioning/BRM/Calpont.xml +++ b/versioning/BRM/Calpont.xml @@ -1,5 +1,5 @@ - + /var/tmp diff --git a/versioning/BRM/brmtypes.h b/versioning/BRM/brmtypes.h index 0cc77dfe1..7fa32de64 100644 --- a/versioning/BRM/brmtypes.h +++ b/versioning/BRM/brmtypes.h @@ -187,7 +187,7 @@ struct ExtentInfo { execplan::CalpontSystemCatalog::OID oid; uint32_t partitionNum; // starts at 0 uint16_t segmentNum; // starts at 0 - uint16_t dbRoot; // starts at 1 to match Calpont.xml + uint16_t dbRoot; // starts at 1 to match Columnstore.xml HWM_t hwm; bool newFile; }; @@ -196,7 +196,7 @@ struct FileInfo { execplan::CalpontSystemCatalog::OID oid; uint32_t partitionNum; // starts at 0 uint16_t segmentNum; // starts at 0 - uint16_t dbRoot; // starts at 1 to match Calpont.xml + uint16_t dbRoot; // starts at 1 to match Columnstore.xml uint16_t compType; // compression type }; diff --git a/versioning/BRM/dbrm.h b/versioning/BRM/dbrm.h index 1a03e1a4d..2ae18e636 100644 --- a/versioning/BRM/dbrm.h +++ b/versioning/BRM/dbrm.h @@ -742,7 +742,7 @@ public: */ EXPORT int saveState(std::string filename) throw(); - /** @brief Persistence API. Saves all BRM structures using the filenames from Calpont.xml. + /** @brief Persistence API. Saves all BRM structures using the filenames from Columnstore.xml. * * Saves all local BRM structures to files. * diff --git a/versioning/BRM/extentmap.cpp b/versioning/BRM/extentmap.cpp index b41e7dc09..3663e940c 100644 --- a/versioning/BRM/extentmap.cpp +++ b/versioning/BRM/extentmap.cpp @@ -5109,7 +5109,7 @@ void ExtentMap::checkReloadConfig() { config::Config* cf = config::Config::makeConfig(); - // Immediately return if Calpont.xml timestamp has not changed + // Immediately return if Columnstore.xml timestamp has not changed if (cf->getCurrentMTime() == fCacheTime) return; @@ -5171,7 +5171,7 @@ void ExtentMap::checkReloadConfig() if (filesPerColumnPartition == 0) filesPerColumnPartition = 4; - // Get latest Calpont.xml timestamp after first access forced a reload + // Get latest Columnstore.xml timestamp after first access forced a reload fCacheTime = cf ->getLastMTime(); //-------------------------------------------------------------------------- @@ -5248,7 +5248,7 @@ unsigned ExtentMap::getDbRootCount() //------------------------------------------------------------------------------ // Get list of DBRoots that map to the specified PM. DBRoot list is cached -// internally in fPmDbRootMap after getting from Calpont.xml via OAM. +// internally in fPmDbRootMap after getting from Columnstore.xml via OAM. //------------------------------------------------------------------------------ void ExtentMap::getPmDbRoots( int pm, vector& dbRootList ) { diff --git a/versioning/BRM/extentmap.h b/versioning/BRM/extentmap.h index c8d708c88..b067ed024 100644 --- a/versioning/BRM/extentmap.h +++ b/versioning/BRM/extentmap.h @@ -120,7 +120,7 @@ struct EMEntry { HWM_t HWM; uint32_t partitionNum; // starts at 0 uint16_t segmentNum; // starts at 0 - uint16_t dbRoot; // starts at 1 to match Calpont.xml + uint16_t dbRoot; // starts at 1 to match Columnstore.xml uint16_t colWid; int16_t status; //extent avail for query or not, or out of service EMPartition_t partition; diff --git a/versioning/BRM/sessionmanagerserver.h b/versioning/BRM/sessionmanagerserver.h index 897a18902..86b463c5e 100644 --- a/versioning/BRM/sessionmanagerserver.h +++ b/versioning/BRM/sessionmanagerserver.h @@ -65,7 +65,7 @@ namespace BRM { * Note: Added a macro 'DESTROYSHMSEG' which enables/disables the code to load/save * and deallocate the shared memory segment. * - * This class uses 3 parameters from the Calpont.xml file: + * This class uses 3 parameters from the Columnstore.xml file: * SessionManager/MaxConcurrentTransactions: defines how many active transactions the * system should support. When a new request comes in and there are already * MaxConcurrentTransactions active, the new request blocks by default. The diff --git a/writeengine/bulk/bulkload.py b/writeengine/bulk/bulkload.py index ed62368d3..e4d8c0366 100644 --- a/writeengine/bulk/bulkload.py +++ b/writeengine/bulk/bulkload.py @@ -55,8 +55,8 @@ def find_paths(): config_file = os.environ['CALPONT_CONFIG_FILE'] 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' + logger.info("Environment variable CALPONT_CONFIG_FILE not set, looking for system Columnstore.xml") + config_file = '/usr/local/mariadb/columnstore/etc/Columnstore.xml' os.lstat(config_file) except: logger.error('No config file available') diff --git a/writeengine/bulk/bulkloadp.sh b/writeengine/bulk/bulkloadp.sh index 2148859b6..80015e12b 100755 --- a/writeengine/bulk/bulkloadp.sh +++ b/writeengine/bulk/bulkloadp.sh @@ -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/Columnstore.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/Columnstore.xml" echo "CALPONT_CONFIG_FILE=" $CALPONT_CONFIG_FILE fi diff --git a/writeengine/bulk/checkidx.py b/writeengine/bulk/checkidx.py index 0afc82a9e..0fe0a4ed9 100755 --- a/writeengine/bulk/checkidx.py +++ b/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/Columnstore.xml' os.lstat(config_file) except: sys.exit('No config file available') diff --git a/writeengine/bulk/cpimport.cpp b/writeengine/bulk/cpimport.cpp index 7413411e1..c263e07f0 100644 --- a/writeengine/bulk/cpimport.cpp +++ b/writeengine/bulk/cpimport.cpp @@ -1041,7 +1041,7 @@ int main(int argc, char **argv) //-------------------------------------------------------------------------- task = TASK_INIT_CONFIG_CACHE; - // Initialize cache used to store configuration parms from Calpont.xml + // Initialize cache used to store configuration parms from Columnstore.xml Config::initConfigCache(); // Setup signal handlers "again" because HDFS plugin seems to be diff --git a/writeengine/bulk/qa-bulkload.py b/writeengine/bulk/qa-bulkload.py index a7a85dde3..599183436 100644 --- a/writeengine/bulk/qa-bulkload.py +++ b/writeengine/bulk/qa-bulkload.py @@ -52,8 +52,8 @@ def find_paths(): config_file = os.environ['CALPONT_CONFIG_FILE'] 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' + logger.info("Environment variable CALPONT_CONFIG_FILE not set, looking for system Columnstore.xml") + config_file = '/usr/local/mariadb/columnstore/etc/Columnstore.xml' os.lstat(config_file) except: logger.error('No config file available') diff --git a/writeengine/server/we_server.cpp b/writeengine/server/we_server.cpp index 1a5c6c16c..b5365fe0f 100644 --- a/writeengine/server/we_server.cpp +++ b/writeengine/server/we_server.cpp @@ -121,7 +121,7 @@ int main(int argc, char** argv) sigaction(SIGPIPE, &sa, 0); #endif - // Init WriteEngine Wrapper (including Config Calpont.xml cache) + // Init WriteEngine Wrapper (including Config Columnstore.xml cache) WriteEngine::WriteEngineWrapper::init( WriteEngine::SUBSYSTEM_ID_WE_SRV ); #ifdef _MSC_VER diff --git a/writeengine/shared/we_config.cpp b/writeengine/shared/we_config.cpp index 10a3271f7..7f13c9bd3 100644 --- a/writeengine/shared/we_config.cpp +++ b/writeengine/shared/we_config.cpp @@ -94,7 +94,7 @@ void Config::initConfigCache() /******************************************************************************* * DESCRIPTION: - * Reload local cache using contents of Calpont.xml file. + * Reload local cache using contents of Columnstore.xml file. * PARAMETERS: * none ******************************************************************************/ @@ -107,7 +107,7 @@ void Config::checkReload( ) config::Config* cf = config::Config::makeConfig(); - // Immediately return if Calpont.xml timestamp has not changed + // Immediately return if Columnstore.xml timestamp has not changed if (cf->getCurrentMTime() == fCacheTime) return; @@ -126,7 +126,7 @@ void Config::checkReload( ) m_bulkRoot += "/bulk"; } - // Get latest Calpont.xml timestamp after first access forced a reload + // Get latest Columnstore.xml timestamp after first access forced a reload fCacheTime = cf ->getLastMTime(); //-------------------------------------------------------------------------- diff --git a/writeengine/shared/we_convertor.cpp b/writeengine/shared/we_convertor.cpp index 7d6b1b41c..f4ad696d2 100644 --- a/writeengine/shared/we_convertor.cpp +++ b/writeengine/shared/we_convertor.cpp @@ -724,7 +724,7 @@ int Convertor::getCorrectRowWidth(CalpontSystemCatalog::ColDataType dataType, in * of the file is ////, or * //////. The * entry must be pre-pended by the calling application after calling - * this function. The value for is stored in the Calpont.xml + * this function. The value for is stored in the Columnstore.xml * configuration file. * * PARAMETERS: diff --git a/writeengine/splitter/we_cmdargs.cpp b/writeengine/splitter/we_cmdargs.cpp index 52c9c0b2f..2821a3ac2 100644 --- a/writeengine/splitter/we_cmdargs.cpp +++ b/writeengine/splitter/we_cmdargs.cpp @@ -1118,8 +1118,8 @@ std::string WECmdArgs::getBrmRptFileName() } else { - //cout << "ERROR: Could not find TempFileDir in Calpont.xml" << endl; - throw(runtime_error("Could not find TempFileDir in Calpont.xml")); + //cout << "ERROR: Could not find TempFileDir in Columnstore.xml" << endl; + throw(runtime_error("Could not find TempFileDir in Columnstore.xml")); } setBrmRptFileName(brmRptFileName); @@ -1253,7 +1253,7 @@ void WECmdArgs::checkJobIdCase() if(!bulkRootPath.empty()) fJobPath = bulkRootPath + "/job"; else - throw runtime_error("Config Error: BulkRoot not found in Calpont.xml"); + throw runtime_error("Config Error: BulkRoot not found in Columnstore.xml"); } char aBuff[256]; if(!fJobPath.empty())