diff --git a/.gitignore b/.gitignore index 5880e1abf..5c193f682 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,11 @@ ltmain.sh missing stamp-h1 export/ +buildFlags +dbcon/ddlpackage/ddl-gram.cpp +dbcon/ddlpackage/ddl-gram.h +dbcon/dmlpackage/dml-gram.cpp +dbcon/dmlpackage/dml-gram.h +versioning/BRM/autoinctest +versioning/BRM/copylocktest +versioning/BRM/tablelocktest diff --git a/ChangeLog b/ChangeLog index 5210b726a..2fd30d5a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -298,7 +298,7 @@ Bug # Short Description 5752 ERROR 138 (HY000) at line 2: Sub-query failed: error code 2003 error for query that exceeded TotalUmMemory 5753 When PrimProc restarts, DML statement didn't reset the connections to PrimProc in connector 5757 addModule for UM failed on Amazon system - remote_command error -5759 Must use -p option for hadoop fs -mkdir when creating /usr/local/MariaDB/Columnstore +5759 Must use -p option for hadoop fs -mkdir when creating /usr/local/mariadb/columnstore 5764 select count(*) from a complex view is returning an incorrect answer. 5765 truncate statement does not show schema in the debug.log 5767 'create table' creates table in front end when spaces are in the table name. diff --git a/INSTALL b/INSTALL index 613949bc4..8c755d8e0 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ Installation Instructions Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. -Copyright (C) 2014 InfiniDB, Inc. +Copyright (C) 2016 MariaDB, Corporation This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -43,10 +43,10 @@ the entire Calpont directory tree there. After untaring the sofware or installing the RPM's, setup the software to run (this script needs to run with root privileges). Check the Installation Guide for addition details on using postConfigure: -/usr/local/MariaDB/Columnstore/bin/postConfigure +/usr/local/mariadb/columnstore/bin/postConfigure Setup some aliases: -. /usr/local/MariaDB/Columnstore/bin/columnsoreAlias +. /usr/local/mariadb/columnstore/bin/columnsoreAlias Connect to MySQL: idbmysql @@ -70,7 +70,7 @@ To use bulk load: 200|2002| 2. Save/place this file in a directory. 3. From that same directory, import the rows: - /usr/local/MariaDB/Columnstore/bin/cpimport calpont caltest caltest.tbl + /usr/local/mariadb/columnstore/bin/cpimport calpont caltest caltest.tbl And check the import: calpontmysql calpont diff --git a/README b/README index e537d7db0..0776daa62 100644 --- a/README +++ b/README @@ -3,8 +3,8 @@ To build the software from source, consult the file INSTALL. Brief Install Instructions: 1. Install the 3 MariaDB Columnstore RPMs. -2. Install and start the software, run: /usr/local/MariaDB/Columnstore/bin/postConfigure -3. Setup some aliases: . /usr/local/MariaDB/Columnstore/bin/MariaDB ColumnstoreAlias +2. Install and start the software, run: /usr/local/mariadb/columnstore/bin/postConfigure +3. Setup some aliases: . /usr/local/mariadb/columnstore/bin/MariaDB ColumnstoreAlias 4. Connect to MySQL: idbmysql 5. Try the test in step 12 below @@ -21,7 +21,7 @@ Detailed Installation Instructions: tar xvf MariaDB Columnstore-2.2.0-2.x86_64.rpm.tar.gz 4. Install the 3 RPMs in this order, the MariaDB Columnstore software will be installed in - /usr/local/MariaDB/Columnstore. + /usr/local/mariadb/columnstore. rpm -ivh infinidb-libs-2.2.0-2.x86_64.rpm rpm -ivh infinidb-platform-2.2.0-2.x86_64.rpm @@ -31,19 +31,19 @@ Detailed Installation Instructions: 5a.To configure and run on a single server system utilizing local disk storage, run install script: - /usr/local/MariaDB/Columnstore/bin/postConfigure + /usr/local/mariadb/columnstore/bin/postConfigure 5b.To configure and run on a multi-server system and/or to utilize a SAN storage system, follow the instructions in the MariaDB Columnstore Installation Guide. - /usr/local/MariaDB/Columnstore/bin/postConfigure + /usr/local/mariadb/columnstore/bin/postConfigure 6. Ports utilized by the MariaDB Columnstore Software The MariaDB Columnstore MySQL daemon utilizes port 3306. To use a different port, update the 2 locations in the following file: - /usr/local/MariaDB/Columnstore/mysql/my.cnf + /usr/local/mariadb/columnstore/mysql/my.cnf port = 3306 port = 3306 @@ -53,7 +53,7 @@ Detailed Installation Instructions: 8600 - 8622, 8700, and 8800 7. Setup some aliases: -. /usr/local/MariaDB/Columnstore/bin/MariaDB ColumnstoreAlias +. /usr/local/mariadb/columnstore/bin/MariaDB ColumnstoreAlias 8. To manually start and stop the MariaDB Columnstore Software as the root user run: @@ -127,7 +127,7 @@ Detailed Installation Instructions: mysql> -12. Run the following upgrade script to create calponsys schema and upgrade the syscolumn table: /usr/local/MariaDB/Columnstore/bin/upgrade-infinidb.sh +12. Run the following upgrade script to create calponsys schema and upgrade the syscolumn table: /usr/local/mariadb/columnstore/bin/upgrade-infinidb.sh 13. As an example to get you started, try this: diff --git a/build/build_rpms b/build/build_rpms index 34511dc0e..d244d3f1d 100755 --- a/build/build_rpms +++ b/build/build_rpms @@ -6,10 +6,13 @@ verbose=0 mysqldir=$HOME/mariadb-columnstore-server/export/mysql +# set default as community +community=true + usage() { cat <&2 fi @@ -49,20 +54,20 @@ buildroot=$HOME/rpm/BUILD/mariadb-columnstore-$version.$release rm -rf $buildroot mkdir -p $buildroot -mkdir -p $buildroot/MariaDB +mkdir -p $buildroot/mariadb/columnstore echo -n "Writing binary files to $buildroot..." tar -cf - --exclude 'export/include' --exclude 'export/*.tar' export | tar -C $buildroot -xf - -mv $buildroot/export $buildroot/MariaDB/Columnstore +mv $buildroot/export/* $buildroot/mariadb/columnstore/. #get mysql server files pushd $mysqldir > /dev/null -mkdir -p $buildroot/MariaDB/Columnstore/mysql -cpio -pdmu --quiet $buildroot/MariaDB/Columnstore/mysql < files.lst +mkdir -p $buildroot/mariadb/columnstore/mysql +cpio -pdmu --quiet $buildroot/mariadb/columnstore/mysql < files.lst popd >/dev/null #clean up some files from buildroot -rm -f $buildroot/MariaDB/Columnstore/etc/Doxyfile -for file in $buildroot/MariaDB/Columnstore/lib/*; do +rm -f $buildroot/mariadb/columnstore/etc/Doxyfile +for file in $buildroot/mariadb/columnstore/lib/*; do if [ -h $file ]; then rm -f $file fi @@ -70,16 +75,16 @@ done #temporarily clean up these BRM thingies for file in dbrm script-fcns; do - rm -f $buildroot/MariaDB/Columnstore/bin/$file + rm -f $buildroot/mariadb/columnstore/bin/$file done #clean up these bulkload scripts for file in bulkload.sh cleanup.sh dbbuilder.sh dbload.sh cpimport.sh bulkloadp.sh; do - rm -f $buildroot/MariaDB/Columnstore/bin/$file + rm -f $buildroot/mariadb/columnstore/bin/$file done -rm -f $buildroot/MariaDB/Columnstore/lib/libidbboot.a -rm -f $buildroot/MariaDB/Columnstore/lib/libiberty.a +rm -f $buildroot/mariadb/columnstore/lib/libidbboot.a +rm -f $buildroot/mariadb/columnstore/lib/libiberty.a mkdir -p $HOME/rpm/BUILD $HOME/rpm/RPMS $HOME/rpm/SRPMS $HOME/rpm/SPECS $HOME/rpm/tmp @@ -104,7 +109,12 @@ b="$b\\n$l" done echo $b )` -cp ./build/columnstore.spec.in $HOME/rpm/SPECS/columnstore.spec +if [ ! $community ]; then + cp ./build/columnstore.spec.in $HOME/rpm/SPECS/columnstore.spec +else + cp ./build/columnstore.community.spec.in $HOME/rpm/SPECS/columnstore.spec +fi + sed -i -e "s/@@PACKAGER@@/Packager: $packager/" \ -e "s/@@VERSION@@/Version: $version/" \ -e "s/@@RELEASE@@/Release: $release/" \ @@ -115,6 +125,7 @@ echo done. echo -n "Building rpms..." rpmbuild -ba $HOME/rpm/SPECS/columnstore.spec > /tmp/rpmbuild.out.$$ 2>&1 + rc=$? echo done. if [ $verbose -gt 0 -o $rc -ne 0 ]; then diff --git a/build/columnstore.community.spec.in b/build/columnstore.community.spec.in new file mode 100644 index 000000000..1326040e2 --- /dev/null +++ b/build/columnstore.community.spec.in @@ -0,0 +1,395 @@ +# +# $Id$ +# +Summary: MariaDB-Columnstore software +Name: mariadb-columnstore +@@VERSION@@ +@@RELEASE@@ +Vendor: MariaDB Corporation Ab +URL: http://www.mariadb.com/ +@@PACKAGER@@ +Group: Applications +License: Copyright (c) 2016 MariaDB Corporation Ab., all rights reserved; redistributable under the terms of the GPL, see the file COPYING for details. +BuildRoot: %{_tmppath}/%{name}.%{release}-buildroot + +%description +MariaDB-Columnstore software meta-package + +%package platform +Summary: MariaDB-Columnstore software binaries +Group: Applications +Requires: expect, mariadb-columnstore-libs + +%description platform +MariaDB-Columnstore binary files +@@BUILDINFO@@ + +%package libs +Summary: MariaDB-Columnstore software libraries +Group: Applications + +%description libs +MariaDB-Columnstore libraries + +%package storage-engine +Summary: MariaDB-Columnstore software MariaDB connector +Group: Applications +Requires: mariadb-columnstore-libs + +%description storage-engine +MariaDB Columnstore connector binary files + +%prep +%define _use_internal_dependency_generator 0 +%define __find_requires %{nil} +%define __os_install_post %{nil} +%define debug_package %{nil} + +%build + +%install +mkdir -p %{buildroot}/usr/local +tar -C $RPM_BUILD_DIR/%{name}-%{version}.%{release} -cf - . | tar -C %{buildroot}/usr/local -xf - + +%clean +rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}.%{release} + +%changelog + +%files platform +%defattr(-, root, root) + +/usr/local/mariadb/columnstore/bin/DDLProc +/usr/local/mariadb/columnstore/bin/ExeMgr +/usr/local/mariadb/columnstore/bin/ProcMgr +/usr/local/mariadb/columnstore/bin/ProcMon +/usr/local/mariadb/columnstore/bin/DMLProc +/usr/local/mariadb/columnstore/bin/WriteEngineServer +/usr/local/mariadb/columnstore/bin/cpimport +/usr/local/mariadb/columnstore/bin/post-install +/usr/local/mariadb/columnstore/bin/post-mysql-install +/usr/local/mariadb/columnstore/bin/post-mysqld-install +/usr/local/mariadb/columnstore/bin/pre-uninstall +/usr/local/mariadb/columnstore/bin/PrimProc +/usr/local/mariadb/columnstore/bin/DecomSvr +/usr/local/mariadb/columnstore/bin/upgrade-columnstore.sh +/usr/local/mariadb/columnstore/bin/run.sh +/usr/local/mariadb/columnstore/bin/columnstore +/usr/local/mariadb/columnstore/bin/columnstoreSyslog +/usr/local/mariadb/columnstore/bin/columnstoreSyslog7 +/usr/local/mariadb/columnstore/bin/columnstoreSyslog-ng +/usr/local/mariadb/columnstore/bin/syslogSetup.sh +/usr/local/mariadb/columnstore/bin/cplogger +/usr/local/mariadb/columnstore/bin/columnstore.def +/usr/local/mariadb/columnstore/bin/dbbuilder +/usr/local/mariadb/columnstore/bin/cpimport.bin +/usr/local/mariadb/columnstore/bin/load_brm +/usr/local/mariadb/columnstore/bin/save_brm +/usr/local/mariadb/columnstore/bin/dbrmctl +/usr/local/mariadb/columnstore/bin/controllernode +/usr/local/mariadb/columnstore/bin/reset_locks +/usr/local/mariadb/columnstore/bin/workernode +/usr/local/mariadb/columnstore/bin/colxml +/usr/local/mariadb/columnstore/bin/clearShm +/usr/local/mariadb/columnstore/bin/viewtablelock +/usr/local/mariadb/columnstore/bin/cleartablelock +/usr/local/mariadb/columnstore/bin/mcsadmin +/usr/local/mariadb/columnstore/bin/trapHandler +/usr/local/mariadb/columnstore/bin/remote_command.sh +/usr/local/mariadb/columnstore/bin/postConfigure +/usr/local/mariadb/columnstore/bin/columnstoreLogRotate +/usr/local/mariadb/columnstore/bin/transactionLog +/usr/local/mariadb/columnstore/bin/columnstoreDBWrite +/usr/local/mariadb/columnstore/bin/transactionLogArchiver.sh +/usr/local/mariadb/columnstore/bin/system_installer.sh +/usr/local/mariadb/columnstore/bin/installer +/usr/local/mariadb/columnstore/bin/module_installer.sh +/usr/local/mariadb/columnstore/bin/patchInstaller +/usr/local/mariadb/columnstore/bin/user_installer.sh +/usr/local/mariadb/columnstore/bin/performance_installer.sh +/usr/local/mariadb/columnstore/bin/startupTests.sh +/usr/local/mariadb/columnstore/bin/os_check.sh +/usr/local/mariadb/columnstore/bin/sendtrap +/usr/local/mariadb/columnstore/bin/remote_scp_put.sh +/usr/local/mariadb/columnstore/bin/remotessh.exp +/usr/local/mariadb/columnstore/bin/ServerMonitor +/usr/local/mariadb/columnstore/bin/master-rep-columnstore.sh +/usr/local/mariadb/columnstore/bin/slave-rep-columnstore.sh +/usr/local/mariadb/columnstore/bin/rsync.sh +/usr/local/mariadb/columnstore/bin/columnstoreSupport +/usr/local/mariadb/columnstore/bin/hardwareReport.sh +/usr/local/mariadb/columnstore/bin/softwareReport.sh +/usr/local/mariadb/columnstore/bin/configReport.sh +/usr/local/mariadb/columnstore/bin/logReport.sh +/usr/local/mariadb/columnstore/bin/bulklogReport.sh +/usr/local/mariadb/columnstore/bin/resourceReport.sh +/usr/local/mariadb/columnstore/bin/hadoopReport.sh +/usr/local/mariadb/columnstore/bin/alarmReport.sh +/usr/local/mariadb/columnstore/bin/amazonInstaller +/usr/local/mariadb/columnstore/bin/remote_command_verify.sh +/usr/local/mariadb/columnstore/bin/disable-rep-columnstore.sh + + +# +%config /usr/local/mariadb/columnstore/etc/Calpont.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/ProcessConfig.xml.singleserver +%config /usr/local/mariadb/columnstore/etc/snmpd.conf.singleserver +%config /usr/local/mariadb/columnstore/etc/snmptrapd.conf.singleserver +# +/usr/local/mariadb/columnstore/etc/MessageFile.txt +/usr/local/mariadb/columnstore/etc/ErrorMessage.txt +# +%attr(0666, root, root) /usr/local/mariadb/columnstore/local/module +# +/usr/local/mariadb/columnstore/releasenum + +# Tools... +/usr/local/mariadb/columnstore/bin/rollback +/usr/local/mariadb/columnstore/bin/editem +/usr/local/mariadb/columnstore/bin/getConfig +/usr/local/mariadb/columnstore/bin/setConfig +/usr/local/mariadb/columnstore/bin/setenv-hdfs-12 +/usr/local/mariadb/columnstore/bin/setenv-hdfs-20 +/usr/local/mariadb/columnstore/bin/hdfsCheck +/usr/local/mariadb/columnstore/bin/configxml.sh +/usr/local/mariadb/columnstore/bin/remote_scp_get.sh +/usr/local/mariadb/columnstore/bin/columnstoreAlias +/usr/local/mariadb/columnstore/bin/autoConfigure +/usr/local/mariadb/columnstore/bin/ddlcleanup +/usr/local/mariadb/columnstore/bin/idbmeminfo +/usr/local/mariadb/columnstore/bin/IDBInstanceCmds.sh +/usr/local/mariadb/columnstore/bin/IDBVolumeCmds.sh +/usr/local/mariadb/columnstore/bin/binary_installer.sh +/usr/local/mariadb/columnstore/bin/myCnf-include-args.text +/usr/local/mariadb/columnstore/bin/myCnf-exclude-args.text +/usr/local/mariadb/columnstore/bin/mycnfUpgrade +/usr/local/mariadb/columnstore/bin/getMySQLpw +/usr/local/mariadb/columnstore/bin/columnstore.conf + +/usr/local/mariadb/columnstore/sbin/snmpd +/usr/local/mariadb/columnstore/sbin/snmptrapd +%config %attr(0666, root, root) /usr/local/mariadb/columnstore/etc/AlarmConfig.xml +# +%config /usr/local/mariadb/columnstore/local/snmpdx.conf +%config /usr/local/mariadb/columnstore/local/snmpdx.conf.singleserver +# +/usr/local/mariadb/columnstore/share/snmp/mibs/AGENTX-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/CALPONT-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/DISMAN-EVENT-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/DISMAN-SCRIPT-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/EtherLike-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/HCNUM-TC.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/HOST-RESOURCES-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/HOST-RESOURCES-TYPES.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IANAifType-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IANA-LANGUAGE-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IANA-RTPROTO-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IF-INVERTED-STACK-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IF-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/INET-ADDRESS-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IP-FORWARD-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IPV6-ICMP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IPV6-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IPV6-TCP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IPV6-TC.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IPV6-UDP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/NET-SNMP-AGENT-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/NET-SNMP-EXTEND-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/NET-SNMP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/NET-SNMP-TC.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/NOTIFICATION-LOG-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/RFC1155-SMI.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/RFC1213-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/RFC-1215.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/RMON-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SMUX-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-COMMUNITY-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-MPD-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-PROXY-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-TARGET-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-USM-AES-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMPv2-CONF.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMPv2-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMPv2-SMI.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMPv2-TC.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMPv2-TM.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/TCP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/TRANSPORT-ADDRESS-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/UCD-DEMO-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/UCD-DISKIO-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/UCD-DLMOD-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/UCD-IPFWACC-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/UCD-SNMP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/UDP-MIB.txt +# +/usr/local/mariadb/columnstore/post/functions +/usr/local/mariadb/columnstore/post/test-001.sh +/usr/local/mariadb/columnstore/post/test-002.sh +/usr/local/mariadb/columnstore/post/test-003.sh +/usr/local/mariadb/columnstore/post/test-004.sh + +# Tools... +# +%files libs +%defattr(-, root, root) + +/usr/local/mariadb/columnstore/lib/libconfigcpp.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libddlpackageproc.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libddlpackage.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libdmlpackageproc.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libdmlpackage.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libexecplan.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libfuncexp.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libudfsdk.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libjoblist.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libjoiner.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libloggingcpp.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libmessageqcpp.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libnetsnmpagent.so.5.2.1 +/usr/local/mariadb/columnstore/lib/libnetsnmphelpers.so.5.2.1 +/usr/local/mariadb/columnstore/lib/libnetsnmpmibs.so.5.2.1 +/usr/local/mariadb/columnstore/lib/libnetsnmp.so.5.2.1 +/usr/local/mariadb/columnstore/lib/libnetsnmptrapd.so.5.2.1 +/usr/local/mariadb/columnstore/lib/liboamcpp.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libsnmpmanager.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libthreadpool.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libwindowfunction.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libwriteengine.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libwriteengineclient.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libbrm.so.1.0.0 +/usr/local/mariadb/columnstore/lib/librwlock.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libdataconvert.so.1.0.0 +/usr/local/mariadb/columnstore/lib/librowgroup.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libcacheutils.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libcommon.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libboost_idb.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libcompress.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libddlcleanuputil.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libbatchloader.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libmysqlcl_idb.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libquerystats.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libwriteengineredistribute.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libjemalloc.so.3.3.0 +/usr/local/mariadb/columnstore/lib/libidbdatafile.so.1.0.0 +/usr/local/mariadb/columnstore/lib/hdfs-20.so +/usr/local/mariadb/columnstore/lib/hdfs-12.so +/usr/local/mariadb/columnstore/lib/libgcc_s.so.1 +/usr/local/mariadb/columnstore/lib/libstdc++.so.6.0.14 +/usr/local/mariadb/columnstore/lib/libthrift.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libquerytele.so.1.0.0 + +%files storage-engine +/usr/local/mariadb/columnstore/lib/libcalmysql.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libudf_mysql.so.1.0.0 + +/usr/local/mariadb/columnstore/mysql/mysql-Columnstore +/usr/local/mariadb/columnstore/mysql/install_calpont_mysql.sh +/usr/local/mariadb/columnstore/mysql/syscatalog_mysql.sql +/usr/local/mariadb/columnstore/mysql/dumpcat_mysql.sql +/usr/local/mariadb/columnstore/mysql/dumpcat.pl +/usr/local/mariadb/columnstore/mysql/calsetuserpriority.sql +/usr/local/mariadb/columnstore/mysql/calremoveuserpriority.sql +/usr/local/mariadb/columnstore/mysql/calshowprocesslist.sql + +%config /usr/local/mariadb/columnstore/mysql/my.cnf + +# +# Scriptlets +# for an install, pre & post run with $1 set to 1 +# for an erase, preun & postun run with $1 set to 0 +# for an upgrade, pre & post run first, with $1 set to 2 then the _old_ preun & postun run with $1 set to 1 + +%post platform +rpmmode=install +if [ "$1" -eq "$1" 2> /dev/null ]; then + if [ $1 -ne 1 ]; then + rpmmode=upgrade + fi +fi + +prefix=/usr/local + +test -x /usr/local/mariadb/columnstore/bin/post-install && /usr/local/mariadb/columnstore/bin/post-install --prefix=$prefix --rpmmode=$rpmmode + +echo "MariaDB ColumnStore RPM install completed" + +%post libs +rpmmode=install +if [ "$1" -eq "$1" 2> /dev/null ]; then + if [ $1 -ne 1 ]; then + rpmmode=upgrade + fi +fi + +prefix=/usr/local + +echo "MariaDB ColumnStore RPM install completed" + +%post storage-engine +rpmmode=install +if [ "$1" -eq "$1" 2> /dev/null ]; then + if [ $1 -ne 1 ]; then + rpmmode=upgrade + fi +fi + +prefix=/usr/local + +echo "MariaDB ColumnStore RPM install completed" + + +%preun platform +rpmmode=upgrade +if [ "$1" -eq "$1" 2> /dev/null ]; then + if [ $1 -ne 1 ]; then + rpmmode=erase + fi +else + rpmmode=erase +fi + +if [ $rpmmode = erase ]; then + test -x /usr/local/mariadb/columnstore/bin/pre-uninstall && /usr/local/mariadb/columnstore/bin/pre-uninstall +fi + +exit 0 + +%preun libs +rpmmode=upgrade +if [ "$1" -eq "$1" 2> /dev/null ]; then + if [ $1 -ne 1 ]; then + rpmmode=erase + fi +else + rpmmode=erase +fi + +exit 0 + +%preun storage-engine +rpmmode=upgrade +if [ "$1" -eq "$1" 2> /dev/null ]; then + if [ $1 -ne 1 ]; then + rpmmode=erase + fi +else + rpmmode=erase +fi + +exit 0 + + diff --git a/build/columnstore.spec.in b/build/columnstore.spec.in index b1d847772..af6d5ce5d 100644 --- a/build/columnstore.spec.in +++ b/build/columnstore.spec.in @@ -68,289 +68,289 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}.%{release} %files platform %defattr(-, root, root) -/usr/local/MariaDB/Columnstore/bin/DDLProc -/usr/local/MariaDB/Columnstore/bin/ExeMgr -/usr/local/MariaDB/Columnstore/bin/ProcMgr -/usr/local/MariaDB/Columnstore/bin/ProcMon -/usr/local/MariaDB/Columnstore/bin/DMLProc -/usr/local/MariaDB/Columnstore/bin/WriteEngineServer -/usr/local/MariaDB/Columnstore/bin/cpimport -/usr/local/MariaDB/Columnstore/bin/post-install -/usr/local/MariaDB/Columnstore/bin/post-mysql-install -/usr/local/MariaDB/Columnstore/bin/post-mysqld-install -/usr/local/MariaDB/Columnstore/bin/pre-uninstall -/usr/local/MariaDB/Columnstore/bin/PrimProc -/usr/local/MariaDB/Columnstore/bin/DecomSvr -/usr/local/MariaDB/Columnstore/bin/upgrade-columnstore.sh -/usr/local/MariaDB/Columnstore/bin/run.sh -/usr/local/MariaDB/Columnstore/bin/columnstore -/usr/local/MariaDB/Columnstore/bin/columnstoreSyslog -/usr/local/MariaDB/Columnstore/bin/columnstoreSyslog7 -/usr/local/MariaDB/Columnstore/bin/columnstoreSyslog-ng -/usr/local/MariaDB/Columnstore/bin/syslogSetup.sh -/usr/local/MariaDB/Columnstore/bin/cplogger -/usr/local/MariaDB/Columnstore/bin/columnstore.def -/usr/local/MariaDB/Columnstore/bin/dbbuilder -/usr/local/MariaDB/Columnstore/bin/cpimport.bin -/usr/local/MariaDB/Columnstore/bin/load_brm -/usr/local/MariaDB/Columnstore/bin/save_brm -/usr/local/MariaDB/Columnstore/bin/dbrmctl -/usr/local/MariaDB/Columnstore/bin/controllernode -/usr/local/MariaDB/Columnstore/bin/reset_locks -/usr/local/MariaDB/Columnstore/bin/workernode -/usr/local/MariaDB/Columnstore/bin/colxml -/usr/local/MariaDB/Columnstore/bin/clearShm -/usr/local/MariaDB/Columnstore/bin/viewtablelock -/usr/local/MariaDB/Columnstore/bin/cleartablelock -/usr/local/MariaDB/Columnstore/bin/mcsadmin -/usr/local/MariaDB/Columnstore/bin/trapHandler -/usr/local/MariaDB/Columnstore/bin/remote_command.sh -/usr/local/MariaDB/Columnstore/bin/postConfigure -/usr/local/MariaDB/Columnstore/bin/columnstoreLogRotate -/usr/local/MariaDB/Columnstore/bin/transactionLog -/usr/local/MariaDB/Columnstore/bin/columnstoreDBWrite -/usr/local/MariaDB/Columnstore/bin/transactionLogArchiver.sh -/usr/local/MariaDB/Columnstore/bin/system_installer.sh -/usr/local/MariaDB/Columnstore/bin/installer -/usr/local/MariaDB/Columnstore/bin/module_installer.sh -/usr/local/MariaDB/Columnstore/bin/patchInstaller -/usr/local/MariaDB/Columnstore/bin/user_installer.sh -/usr/local/MariaDB/Columnstore/bin/performance_installer.sh -/usr/local/MariaDB/Columnstore/bin/startupTests.sh -/usr/local/MariaDB/Columnstore/bin/os_check.sh -/usr/local/MariaDB/Columnstore/bin/sendtrap -/usr/local/MariaDB/Columnstore/bin/remote_scp_put.sh -/usr/local/MariaDB/Columnstore/bin/remotessh.exp -/usr/local/MariaDB/Columnstore/bin/ServerMonitor -/usr/local/MariaDB/Columnstore/bin/master-rep-columnstore.sh -/usr/local/MariaDB/Columnstore/bin/slave-rep-columnstore.sh -/usr/local/MariaDB/Columnstore/bin/rsync.sh -/usr/local/MariaDB/Columnstore/bin/columnstoreSupport -/usr/local/MariaDB/Columnstore/bin/hardwareReport.sh -/usr/local/MariaDB/Columnstore/bin/softwareReport.sh -/usr/local/MariaDB/Columnstore/bin/configReport.sh -/usr/local/MariaDB/Columnstore/bin/logReport.sh -/usr/local/MariaDB/Columnstore/bin/bulklogReport.sh -/usr/local/MariaDB/Columnstore/bin/resourceReport.sh -/usr/local/MariaDB/Columnstore/bin/hadoopReport.sh -/usr/local/MariaDB/Columnstore/bin/alarmReport.sh -/usr/local/MariaDB/Columnstore/bin/amazonInstaller -/usr/local/MariaDB/Columnstore/bin/remote_command_verify.sh -/usr/local/MariaDB/Columnstore/bin/disable-rep-columnstore.sh +/usr/local/mariadb/columnstore/bin/DDLProc +/usr/local/mariadb/columnstore/bin/ExeMgr +/usr/local/mariadb/columnstore/bin/ProcMgr +/usr/local/mariadb/columnstore/bin/ProcMon +/usr/local/mariadb/columnstore/bin/DMLProc +/usr/local/mariadb/columnstore/bin/WriteEngineServer +/usr/local/mariadb/columnstore/bin/cpimport +/usr/local/mariadb/columnstore/bin/post-install +/usr/local/mariadb/columnstore/bin/post-mysql-install +/usr/local/mariadb/columnstore/bin/post-mysqld-install +/usr/local/mariadb/columnstore/bin/pre-uninstall +/usr/local/mariadb/columnstore/bin/PrimProc +/usr/local/mariadb/columnstore/bin/DecomSvr +/usr/local/mariadb/columnstore/bin/upgrade-columnstore.sh +/usr/local/mariadb/columnstore/bin/run.sh +/usr/local/mariadb/columnstore/bin/columnstore +/usr/local/mariadb/columnstore/bin/columnstoreSyslog +/usr/local/mariadb/columnstore/bin/columnstoreSyslog7 +/usr/local/mariadb/columnstore/bin/columnstoreSyslog-ng +/usr/local/mariadb/columnstore/bin/syslogSetup.sh +/usr/local/mariadb/columnstore/bin/cplogger +/usr/local/mariadb/columnstore/bin/columnstore.def +/usr/local/mariadb/columnstore/bin/dbbuilder +/usr/local/mariadb/columnstore/bin/cpimport.bin +/usr/local/mariadb/columnstore/bin/load_brm +/usr/local/mariadb/columnstore/bin/save_brm +/usr/local/mariadb/columnstore/bin/dbrmctl +/usr/local/mariadb/columnstore/bin/controllernode +/usr/local/mariadb/columnstore/bin/reset_locks +/usr/local/mariadb/columnstore/bin/workernode +/usr/local/mariadb/columnstore/bin/colxml +/usr/local/mariadb/columnstore/bin/clearShm +/usr/local/mariadb/columnstore/bin/viewtablelock +/usr/local/mariadb/columnstore/bin/cleartablelock +/usr/local/mariadb/columnstore/bin/mcsadmin +/usr/local/mariadb/columnstore/bin/trapHandler +/usr/local/mariadb/columnstore/bin/remote_command.sh +/usr/local/mariadb/columnstore/bin/postConfigure +/usr/local/mariadb/columnstore/bin/columnstoreLogRotate +/usr/local/mariadb/columnstore/bin/transactionLog +/usr/local/mariadb/columnstore/bin/columnstoreDBWrite +/usr/local/mariadb/columnstore/bin/transactionLogArchiver.sh +/usr/local/mariadb/columnstore/bin/system_installer.sh +/usr/local/mariadb/columnstore/bin/installer +/usr/local/mariadb/columnstore/bin/module_installer.sh +/usr/local/mariadb/columnstore/bin/patchInstaller +/usr/local/mariadb/columnstore/bin/user_installer.sh +/usr/local/mariadb/columnstore/bin/performance_installer.sh +/usr/local/mariadb/columnstore/bin/startupTests.sh +/usr/local/mariadb/columnstore/bin/os_check.sh +/usr/local/mariadb/columnstore/bin/sendtrap +/usr/local/mariadb/columnstore/bin/remote_scp_put.sh +/usr/local/mariadb/columnstore/bin/remotessh.exp +/usr/local/mariadb/columnstore/bin/ServerMonitor +/usr/local/mariadb/columnstore/bin/master-rep-columnstore.sh +/usr/local/mariadb/columnstore/bin/slave-rep-columnstore.sh +/usr/local/mariadb/columnstore/bin/rsync.sh +/usr/local/mariadb/columnstore/bin/columnstoreSupport +/usr/local/mariadb/columnstore/bin/hardwareReport.sh +/usr/local/mariadb/columnstore/bin/softwareReport.sh +/usr/local/mariadb/columnstore/bin/configReport.sh +/usr/local/mariadb/columnstore/bin/logReport.sh +/usr/local/mariadb/columnstore/bin/bulklogReport.sh +/usr/local/mariadb/columnstore/bin/resourceReport.sh +/usr/local/mariadb/columnstore/bin/hadoopReport.sh +/usr/local/mariadb/columnstore/bin/alarmReport.sh +/usr/local/mariadb/columnstore/bin/amazonInstaller +/usr/local/mariadb/columnstore/bin/remote_command_verify.sh +/usr/local/mariadb/columnstore/bin/disable-rep-columnstore.sh # -%config /usr/local/MariaDB/Columnstore/etc/Calpont.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/ProcessConfig.xml.singleserver -%config /usr/local/MariaDB/Columnstore/etc/snmpd.conf.singleserver -%config /usr/local/MariaDB/Columnstore/etc/snmptrapd.conf.singleserver +%config /usr/local/mariadb/columnstore/etc/Calpont.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/ProcessConfig.xml.singleserver +%config /usr/local/mariadb/columnstore/etc/snmpd.conf.singleserver +%config /usr/local/mariadb/columnstore/etc/snmptrapd.conf.singleserver # -/usr/local/MariaDB/Columnstore/etc/MessageFile.txt -/usr/local/MariaDB/Columnstore/etc/ErrorMessage.txt +/usr/local/mariadb/columnstore/etc/MessageFile.txt +/usr/local/mariadb/columnstore/etc/ErrorMessage.txt # -%attr(0666, root, root) /usr/local/MariaDB/Columnstore/local/module +%attr(0666, root, root) /usr/local/mariadb/columnstore/local/module # -/usr/local/MariaDB/Columnstore/releasenum +/usr/local/mariadb/columnstore/releasenum # Tools... -/usr/local/MariaDB/Columnstore/bin/rollback -/usr/local/MariaDB/Columnstore/bin/editem -/usr/local/MariaDB/Columnstore/bin/getConfig -/usr/local/MariaDB/Columnstore/bin/setConfig -/usr/local/MariaDB/Columnstore/bin/setenv-hdfs-12 -/usr/local/MariaDB/Columnstore/bin/setenv-hdfs-20 -/usr/local/MariaDB/Columnstore/bin/hdfsCheck -/usr/local/MariaDB/Columnstore/bin/configxml.sh -/usr/local/MariaDB/Columnstore/bin/remote_scp_get.sh -/usr/local/MariaDB/Columnstore/bin/columnstoreAlias -/usr/local/MariaDB/Columnstore/bin/autoConfigure -/usr/local/MariaDB/Columnstore/bin/ddlcleanup -/usr/local/MariaDB/Columnstore/bin/idbmeminfo -/usr/local/MariaDB/Columnstore/bin/IDBInstanceCmds.sh -/usr/local/MariaDB/Columnstore/bin/IDBVolumeCmds.sh -/usr/local/MariaDB/Columnstore/bin/binary_installer.sh -/usr/local/MariaDB/Columnstore/bin/myCnf-include-args.text -/usr/local/MariaDB/Columnstore/bin/myCnf-exclude-args.text -/usr/local/MariaDB/Columnstore/bin/mycnfUpgrade -/usr/local/MariaDB/Columnstore/bin/getMySQLpw -/usr/local/MariaDB/Columnstore/bin/columnstore.conf +/usr/local/mariadb/columnstore/bin/rollback +/usr/local/mariadb/columnstore/bin/editem +/usr/local/mariadb/columnstore/bin/getConfig +/usr/local/mariadb/columnstore/bin/setConfig +/usr/local/mariadb/columnstore/bin/setenv-hdfs-12 +/usr/local/mariadb/columnstore/bin/setenv-hdfs-20 +/usr/local/mariadb/columnstore/bin/hdfsCheck +/usr/local/mariadb/columnstore/bin/configxml.sh +/usr/local/mariadb/columnstore/bin/remote_scp_get.sh +/usr/local/mariadb/columnstore/bin/columnstoreAlias +/usr/local/mariadb/columnstore/bin/autoConfigure +/usr/local/mariadb/columnstore/bin/ddlcleanup +/usr/local/mariadb/columnstore/bin/idbmeminfo +/usr/local/mariadb/columnstore/bin/IDBInstanceCmds.sh +/usr/local/mariadb/columnstore/bin/IDBVolumeCmds.sh +/usr/local/mariadb/columnstore/bin/binary_installer.sh +/usr/local/mariadb/columnstore/bin/myCnf-include-args.text +/usr/local/mariadb/columnstore/bin/myCnf-exclude-args.text +/usr/local/mariadb/columnstore/bin/mycnfUpgrade +/usr/local/mariadb/columnstore/bin/getMySQLpw +/usr/local/mariadb/columnstore/bin/columnstore.conf -/usr/local/MariaDB/Columnstore/sbin/snmpd -/usr/local/MariaDB/Columnstore/sbin/snmptrapd -%config %attr(0666, root, root) /usr/local/MariaDB/Columnstore/etc/AlarmConfig.xml +/usr/local/mariadb/columnstore/sbin/snmpd +/usr/local/mariadb/columnstore/sbin/snmptrapd +%config %attr(0666, root, root) /usr/local/mariadb/columnstore/etc/AlarmConfig.xml # -%config /usr/local/MariaDB/Columnstore/local/snmpdx.conf -%config /usr/local/MariaDB/Columnstore/local/snmpdx.conf.singleserver +%config /usr/local/mariadb/columnstore/local/snmpdx.conf +%config /usr/local/mariadb/columnstore/local/snmpdx.conf.singleserver # -/usr/local/MariaDB/Columnstore/share/snmp/mibs/AGENTX-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/CALPONT-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/DISMAN-EVENT-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/DISMAN-SCRIPT-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/EtherLike-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/HCNUM-TC.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/HOST-RESOURCES-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/HOST-RESOURCES-TYPES.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IANAifType-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IANA-LANGUAGE-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IANA-RTPROTO-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IF-INVERTED-STACK-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IF-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/INET-ADDRESS-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IP-FORWARD-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IP-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IPV6-ICMP-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IPV6-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IPV6-TCP-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IPV6-TC.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IPV6-UDP-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/NET-SNMP-AGENT-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/NET-SNMP-EXTEND-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/NET-SNMP-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/NET-SNMP-TC.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/NOTIFICATION-LOG-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/RFC1155-SMI.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/RFC1213-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/RFC-1215.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/RMON-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SMUX-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-COMMUNITY-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-MPD-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-PROXY-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-TARGET-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-USM-AES-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMPv2-CONF.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMPv2-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMPv2-SMI.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMPv2-TC.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMPv2-TM.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/TCP-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/TRANSPORT-ADDRESS-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/UCD-DEMO-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/UCD-DISKIO-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/UCD-DLMOD-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/UCD-IPFWACC-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/UCD-SNMP-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/UDP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/AGENTX-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/CALPONT-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/DISMAN-EVENT-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/DISMAN-SCRIPT-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/EtherLike-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/HCNUM-TC.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/HOST-RESOURCES-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/HOST-RESOURCES-TYPES.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IANAifType-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IANA-LANGUAGE-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IANA-RTPROTO-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IF-INVERTED-STACK-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IF-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/INET-ADDRESS-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IP-FORWARD-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IPV6-ICMP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IPV6-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IPV6-TCP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IPV6-TC.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IPV6-UDP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/NET-SNMP-AGENT-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/NET-SNMP-EXTEND-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/NET-SNMP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/NET-SNMP-TC.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/NOTIFICATION-LOG-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/RFC1155-SMI.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/RFC1213-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/RFC-1215.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/RMON-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SMUX-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-COMMUNITY-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-MPD-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-PROXY-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-TARGET-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-USM-AES-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMPv2-CONF.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMPv2-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMPv2-SMI.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMPv2-TC.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMPv2-TM.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/TCP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/TRANSPORT-ADDRESS-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/UCD-DEMO-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/UCD-DISKIO-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/UCD-DLMOD-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/UCD-IPFWACC-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/UCD-SNMP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/UDP-MIB.txt # -/usr/local/MariaDB/Columnstore/post/functions -/usr/local/MariaDB/Columnstore/post/test-001.sh -/usr/local/MariaDB/Columnstore/post/test-002.sh -/usr/local/MariaDB/Columnstore/post/test-003.sh -/usr/local/MariaDB/Columnstore/post/test-004.sh +/usr/local/mariadb/columnstore/post/functions +/usr/local/mariadb/columnstore/post/test-001.sh +/usr/local/mariadb/columnstore/post/test-002.sh +/usr/local/mariadb/columnstore/post/test-003.sh +/usr/local/mariadb/columnstore/post/test-004.sh %files enterprise %defattr(-, root, root) -/usr/local/MariaDB/Columnstore/bin/displayJobGraph.sh -/usr/local/MariaDB/Columnstore/bin/dbhealth.sh -/usr/local/MariaDB/Columnstore/bin/dbhealth.sql +/usr/local/mariadb/columnstore/bin/displayJobGraph.sh +/usr/local/mariadb/columnstore/bin/dbhealth.sh +/usr/local/mariadb/columnstore/bin/dbhealth.sql # Tools... -/usr/local/MariaDB/Columnstore/bin/dumpcol -/usr/local/MariaDB/Columnstore/bin/oid2file -/usr/local/MariaDB/Columnstore/bin/evalcol -/usr/local/MariaDB/Columnstore/bin/SesMgr -/usr/local/MariaDB/Columnstore/bin/dumpVss -/usr/local/MariaDB/Columnstore/bin/editTxn -/usr/local/MariaDB/Columnstore/bin/dbprof.pl -/usr/local/MariaDB/Columnstore/bin/dumpobm -/usr/local/MariaDB/Columnstore/bin/file2oid.pl -/usr/local/MariaDB/Columnstore/bin/print_journal -/usr/local/MariaDB/Columnstore/bin/healthcheck -/usr/local/MariaDB/Columnstore/bin/glusterctl -/usr/local/MariaDB/Columnstore/bin/glusteradd -/usr/local/MariaDB/Columnstore/bin/glusterconf -/usr/local/MariaDB/Columnstore/bin/redistributeDB -/usr/local/MariaDB/Columnstore/bin/databaseSizeReport -/usr/local/MariaDB/Columnstore/bin/gdb +/usr/local/mariadb/columnstore/bin/dumpcol +/usr/local/mariadb/columnstore/bin/oid2file +/usr/local/mariadb/columnstore/bin/evalcol +/usr/local/mariadb/columnstore/bin/SesMgr +/usr/local/mariadb/columnstore/bin/dumpVss +/usr/local/mariadb/columnstore/bin/editTxn +/usr/local/mariadb/columnstore/bin/dbprof.pl +/usr/local/mariadb/columnstore/bin/dumpobm +/usr/local/mariadb/columnstore/bin/file2oid.pl +/usr/local/mariadb/columnstore/bin/print_journal +/usr/local/mariadb/columnstore/bin/healthcheck +/usr/local/mariadb/columnstore/bin/glusterctl +/usr/local/mariadb/columnstore/bin/glusteradd +/usr/local/mariadb/columnstore/bin/glusterconf +/usr/local/mariadb/columnstore/bin/redistributeDB +/usr/local/mariadb/columnstore/bin/databaseSizeReport +/usr/local/mariadb/columnstore/bin/gdb # -/usr/local/MariaDB/Columnstore/tools/copy2here.sh -/usr/local/MariaDB/Columnstore/tools/getlogs.sh -/usr/local/MariaDB/Columnstore/tools/getmodules.sh -/usr/local/MariaDB/Columnstore/tools/getps.sh -/usr/local/MariaDB/Columnstore/tools/getsar.sh -/usr/local/MariaDB/Columnstore/tools/getuserinput.sh -/usr/local/MariaDB/Columnstore/tools/prat -/usr/local/MariaDB/Columnstore/tools/prat.sh -/usr/local/MariaDB/Columnstore/tools/ps -/usr/local/MariaDB/Columnstore/tools/pscollect -/usr/local/MariaDB/Columnstore/tools/README -/usr/local/MariaDB/Columnstore/tools/tarfiles.sh +/usr/local/mariadb/columnstore/tools/copy2here.sh +/usr/local/mariadb/columnstore/tools/getlogs.sh +/usr/local/mariadb/columnstore/tools/getmodules.sh +/usr/local/mariadb/columnstore/tools/getps.sh +/usr/local/mariadb/columnstore/tools/getsar.sh +/usr/local/mariadb/columnstore/tools/getuserinput.sh +/usr/local/mariadb/columnstore/tools/prat +/usr/local/mariadb/columnstore/tools/prat.sh +/usr/local/mariadb/columnstore/tools/ps +/usr/local/mariadb/columnstore/tools/pscollect +/usr/local/mariadb/columnstore/tools/README +/usr/local/mariadb/columnstore/tools/tarfiles.sh # %files libs %defattr(-, root, root) -/usr/local/MariaDB/Columnstore/lib/libconfigcpp.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libddlpackageproc.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libddlpackage.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libdmlpackageproc.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libdmlpackage.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libexecplan.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libfuncexp.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libudfsdk.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libjoblist.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libjoiner.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libloggingcpp.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libmessageqcpp.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libnetsnmpagent.so.5.2.1 -/usr/local/MariaDB/Columnstore/lib/libnetsnmphelpers.so.5.2.1 -/usr/local/MariaDB/Columnstore/lib/libnetsnmpmibs.so.5.2.1 -/usr/local/MariaDB/Columnstore/lib/libnetsnmp.so.5.2.1 -/usr/local/MariaDB/Columnstore/lib/libnetsnmptrapd.so.5.2.1 -/usr/local/MariaDB/Columnstore/lib/liboamcpp.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libsnmpmanager.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libthreadpool.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libwindowfunction.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libwriteengine.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libwriteengineclient.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libbrm.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/librwlock.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libdataconvert.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/librowgroup.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libcacheutils.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libcommon.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libboost_idb.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libcompress.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libddlcleanuputil.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libbatchloader.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libmysqlcl_idb.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libquerystats.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libwriteengineredistribute.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libjemalloc.so.3.3.0 -/usr/local/MariaDB/Columnstore/lib/libidbdatafile.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/hdfs-20.so -/usr/local/MariaDB/Columnstore/lib/hdfs-12.so -/usr/local/MariaDB/Columnstore/lib/libgcc_s.so.1 -/usr/local/MariaDB/Columnstore/lib/libstdc++.so.6.0.14 -/usr/local/MariaDB/Columnstore/lib/libthrift.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libquerytele.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libconfigcpp.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libddlpackageproc.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libddlpackage.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libdmlpackageproc.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libdmlpackage.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libexecplan.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libfuncexp.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libudfsdk.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libjoblist.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libjoiner.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libloggingcpp.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libmessageqcpp.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libnetsnmpagent.so.5.2.1 +/usr/local/mariadb/columnstore/lib/libnetsnmphelpers.so.5.2.1 +/usr/local/mariadb/columnstore/lib/libnetsnmpmibs.so.5.2.1 +/usr/local/mariadb/columnstore/lib/libnetsnmp.so.5.2.1 +/usr/local/mariadb/columnstore/lib/libnetsnmptrapd.so.5.2.1 +/usr/local/mariadb/columnstore/lib/liboamcpp.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libsnmpmanager.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libthreadpool.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libwindowfunction.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libwriteengine.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libwriteengineclient.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libbrm.so.1.0.0 +/usr/local/mariadb/columnstore/lib/librwlock.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libdataconvert.so.1.0.0 +/usr/local/mariadb/columnstore/lib/librowgroup.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libcacheutils.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libcommon.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libboost_idb.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libcompress.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libddlcleanuputil.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libbatchloader.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libmysqlcl_idb.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libquerystats.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libwriteengineredistribute.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libjemalloc.so.3.3.0 +/usr/local/mariadb/columnstore/lib/libidbdatafile.so.1.0.0 +/usr/local/mariadb/columnstore/lib/hdfs-20.so +/usr/local/mariadb/columnstore/lib/hdfs-12.so +/usr/local/mariadb/columnstore/lib/libgcc_s.so.1 +/usr/local/mariadb/columnstore/lib/libstdc++.so.6.0.14 +/usr/local/mariadb/columnstore/lib/libthrift.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libquerytele.so.1.0.0 %files storage-engine -/usr/local/MariaDB/Columnstore/lib/libcalmysql.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libudf_mysql.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libcalmysql.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libudf_mysql.so.1.0.0 -/usr/local/MariaDB/Columnstore/mysql/mysql-Columnstore -/usr/local/MariaDB/Columnstore/mysql/install_calpont_mysql.sh -/usr/local/MariaDB/Columnstore/mysql/syscatalog_mysql.sql -/usr/local/MariaDB/Columnstore/mysql/dumpcat_mysql.sql -/usr/local/MariaDB/Columnstore/mysql/dumpcat.pl -/usr/local/MariaDB/Columnstore/mysql/calsetuserpriority.sql -/usr/local/MariaDB/Columnstore/mysql/calremoveuserpriority.sql -/usr/local/MariaDB/Columnstore/mysql/calshowprocesslist.sql +/usr/local/mariadb/columnstore/mysql/mysql-Columnstore +/usr/local/mariadb/columnstore/mysql/install_calpont_mysql.sh +/usr/local/mariadb/columnstore/mysql/syscatalog_mysql.sql +/usr/local/mariadb/columnstore/mysql/dumpcat_mysql.sql +/usr/local/mariadb/columnstore/mysql/dumpcat.pl +/usr/local/mariadb/columnstore/mysql/calsetuserpriority.sql +/usr/local/mariadb/columnstore/mysql/calremoveuserpriority.sql +/usr/local/mariadb/columnstore/mysql/calshowprocesslist.sql -%config /usr/local/MariaDB/Columnstore/mysql/my.cnf +%config /usr/local/mariadb/columnstore/mysql/my.cnf # # Scriptlets @@ -368,7 +368,7 @@ fi prefix=/usr/local -test -x /usr/local/MariaDB/Columnstore/bin/post-install && /usr/local/MariaDB/Columnstore/bin/post-install --prefix=$prefix --rpmmode=$rpmmode +test -x /usr/local/mariadb/columnstore/bin/post-install && /usr/local/mariadb/columnstore/bin/post-install --prefix=$prefix --rpmmode=$rpmmode echo "MariaDB ColumnStore RPM install completed" @@ -420,7 +420,7 @@ else fi if [ $rpmmode = erase ]; then - test -x /usr/local/MariaDB/Columnstore/bin/pre-uninstall && /usr/local/MariaDB/Columnstore/bin/pre-uninstall + test -x /usr/local/mariadb/columnstore/bin/pre-uninstall && /usr/local/mariadb/columnstore/bin/pre-uninstall fi exit 0 diff --git a/build/infinidb.spec.in b/build/infinidb.spec.in index ae423ea09..3e5c73377 100644 --- a/build/infinidb.spec.in +++ b/build/infinidb.spec.in @@ -72,293 +72,293 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}-%{release} %files platform %defattr(-, root, root) -/usr/local/MariaDB/Columnstore/bin/DDLProc -/usr/local/MariaDB/Columnstore/bin/ExeMgr -/usr/local/MariaDB/Columnstore/bin/ProcMgr -/usr/local/MariaDB/Columnstore/bin/ProcMon -/usr/local/MariaDB/Columnstore/bin/DMLProc -/usr/local/MariaDB/Columnstore/bin/WriteEngineServer -/usr/local/MariaDB/Columnstore/bin/cpimport -/usr/local/MariaDB/Columnstore/bin/post-install -/usr/local/MariaDB/Columnstore/bin/post-mysql-install -/usr/local/MariaDB/Columnstore/bin/post-mysqld-install -/usr/local/MariaDB/Columnstore/bin/pre-uninstall -/usr/local/MariaDB/Columnstore/bin/PrimProc -/usr/local/MariaDB/Columnstore/bin/DecomSvr -/usr/local/MariaDB/Columnstore/bin/upgrade-infinidb.sh -/usr/local/MariaDB/Columnstore/bin/run.sh -/usr/local/MariaDB/Columnstore/bin/infinidb -/usr/local/MariaDB/Columnstore/bin/calpontSyslog -/usr/local/MariaDB/Columnstore/bin/calpontSyslog7 -/usr/local/MariaDB/Columnstore/bin/calpontSyslog-ng -/usr/local/MariaDB/Columnstore/bin/syslogSetup.sh -/usr/local/MariaDB/Columnstore/bin/cplogger -/usr/local/MariaDB/Columnstore/bin/infinidb.def -/usr/local/MariaDB/Columnstore/bin/dbbuilder -/usr/local/MariaDB/Columnstore/bin/cpimport.bin -/usr/local/MariaDB/Columnstore/bin/load_brm -/usr/local/MariaDB/Columnstore/bin/save_brm -/usr/local/MariaDB/Columnstore/bin/dbrmctl -/usr/local/MariaDB/Columnstore/bin/controllernode -/usr/local/MariaDB/Columnstore/bin/reset_locks -/usr/local/MariaDB/Columnstore/bin/workernode -/usr/local/MariaDB/Columnstore/bin/colxml -/usr/local/MariaDB/Columnstore/bin/clearShm -/usr/local/MariaDB/Columnstore/bin/viewtablelock -/usr/local/MariaDB/Columnstore/bin/cleartablelock -/usr/local/MariaDB/Columnstore/bin/mcsadmin -/usr/local/MariaDB/Columnstore/bin/trapHandler -/usr/local/MariaDB/Columnstore/bin/remote_command.sh -/usr/local/MariaDB/Columnstore/bin/postConfigure -/usr/local/MariaDB/Columnstore/bin/calpontLogRotate -/usr/local/MariaDB/Columnstore/bin/transactionLog -/usr/local/MariaDB/Columnstore/bin/calpontDBWrite -/usr/local/MariaDB/Columnstore/bin/transactionLogArchiver.sh -/usr/local/MariaDB/Columnstore/bin/system_installer.sh -/usr/local/MariaDB/Columnstore/bin/installer -/usr/local/MariaDB/Columnstore/bin/module_installer.sh -/usr/local/MariaDB/Columnstore/bin/patchInstaller -/usr/local/MariaDB/Columnstore/bin/patch_installer.sh -/usr/local/MariaDB/Columnstore/bin/xm_installer.sh -/usr/local/MariaDB/Columnstore/bin/calpontUninstall.sh -/usr/local/MariaDB/Columnstore/bin/director_installer.sh -/usr/local/MariaDB/Columnstore/bin/user_installer.sh -/usr/local/MariaDB/Columnstore/bin/performance_installer.sh -/usr/local/MariaDB/Columnstore/bin/startupTests.sh -/usr/local/MariaDB/Columnstore/bin/os_check.sh -/usr/local/MariaDB/Columnstore/bin/sendtrap -/usr/local/MariaDB/Columnstore/bin/remote_scp_put.sh -/usr/local/MariaDB/Columnstore/bin/remotessh.exp -/usr/local/MariaDB/Columnstore/bin/ServerMonitor -/usr/local/MariaDB/Columnstore/bin/master-rep-infinidb.sh -/usr/local/MariaDB/Columnstore/bin/slave-rep-infinidb.sh -/usr/local/MariaDB/Columnstore/bin/rsync.sh -/usr/local/MariaDB/Columnstore/bin/calpontSupport -/usr/local/MariaDB/Columnstore/bin/hardwareReport.sh -/usr/local/MariaDB/Columnstore/bin/softwareReport.sh -/usr/local/MariaDB/Columnstore/bin/configReport.sh -/usr/local/MariaDB/Columnstore/bin/logReport.sh -/usr/local/MariaDB/Columnstore/bin/bulklogReport.sh -/usr/local/MariaDB/Columnstore/bin/resourceReport.sh -/usr/local/MariaDB/Columnstore/bin/hadoopReport.sh -/usr/local/MariaDB/Columnstore/bin/alarmReport.sh -/usr/local/MariaDB/Columnstore/bin/amazonInstaller -/usr/local/MariaDB/Columnstore/bin/remote_command_verify.sh -/usr/local/MariaDB/Columnstore/bin/disable-rep-infinidb.sh +/usr/local/mariadb/columnstore/bin/DDLProc +/usr/local/mariadb/columnstore/bin/ExeMgr +/usr/local/mariadb/columnstore/bin/ProcMgr +/usr/local/mariadb/columnstore/bin/ProcMon +/usr/local/mariadb/columnstore/bin/DMLProc +/usr/local/mariadb/columnstore/bin/WriteEngineServer +/usr/local/mariadb/columnstore/bin/cpimport +/usr/local/mariadb/columnstore/bin/post-install +/usr/local/mariadb/columnstore/bin/post-mysql-install +/usr/local/mariadb/columnstore/bin/post-mysqld-install +/usr/local/mariadb/columnstore/bin/pre-uninstall +/usr/local/mariadb/columnstore/bin/PrimProc +/usr/local/mariadb/columnstore/bin/DecomSvr +/usr/local/mariadb/columnstore/bin/upgrade-infinidb.sh +/usr/local/mariadb/columnstore/bin/run.sh +/usr/local/mariadb/columnstore/bin/infinidb +/usr/local/mariadb/columnstore/bin/calpontSyslog +/usr/local/mariadb/columnstore/bin/calpontSyslog7 +/usr/local/mariadb/columnstore/bin/calpontSyslog-ng +/usr/local/mariadb/columnstore/bin/syslogSetup.sh +/usr/local/mariadb/columnstore/bin/cplogger +/usr/local/mariadb/columnstore/bin/infinidb.def +/usr/local/mariadb/columnstore/bin/dbbuilder +/usr/local/mariadb/columnstore/bin/cpimport.bin +/usr/local/mariadb/columnstore/bin/load_brm +/usr/local/mariadb/columnstore/bin/save_brm +/usr/local/mariadb/columnstore/bin/dbrmctl +/usr/local/mariadb/columnstore/bin/controllernode +/usr/local/mariadb/columnstore/bin/reset_locks +/usr/local/mariadb/columnstore/bin/workernode +/usr/local/mariadb/columnstore/bin/colxml +/usr/local/mariadb/columnstore/bin/clearShm +/usr/local/mariadb/columnstore/bin/viewtablelock +/usr/local/mariadb/columnstore/bin/cleartablelock +/usr/local/mariadb/columnstore/bin/mcsadmin +/usr/local/mariadb/columnstore/bin/trapHandler +/usr/local/mariadb/columnstore/bin/remote_command.sh +/usr/local/mariadb/columnstore/bin/postConfigure +/usr/local/mariadb/columnstore/bin/calpontLogRotate +/usr/local/mariadb/columnstore/bin/transactionLog +/usr/local/mariadb/columnstore/bin/calpontDBWrite +/usr/local/mariadb/columnstore/bin/transactionLogArchiver.sh +/usr/local/mariadb/columnstore/bin/system_installer.sh +/usr/local/mariadb/columnstore/bin/installer +/usr/local/mariadb/columnstore/bin/module_installer.sh +/usr/local/mariadb/columnstore/bin/patchInstaller +/usr/local/mariadb/columnstore/bin/patch_installer.sh +/usr/local/mariadb/columnstore/bin/xm_installer.sh +/usr/local/mariadb/columnstore/bin/calpontUninstall.sh +/usr/local/mariadb/columnstore/bin/director_installer.sh +/usr/local/mariadb/columnstore/bin/user_installer.sh +/usr/local/mariadb/columnstore/bin/performance_installer.sh +/usr/local/mariadb/columnstore/bin/startupTests.sh +/usr/local/mariadb/columnstore/bin/os_check.sh +/usr/local/mariadb/columnstore/bin/sendtrap +/usr/local/mariadb/columnstore/bin/remote_scp_put.sh +/usr/local/mariadb/columnstore/bin/remotessh.exp +/usr/local/mariadb/columnstore/bin/ServerMonitor +/usr/local/mariadb/columnstore/bin/master-rep-infinidb.sh +/usr/local/mariadb/columnstore/bin/slave-rep-infinidb.sh +/usr/local/mariadb/columnstore/bin/rsync.sh +/usr/local/mariadb/columnstore/bin/calpontSupport +/usr/local/mariadb/columnstore/bin/hardwareReport.sh +/usr/local/mariadb/columnstore/bin/softwareReport.sh +/usr/local/mariadb/columnstore/bin/configReport.sh +/usr/local/mariadb/columnstore/bin/logReport.sh +/usr/local/mariadb/columnstore/bin/bulklogReport.sh +/usr/local/mariadb/columnstore/bin/resourceReport.sh +/usr/local/mariadb/columnstore/bin/hadoopReport.sh +/usr/local/mariadb/columnstore/bin/alarmReport.sh +/usr/local/mariadb/columnstore/bin/amazonInstaller +/usr/local/mariadb/columnstore/bin/remote_command_verify.sh +/usr/local/mariadb/columnstore/bin/disable-rep-infinidb.sh # -%config /usr/local/MariaDB/Columnstore/etc/Calpont.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/ProcessConfig.xml.singleserver -%config /usr/local/MariaDB/Columnstore/etc/snmpd.conf.singleserver -%config /usr/local/MariaDB/Columnstore/etc/snmptrapd.conf.singleserver +%config /usr/local/mariadb/columnstore/etc/Calpont.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/ProcessConfig.xml.singleserver +%config /usr/local/mariadb/columnstore/etc/snmpd.conf.singleserver +%config /usr/local/mariadb/columnstore/etc/snmptrapd.conf.singleserver # -/usr/local/MariaDB/Columnstore/etc/MessageFile.txt -/usr/local/MariaDB/Columnstore/etc/ErrorMessage.txt +/usr/local/mariadb/columnstore/etc/MessageFile.txt +/usr/local/mariadb/columnstore/etc/ErrorMessage.txt # -%attr(0666, root, root) /usr/local/MariaDB/Columnstore/local/module +%attr(0666, root, root) /usr/local/mariadb/columnstore/local/module # -/usr/local/MariaDB/Columnstore/releasenum +/usr/local/mariadb/columnstore/releasenum # Tools... -/usr/local/MariaDB/Columnstore/bin/rollback -/usr/local/MariaDB/Columnstore/bin/editem -/usr/local/MariaDB/Columnstore/bin/getConfig -/usr/local/MariaDB/Columnstore/bin/setConfig -/usr/local/MariaDB/Columnstore/bin/setenv-hdfs-12 -/usr/local/MariaDB/Columnstore/bin/setenv-hdfs-20 -/usr/local/MariaDB/Columnstore/bin/hdfsCheck -/usr/local/MariaDB/Columnstore/bin/configxml.sh -/usr/local/MariaDB/Columnstore/bin/remote_scp_get.sh -/usr/local/MariaDB/Columnstore/bin/calpontAlias -/usr/local/MariaDB/Columnstore/bin/autoConfigure -/usr/local/MariaDB/Columnstore/bin/ddlcleanup -/usr/local/MariaDB/Columnstore/bin/idbmeminfo -/usr/local/MariaDB/Columnstore/bin/IDBInstanceCmds.sh -/usr/local/MariaDB/Columnstore/bin/IDBVolumeCmds.sh -/usr/local/MariaDB/Columnstore/bin/binary_installer.sh -/usr/local/MariaDB/Columnstore/bin/myCnf-include-args.text -/usr/local/MariaDB/Columnstore/bin/myCnf-exclude-args.text -/usr/local/MariaDB/Columnstore/bin/mycnfUpgrade -/usr/local/MariaDB/Columnstore/bin/getMySQLpw -/usr/local/MariaDB/Columnstore/bin/infinidb.conf +/usr/local/mariadb/columnstore/bin/rollback +/usr/local/mariadb/columnstore/bin/editem +/usr/local/mariadb/columnstore/bin/getConfig +/usr/local/mariadb/columnstore/bin/setConfig +/usr/local/mariadb/columnstore/bin/setenv-hdfs-12 +/usr/local/mariadb/columnstore/bin/setenv-hdfs-20 +/usr/local/mariadb/columnstore/bin/hdfsCheck +/usr/local/mariadb/columnstore/bin/configxml.sh +/usr/local/mariadb/columnstore/bin/remote_scp_get.sh +/usr/local/mariadb/columnstore/bin/calpontAlias +/usr/local/mariadb/columnstore/bin/autoConfigure +/usr/local/mariadb/columnstore/bin/ddlcleanup +/usr/local/mariadb/columnstore/bin/idbmeminfo +/usr/local/mariadb/columnstore/bin/IDBInstanceCmds.sh +/usr/local/mariadb/columnstore/bin/IDBVolumeCmds.sh +/usr/local/mariadb/columnstore/bin/binary_installer.sh +/usr/local/mariadb/columnstore/bin/myCnf-include-args.text +/usr/local/mariadb/columnstore/bin/myCnf-exclude-args.text +/usr/local/mariadb/columnstore/bin/mycnfUpgrade +/usr/local/mariadb/columnstore/bin/getMySQLpw +/usr/local/mariadb/columnstore/bin/infinidb.conf -/usr/local/MariaDB/Columnstore/sbin/snmpd -/usr/local/MariaDB/Columnstore/sbin/snmptrapd -%config %attr(0666, root, root) /usr/local/MariaDB/Columnstore/etc/AlarmConfig.xml +/usr/local/mariadb/columnstore/sbin/snmpd +/usr/local/mariadb/columnstore/sbin/snmptrapd +%config %attr(0666, root, root) /usr/local/mariadb/columnstore/etc/AlarmConfig.xml # -%config /usr/local/MariaDB/Columnstore/local/snmpdx.conf -%config /usr/local/MariaDB/Columnstore/local/snmpdx.conf.singleserver +%config /usr/local/mariadb/columnstore/local/snmpdx.conf +%config /usr/local/mariadb/columnstore/local/snmpdx.conf.singleserver # -/usr/local/MariaDB/Columnstore/share/snmp/mibs/AGENTX-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/CALPONT-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/DISMAN-EVENT-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/DISMAN-SCRIPT-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/EtherLike-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/HCNUM-TC.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/HOST-RESOURCES-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/HOST-RESOURCES-TYPES.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IANAifType-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IANA-LANGUAGE-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IANA-RTPROTO-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IF-INVERTED-STACK-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IF-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/INET-ADDRESS-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IP-FORWARD-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IP-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IPV6-ICMP-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IPV6-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IPV6-TCP-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IPV6-TC.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/IPV6-UDP-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/NET-SNMP-AGENT-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/NET-SNMP-EXTEND-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/NET-SNMP-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/NET-SNMP-TC.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/NOTIFICATION-LOG-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/RFC1155-SMI.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/RFC1213-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/RFC-1215.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/RMON-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SMUX-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-COMMUNITY-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-MPD-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-PROXY-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-TARGET-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-USM-AES-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMPv2-CONF.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMPv2-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMPv2-SMI.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMPv2-TC.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMPv2-TM.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/TCP-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/TRANSPORT-ADDRESS-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/UCD-DEMO-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/UCD-DISKIO-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/UCD-DLMOD-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/UCD-IPFWACC-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/UCD-SNMP-MIB.txt -/usr/local/MariaDB/Columnstore/share/snmp/mibs/UDP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/AGENTX-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/CALPONT-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/DISMAN-EVENT-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/DISMAN-SCRIPT-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/EtherLike-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/HCNUM-TC.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/HOST-RESOURCES-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/HOST-RESOURCES-TYPES.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IANAifType-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IANA-LANGUAGE-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IANA-RTPROTO-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IF-INVERTED-STACK-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IF-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/INET-ADDRESS-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IP-FORWARD-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IPV6-ICMP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IPV6-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IPV6-TCP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IPV6-TC.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/IPV6-UDP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/NET-SNMP-AGENT-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/NET-SNMP-EXTEND-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/NET-SNMP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/NET-SNMP-TC.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/NOTIFICATION-LOG-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/RFC1155-SMI.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/RFC1213-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/RFC-1215.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/RMON-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SMUX-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-COMMUNITY-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-MPD-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-PROXY-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-TARGET-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-USM-AES-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMPv2-CONF.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMPv2-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMPv2-SMI.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMPv2-TC.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMPv2-TM.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/TCP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/TRANSPORT-ADDRESS-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/UCD-DEMO-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/UCD-DISKIO-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/UCD-DLMOD-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/UCD-IPFWACC-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/UCD-SNMP-MIB.txt +/usr/local/mariadb/columnstore/share/snmp/mibs/UDP-MIB.txt # -/usr/local/MariaDB/Columnstore/post/functions -/usr/local/MariaDB/Columnstore/post/test-001.sh -/usr/local/MariaDB/Columnstore/post/test-002.sh -/usr/local/MariaDB/Columnstore/post/test-003.sh -/usr/local/MariaDB/Columnstore/post/test-004.sh +/usr/local/mariadb/columnstore/post/functions +/usr/local/mariadb/columnstore/post/test-001.sh +/usr/local/mariadb/columnstore/post/test-002.sh +/usr/local/mariadb/columnstore/post/test-003.sh +/usr/local/mariadb/columnstore/post/test-004.sh %files enterprise %defattr(-, root, root) -/usr/local/MariaDB/Columnstore/bin/displayJobGraph.sh -/usr/local/MariaDB/Columnstore/bin/dbhealth.sh -/usr/local/MariaDB/Columnstore/bin/dbhealth.sql +/usr/local/mariadb/columnstore/bin/displayJobGraph.sh +/usr/local/mariadb/columnstore/bin/dbhealth.sh +/usr/local/mariadb/columnstore/bin/dbhealth.sql # Tools... -/usr/local/MariaDB/Columnstore/bin/dumpcol -/usr/local/MariaDB/Columnstore/bin/oid2file -/usr/local/MariaDB/Columnstore/bin/evalcol -/usr/local/MariaDB/Columnstore/bin/SesMgr -/usr/local/MariaDB/Columnstore/bin/dumpVss -/usr/local/MariaDB/Columnstore/bin/editTxn -/usr/local/MariaDB/Columnstore/bin/dbprof.pl -/usr/local/MariaDB/Columnstore/bin/dumpobm -/usr/local/MariaDB/Columnstore/bin/file2oid.pl -/usr/local/MariaDB/Columnstore/bin/print_journal -/usr/local/MariaDB/Columnstore/bin/healthcheck -/usr/local/MariaDB/Columnstore/bin/glusterctl -/usr/local/MariaDB/Columnstore/bin/glusteradd -/usr/local/MariaDB/Columnstore/bin/glusterconf -/usr/local/MariaDB/Columnstore/bin/redistributeDB -/usr/local/MariaDB/Columnstore/bin/databaseSizeReport -/usr/local/MariaDB/Columnstore/bin/gdb +/usr/local/mariadb/columnstore/bin/dumpcol +/usr/local/mariadb/columnstore/bin/oid2file +/usr/local/mariadb/columnstore/bin/evalcol +/usr/local/mariadb/columnstore/bin/SesMgr +/usr/local/mariadb/columnstore/bin/dumpVss +/usr/local/mariadb/columnstore/bin/editTxn +/usr/local/mariadb/columnstore/bin/dbprof.pl +/usr/local/mariadb/columnstore/bin/dumpobm +/usr/local/mariadb/columnstore/bin/file2oid.pl +/usr/local/mariadb/columnstore/bin/print_journal +/usr/local/mariadb/columnstore/bin/healthcheck +/usr/local/mariadb/columnstore/bin/glusterctl +/usr/local/mariadb/columnstore/bin/glusteradd +/usr/local/mariadb/columnstore/bin/glusterconf +/usr/local/mariadb/columnstore/bin/redistributeDB +/usr/local/mariadb/columnstore/bin/databaseSizeReport +/usr/local/mariadb/columnstore/bin/gdb # -/usr/local/MariaDB/Columnstore/tools/copy2here.sh -/usr/local/MariaDB/Columnstore/tools/getlogs.sh -/usr/local/MariaDB/Columnstore/tools/getmodules.sh -/usr/local/MariaDB/Columnstore/tools/getps.sh -/usr/local/MariaDB/Columnstore/tools/getsar.sh -/usr/local/MariaDB/Columnstore/tools/getuserinput.sh -/usr/local/MariaDB/Columnstore/tools/prat -/usr/local/MariaDB/Columnstore/tools/prat.sh -/usr/local/MariaDB/Columnstore/tools/ps -/usr/local/MariaDB/Columnstore/tools/pscollect -/usr/local/MariaDB/Columnstore/tools/README -/usr/local/MariaDB/Columnstore/tools/tarfiles.sh +/usr/local/mariadb/columnstore/tools/copy2here.sh +/usr/local/mariadb/columnstore/tools/getlogs.sh +/usr/local/mariadb/columnstore/tools/getmodules.sh +/usr/local/mariadb/columnstore/tools/getps.sh +/usr/local/mariadb/columnstore/tools/getsar.sh +/usr/local/mariadb/columnstore/tools/getuserinput.sh +/usr/local/mariadb/columnstore/tools/prat +/usr/local/mariadb/columnstore/tools/prat.sh +/usr/local/mariadb/columnstore/tools/ps +/usr/local/mariadb/columnstore/tools/pscollect +/usr/local/mariadb/columnstore/tools/README +/usr/local/mariadb/columnstore/tools/tarfiles.sh # %files libs %defattr(-, root, root) -/usr/local/MariaDB/Columnstore/lib/libconfigcpp.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libddlpackageproc.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libddlpackage.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libdmlpackageproc.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libdmlpackage.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libexecplan.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libfuncexp.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libudfsdk.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libjoblist.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libjoiner.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libloggingcpp.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libmessageqcpp.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libnetsnmpagent.so.5.2.1 -/usr/local/MariaDB/Columnstore/lib/libnetsnmphelpers.so.5.2.1 -/usr/local/MariaDB/Columnstore/lib/libnetsnmpmibs.so.5.2.1 -/usr/local/MariaDB/Columnstore/lib/libnetsnmp.so.5.2.1 -/usr/local/MariaDB/Columnstore/lib/libnetsnmptrapd.so.5.2.1 -/usr/local/MariaDB/Columnstore/lib/liboamcpp.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libsnmpmanager.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libthreadpool.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libwindowfunction.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libwriteengine.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libwriteengineclient.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libbrm.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/librwlock.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libdataconvert.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/librowgroup.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libcacheutils.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libcommon.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libboost_idb.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libcompress.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libddlcleanuputil.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libbatchloader.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libmysqlcl_idb.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libquerystats.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libwriteengineredistribute.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libjemalloc.so.3.3.0 -/usr/local/MariaDB/Columnstore/lib/libidbdatafile.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/hdfs-20.so -/usr/local/MariaDB/Columnstore/lib/hdfs-12.so -/usr/local/MariaDB/Columnstore/lib/libgcc_s.so.1 -/usr/local/MariaDB/Columnstore/lib/libstdc++.so.6.0.14 -/usr/local/MariaDB/Columnstore/lib/libthrift.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libquerytele.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libconfigcpp.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libddlpackageproc.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libddlpackage.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libdmlpackageproc.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libdmlpackage.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libexecplan.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libfuncexp.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libudfsdk.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libjoblist.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libjoiner.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libloggingcpp.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libmessageqcpp.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libnetsnmpagent.so.5.2.1 +/usr/local/mariadb/columnstore/lib/libnetsnmphelpers.so.5.2.1 +/usr/local/mariadb/columnstore/lib/libnetsnmpmibs.so.5.2.1 +/usr/local/mariadb/columnstore/lib/libnetsnmp.so.5.2.1 +/usr/local/mariadb/columnstore/lib/libnetsnmptrapd.so.5.2.1 +/usr/local/mariadb/columnstore/lib/liboamcpp.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libsnmpmanager.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libthreadpool.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libwindowfunction.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libwriteengine.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libwriteengineclient.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libbrm.so.1.0.0 +/usr/local/mariadb/columnstore/lib/librwlock.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libdataconvert.so.1.0.0 +/usr/local/mariadb/columnstore/lib/librowgroup.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libcacheutils.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libcommon.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libboost_idb.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libcompress.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libddlcleanuputil.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libbatchloader.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libmysqlcl_idb.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libquerystats.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libwriteengineredistribute.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libjemalloc.so.3.3.0 +/usr/local/mariadb/columnstore/lib/libidbdatafile.so.1.0.0 +/usr/local/mariadb/columnstore/lib/hdfs-20.so +/usr/local/mariadb/columnstore/lib/hdfs-12.so +/usr/local/mariadb/columnstore/lib/libgcc_s.so.1 +/usr/local/mariadb/columnstore/lib/libstdc++.so.6.0.14 +/usr/local/mariadb/columnstore/lib/libthrift.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libquerytele.so.1.0.0 %files storage-engine -/usr/local/MariaDB/Columnstore/lib/libcalmysql.so.1.0.0 -/usr/local/MariaDB/Columnstore/lib/libudf_mysql.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libcalmysql.so.1.0.0 +/usr/local/mariadb/columnstore/lib/libudf_mysql.so.1.0.0 -/usr/local/MariaDB/Columnstore/mysql/mysql-Calpont -/usr/local/MariaDB/Columnstore/mysql/install_calpont_mysql.sh -/usr/local/MariaDB/Columnstore/mysql/syscatalog_mysql.sql -/usr/local/MariaDB/Columnstore/mysql/dumpcat_mysql.sql -/usr/local/MariaDB/Columnstore/mysql/dumpcat.pl -/usr/local/MariaDB/Columnstore/mysql/calsetuserpriority.sql -/usr/local/MariaDB/Columnstore/mysql/calremoveuserpriority.sql -/usr/local/MariaDB/Columnstore/mysql/calshowprocesslist.sql +/usr/local/mariadb/columnstore/mysql/mysql-Calpont +/usr/local/mariadb/columnstore/mysql/install_calpont_mysql.sh +/usr/local/mariadb/columnstore/mysql/syscatalog_mysql.sql +/usr/local/mariadb/columnstore/mysql/dumpcat_mysql.sql +/usr/local/mariadb/columnstore/mysql/dumpcat.pl +/usr/local/mariadb/columnstore/mysql/calsetuserpriority.sql +/usr/local/mariadb/columnstore/mysql/calremoveuserpriority.sql +/usr/local/mariadb/columnstore/mysql/calshowprocesslist.sql -%config /usr/local/MariaDB/Columnstore/mysql/my.cnf +%config /usr/local/mariadb/columnstore/mysql/my.cnf # # Scriptlets @@ -376,7 +376,7 @@ fi prefix=/usr/local -test -x /usr/local/MariaDB/Columnstore/bin/post-install && /usr/local/MariaDB/Columnstore/bin/post-install --prefix=$prefix --rpmmode=$rpmmode +test -x /usr/local/mariadb/columnstore/bin/post-install && /usr/local/mariadb/columnstore/bin/post-install --prefix=$prefix --rpmmode=$rpmmode echo "InfinIDB RPM install completed" @@ -428,7 +428,7 @@ else fi if [ $rpmmode = erase ]; then - test -x /usr/local/MariaDB/Columnstore/bin/pre-uninstall && /usr/local/MariaDB/Columnstore/bin/pre-uninstall + test -x /usr/local/mariadb/columnstore/bin/pre-uninstall && /usr/local/mariadb/columnstore/bin/pre-uninstall fi exit 0 diff --git a/copyright.txt2 b/copyright.txt2 new file mode 100644 index 000000000..a0678d32a --- /dev/null +++ b/copyright.txt2 @@ -0,0 +1,179 @@ +build/columnstore.community.spec.in +build/columnstore.spec.in +build/columnstore.spec.in~ +build/infinidb.spec.in +ChangeLog +ChangeLog~ +config.log +config.log~ +configure +dbcon/ddlpackage/ddl-gram.cpp +dbcon/ddlpackage/ddl-gram.h +dbcon/ddlpackageproc/createtableprocessor.cpp +dbcon/dmlpackage/dml-gram.cpp +dbcon/dmlpackage/dml-gram.h +dbcon/execplan/calpontsystemcatalog.cpp +dbcon/execplan/calpontsystemcatalog.h +dbcon/execplan/tdriver.cpp +dbcon/execplan/tdriver-sm.cpp +dbcon/joblist/jlf_common.cpp +dbcon/joblist/joblist.cpp +dbcon/joblist/joblistfactory.cpp +dbcon/joblist/joblist.h +dbcon/joblist/largehashjoin.cpp +dbcon/joblist/Makefile +dbcon/joblist/tdriver-agg.cpp +dbcon/mysql/ha_calpont.cpp +dbcon/mysql/ha_calpont_ddl.cpp +dbcon/mysql/ha_calpont_dml.cpp +dbcon/mysql/ha_calpont_execplan.cpp +dbcon/mysql/ha_calpont.h +dbcon/mysql/ha_calpont_impl.cpp +dbcon/mysql/ha_calpont_impl.h +dbcon/mysql/ha_calpont_impl_if.h +dbcon/mysql/ha_calpont_partition.cpp +dbcon/mysql/ha_calpont_udf.cpp +dbcon/mysql/ha_exists_sub.cpp +dbcon/mysql/ha_from_sub.cpp +dbcon/mysql/ha_in_sub.cpp +dbcon/mysql/ha_scalar_sub.cpp +dbcon/mysql/ha_select_sub.cpp +dbcon/mysql/ha_subquery.h +dbcon/mysql/ha_view.cpp +dbcon/mysql/ha_window_function.cpp +dbcon/mysql/Makefile +dbcon/mysql/Makefile.am +dbcon/mysql/Makefile.in +dbcon/mysql/mysql-Calpont +dbcon/mysql/mysql-Columnstore +ddlproc/Makefile +decomsvr/Makefile +dmlproc/Makefile +exemgr/main.cpp +exemgr/Makefile +INSTALL +INSTALL~ +libtool +libtool~ +Makefile.tar +oamapps/calpontConsole/calpontConsole.cpp +oamapps/calpontConsole/calpontConsole.h +oamapps/calpontConsole/Makefile +oamapps/calpontDB/calpontDB.cpp +oamapps/calpontDB/Makefile +oamapps/calpontSupport/calpontSupport.cpp +oamapps/calpontSupport/Makefile +oamapps/columnstoreDB/columnstoreDB.cpp +oamapps/columnstoreDB/Makefile +oamapps/columnstoreSupport/calpontSupport.cpp +oamapps/columnstoreSupport/columnstoreSupport.cpp +oamapps/columnstoreSupport/Makefile +oamapps/columnstoreSupport/Makefile.am +oamapps/columnstoreSupport/Makefile.in +oamapps/hardwareMonitor/Makefile +oamapps/Makefile +oamapps/Makefile.am +oamapps/Makefile.in +oamapps/mcsadmin/1 +oamapps/mcsadmin/Makefile +oamapps/mcsadmin/mcsadmin.cpp +oamapps/mcsadmin/mcsadmin.h +oamapps/postConfigure/amazonInstaller.cpp +oamapps/postConfigure/helpers.cpp +oamapps/postConfigure/helpers.h +oamapps/postConfigure/installer.cpp +oamapps/postConfigure/Makefile +oamapps/postConfigure/mycnfUpgrade.cpp +oamapps/postConfigure/patchInstaller.cpp +oamapps/postConfigure/postConfigure.cpp +oamapps/replayTransactionLog/Makefile +oamapps/resourceMonitor/Makefile +oamapps/resourceMonitor/resourceMonitor.cpp +oamapps/sendtrap/Makefile +oamapps/serverMonitor/cpuMonitor.cpp +oamapps/serverMonitor/dbhealthMonitor.cpp +oamapps/serverMonitor/diskMonitor.cpp +oamapps/serverMonitor/Makefile +oamapps/serverMonitor/memoryMonitor.cpp +oamapps/serverMonitor/msgProcessor.cpp +oamapps/sessionWalker/Makefile +oamapps/traphandler/Makefile +oam/install_scripts/Makefile +oam/oamcpp/liboamcpp.cpp +oam/oamcpp/liboamcpp.h +oam/oamcpp/Makefile +oam/oamcpp/oamcache.cpp +oam/oamcpp/oamcache.h +oam/replaytxnlog/Makefile +oam/replaytxnlog/replaytxnlog.cpp +primitives/blockcache/blockrequestprocessor.cpp +primitives/blockcache/filebuffermgr.cpp +primitives/blockcache/iomanager.cpp +primitives/blockcache/stats.cpp +primitives/primproc/batchprimitiveprocessor.cpp +primitives/primproc/bppseeder.cpp +primitives/primproc/Makefile +primitives/primproc/primitiveserver.cpp +primitives/primproc/primitiveserver.h +primitives/primproc/primproc.cpp +procmgr/main.cpp +procmgr/Makefile +procmgr/processmanager.cpp +procmgr/processmanager.h +procmon/main.cpp +procmon/Makefile +procmon/processmonitor.cpp +snmpd/snmpmanager/snmpglobal.h +tools/bincvt/Makefile +tools/clearShm/Makefile +tools/cleartablelock/Makefile +tools/configMgt/autoConfigure.cpp +tools/configMgt/autoInstaller.cpp +tools/configMgt/configure.cpp +tools/configMgt/Makefile +tools/configMgt/stackReleaseChecker.cpp +tools/cplogger/Makefile +tools/dbbuilder/Makefile +tools/dbloadxml/Makefile +tools/ddlcleanup/Makefile +tools/ddldriver/Makefile +tools/dmldriver/Makefile +tools/editem/Makefile +tools/getConfig/Makefile +tools/hdfsCheck/Makefile +tools/idbmeminfo/Makefile +tools/notificationTester/Makefile +tools/qfe/Makefile +tools/setConfig/Makefile +tools/viewtablelock/Makefile +utils/autoconf/INSTALL +utils/autoconf/INSTALL~ +utils/dataconvert/Makefile +utils/funcexp/func_from_unixtime.cpp +utils/funcexp/func_nullif.cpp +utils/funcexp/Makefile +utils/idbdatafile/Makefile +utils/infinidb_hadoop/src/infinidb/hadoop/example/InfiniDBOutputDriver.java +utils/infinidb_hadoop/src/infinidb/hadoop/example/InfiniDBOutputDriver.java~ +utils/loggingcpp/errorids.h +utils/loggingcpp/messagelog.cpp +utils/loggingcpp/tdriver.cpp +utils/mysqlcl_idb/Makefile +utils/net-snmp/net-snmp-config.h +utils/querystats/Makefile +utils/startup/installdir.cpp +utils/testbc/stats.cpp +utils/udfsdk/Makefile +utils/udfsdk/udfinfinidb.cpp +utils/udfsdk/udfsdk.h +versioning/BRM/Makefile +versioning/BRM/slavecomm.cpp +versioning/BRM/tracer.cpp +versioning/BRM/tracer.h +writeengine/bulk/Makefile +writeengine/redistribute/we_redistributecontrol.cpp +writeengine/redistribute/we_redistributecontrolthread.cpp +writeengine/server/Makefile +writeengine/splitter/Makefile +writeengine/splitter/we_cmdargs.cpp +writeengine/wrapper/tdriver.cpp diff --git a/dbcon/ddlpackageproc/createtableprocessor.cpp b/dbcon/ddlpackageproc/createtableprocessor.cpp index e0ebdb6f3..eb33de84a 100644 --- a/dbcon/ddlpackageproc/createtableprocessor.cpp +++ b/dbcon/ddlpackageproc/createtableprocessor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/execplan/calpontsystemcatalog.cpp b/dbcon/execplan/calpontsystemcatalog.cpp index d94598eb7..ff200db4b 100644 --- a/dbcon/execplan/calpontsystemcatalog.cpp +++ b/dbcon/execplan/calpontsystemcatalog.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/execplan/calpontsystemcatalog.h b/dbcon/execplan/calpontsystemcatalog.h index 3ef4a53b2..d00e55ef5 100644 --- a/dbcon/execplan/calpontsystemcatalog.h +++ b/dbcon/execplan/calpontsystemcatalog.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/execplan/tdriver-sm.cpp b/dbcon/execplan/tdriver-sm.cpp index 817d41a77..8053a6a17 100644 --- a/dbcon/execplan/tdriver-sm.cpp +++ b/dbcon/execplan/tdriver-sm.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -148,7 +148,7 @@ public: void destroySemaphores() { key_t semkey; - char* semseed = "/usr/local/MariaDB/Columnstore/etc/Calpont.xml"; + char* semseed = "/usr/local/mariadb/columnstore/etc/Calpont.xml"; int sems, err; // semkey = ftok(semseed, 0x2149bdd2); // these things must match in the SM constructor @@ -166,7 +166,7 @@ public: void destroyShmseg() { key_t shmkey; - char* shmseed = "/usr/local/MariaDB/Columnstore/etc/Calpont.xml"; + char* shmseed = "/usr/local/mariadb/columnstore/etc/Calpont.xml"; int shms, err; // shmkey = ftok(shmseed, 0x2149bdd2); // these things much match in the SM constructor diff --git a/dbcon/execplan/tdriver.cpp b/dbcon/execplan/tdriver.cpp index b9da4e6ff..6fa54fd20 100644 --- a/dbcon/execplan/tdriver.cpp +++ b/dbcon/execplan/tdriver.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1082,7 +1082,7 @@ public: int oid, oidBase; // fake out the objmgr... - setenv("CALPONT_CONFIG_FILE", "/usr/local/MariaDB/Columnstore/etc/Calpont.xml", 1); + setenv("CALPONT_CONFIG_FILE", "/usr/local/mariadb/columnstore/etc/Calpont.xml", 1); Config* cf = Config::makeConfig(); cf->setConfig("OIDManager", "OIDBitmapFile", "./oidbitmap"); diff --git a/dbcon/joblist/fdtests.pl b/dbcon/joblist/fdtests.pl index 8455718b4..382d4caa7 100755 --- a/dbcon/joblist/fdtests.pl +++ b/dbcon/joblist/fdtests.pl @@ -6,7 +6,7 @@ use DBI; use DBD::mysql; $databasename='calpont'; -$cnffile='/usr/local/MariaDB/Columnstore/mysql/my.cnf'; +$cnffile='/usr/local/mariadb/columnstore/mysql/my.cnf'; $data_source = 'DBI:mysql:database=' . $databasename . ':mysql_read_default_file=' . $cnffile . ''; $username = 'root'; diff --git a/dbcon/joblist/jlf_common.cpp b/dbcon/joblist/jlf_common.cpp index c7c5470b7..ff32ced8f 100644 --- a/dbcon/joblist/jlf_common.cpp +++ b/dbcon/joblist/jlf_common.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/joblist/joblist.cpp b/dbcon/joblist/joblist.cpp index 1aab1bdfb..c21a7dea0 100644 --- a/dbcon/joblist/joblist.cpp +++ b/dbcon/joblist/joblist.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/joblist/joblist.h b/dbcon/joblist/joblist.h index c64f62833..fb7df6553 100644 --- a/dbcon/joblist/joblist.h +++ b/dbcon/joblist/joblist.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/joblist/joblistfactory.cpp b/dbcon/joblist/joblistfactory.cpp index 10f8fbd0a..284884e91 100644 --- a/dbcon/joblist/joblistfactory.cpp +++ b/dbcon/joblist/joblistfactory.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/joblist/largehashjoin.cpp b/dbcon/joblist/largehashjoin.cpp index ddab57450..37b6e4cb1 100644 --- a/dbcon/joblist/largehashjoin.cpp +++ b/dbcon/joblist/largehashjoin.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -42,7 +42,7 @@ namespace void logDiskIoInfo(uint64_t stepId, const AnyDataListSPtr& spdl) { boost::mutex::scoped_lock lk(fileLock_g); - ofstream umDiskIoFile("/var/log/Columnstore/trace/umdiskio.log", ios_base::app); + ofstream umDiskIoFile("/var/log/mariadb/columnstore/trace/umdiskio.log", ios_base::app); CalpontSystemCatalog::OID oid; uint64_t maxBuckets = 0; @@ -106,7 +106,7 @@ void logDiskIoInfo(uint64_t stepId, const AnyDataListSPtr& spdl) // move the current file to bak when size above .5 G, so total log is 1 G if (curPos > 0x20000000) { - (void)system("/bin/mv /var/log/Columnstore/trace/umdiskio.log /var/log/Columnstore/trace/umdiskio.bak"); + (void)system("/bin/mv /var/log/mariadb/columnstore/trace/umdiskio.log /var/log/mariadb/columnstore/trace/umdiskio.bak"); } } diff --git a/dbcon/joblist/tdriver-agg.cpp b/dbcon/joblist/tdriver-agg.cpp index 7b3778b9f..48b3bf803 100644 --- a/dbcon/joblist/tdriver-agg.cpp +++ b/dbcon/joblist/tdriver-agg.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -65,7 +65,7 @@ const uint32_t MAX_SIZE = 0x100000; const uint32_t MAX_ELEMENTS = 0x20000; const uint32_t NUM_THREADS = 4; const string datapath="/home/zzhu/genii/tools/dbbuilder/lineitem.tbl"; -//const string datapath="/usr/local/MariaDB/Columnstore/bin/lineitem.tbl"; +//const string datapath="/usr/local/mariadb/columnstore/bin/lineitem.tbl"; int numConsumers = 1; int numRuns = 1; int printInterval = numRuns * 100000; diff --git a/dbcon/mysql/Makefile.am b/dbcon/mysql/Makefile.am index c305cda80..4de8af195 100644 --- a/dbcon/mysql/Makefile.am +++ b/dbcon/mysql/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2014 InfiniDB, Inc. +# Copyright (C) 2016 MariaDB, Corporation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/dumpcat.pl b/dbcon/mysql/dumpcat.pl index 1a4641102..9e63bc1c6 100755 --- a/dbcon/mysql/dumpcat.pl +++ b/dbcon/mysql/dumpcat.pl @@ -5,7 +5,7 @@ use DBI; use DBD::mysql; -$data_source = 'DBI:mysql:database=calpontsys:mysql_read_default_file=/usr/local/MariaDB/Columnstore/mysql/my.cnf'; +$data_source = 'DBI:mysql:database=calpontsys:mysql_read_default_file=/usr/local/mariadb/columnstore/mysql/my.cnf'; $username = 'root'; $auth = ''; %attr = (); diff --git a/dbcon/mysql/ha_calpont.cpp b/dbcon/mysql/ha_calpont.cpp index 2103cb103..396011a2b 100755 --- a/dbcon/mysql/ha_calpont.cpp +++ b/dbcon/mysql/ha_calpont.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont.h b/dbcon/mysql/ha_calpont.h index 5db3e07cb..6e1eccc5d 100755 --- a/dbcon/mysql/ha_calpont.h +++ b/dbcon/mysql/ha_calpont.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont_ddl.cpp b/dbcon/mysql/ha_calpont_ddl.cpp index acad2100b..82cc2a5e7 100755 --- a/dbcon/mysql/ha_calpont_ddl.cpp +++ b/dbcon/mysql/ha_calpont_ddl.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont_dml.cpp b/dbcon/mysql/ha_calpont_dml.cpp index 017b1f4b0..c4e94e29c 100755 --- a/dbcon/mysql/ha_calpont_dml.cpp +++ b/dbcon/mysql/ha_calpont_dml.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp index 026af72f7..be8eea8dc 100755 --- a/dbcon/mysql/ha_calpont_execplan.cpp +++ b/dbcon/mysql/ha_calpont_execplan.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp index 91b382413..d52317514 100755 --- a/dbcon/mysql/ha_calpont_impl.cpp +++ b/dbcon/mysql/ha_calpont_impl.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont_impl.h b/dbcon/mysql/ha_calpont_impl.h index 8e03f7806..905249d88 100644 --- a/dbcon/mysql/ha_calpont_impl.h +++ b/dbcon/mysql/ha_calpont_impl.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont_impl_if.h b/dbcon/mysql/ha_calpont_impl_if.h index 657f1a763..8b7a145ed 100644 --- a/dbcon/mysql/ha_calpont_impl_if.h +++ b/dbcon/mysql/ha_calpont_impl_if.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont_partition.cpp b/dbcon/mysql/ha_calpont_partition.cpp index 39713f3cc..91c6cc66e 100755 --- a/dbcon/mysql/ha_calpont_partition.cpp +++ b/dbcon/mysql/ha_calpont_partition.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont_udf.cpp b/dbcon/mysql/ha_calpont_udf.cpp index 3f088b13f..94dda4a2b 100755 --- a/dbcon/mysql/ha_calpont_udf.cpp +++ b/dbcon/mysql/ha_calpont_udf.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_exists_sub.cpp b/dbcon/mysql/ha_exists_sub.cpp index 9659b0a96..2c9382e4a 100755 --- a/dbcon/mysql/ha_exists_sub.cpp +++ b/dbcon/mysql/ha_exists_sub.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_from_sub.cpp b/dbcon/mysql/ha_from_sub.cpp index a5c1cef42..29712ea67 100755 --- a/dbcon/mysql/ha_from_sub.cpp +++ b/dbcon/mysql/ha_from_sub.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_in_sub.cpp b/dbcon/mysql/ha_in_sub.cpp index cb406ba66..69e2d5f7b 100755 --- a/dbcon/mysql/ha_in_sub.cpp +++ b/dbcon/mysql/ha_in_sub.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_scalar_sub.cpp b/dbcon/mysql/ha_scalar_sub.cpp index 7e7a3459e..2c6fd79c2 100755 --- a/dbcon/mysql/ha_scalar_sub.cpp +++ b/dbcon/mysql/ha_scalar_sub.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_select_sub.cpp b/dbcon/mysql/ha_select_sub.cpp index a0e4ec37f..8e21a01da 100755 --- a/dbcon/mysql/ha_select_sub.cpp +++ b/dbcon/mysql/ha_select_sub.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_subquery.h b/dbcon/mysql/ha_subquery.h index 4a34d3f88..373112b8f 100755 --- a/dbcon/mysql/ha_subquery.h +++ b/dbcon/mysql/ha_subquery.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_view.cpp b/dbcon/mysql/ha_view.cpp index a99573fa0..e22e888c8 100755 --- a/dbcon/mysql/ha_view.cpp +++ b/dbcon/mysql/ha_view.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_window_function.cpp b/dbcon/mysql/ha_window_function.cpp index 2d17965c4..7b3ee738b 100755 --- a/dbcon/mysql/ha_window_function.cpp +++ b/dbcon/mysql/ha_window_function.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/install_calpont_mysql.sh b/dbcon/mysql/install_calpont_mysql.sh index 44b3a6d9e..b8e152654 100755 --- a/dbcon/mysql/install_calpont_mysql.sh +++ b/dbcon/mysql/install_calpont_mysql.sh @@ -4,14 +4,14 @@ # prefix=/usr/local -installdir=$prefix/MariaDB/Columnstore +installdir=$prefix/mariadb/columnstore rpmmode=install pwprompt=" " for arg in "$@"; do if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then prefix="`echo $arg | awk -F= '{print $2}'`" - installdir=$prefix/MariaDB/Columnstore + installdir=$prefix/mariadb/columnstore elif [ `expr -- "$arg" : '--rpmmode='` -eq 10 ]; then rpmmode="`echo $arg | awk -F= '{print $2}'`" elif [ `expr -- "$arg" : '--password='` -eq 11 ]; then diff --git a/dbcon/mysql/my.cnf b/dbcon/mysql/my.cnf index 243c774cc..ed9f5fe19 100644 --- a/dbcon/mysql/my.cnf +++ b/dbcon/mysql/my.cnf @@ -20,15 +20,15 @@ [client] #password = your_password port = 3306 -socket = /usr/local/MariaDB/Columnstore/mysql/lib/mysql/mysql.sock +socket = /usr/local/mariadb/columnstore/mysql/lib/mysql/mysql.sock # Here follows entries for some specific programs # The MySQL server [mysqld] port = 3306 -socket = /usr/local/MariaDB/Columnstore/mysql/lib/mysql/mysql.sock -datadir = /usr/local/MariaDB/Columnstore/mysql/db +socket = /usr/local/mariadb/columnstore/mysql/lib/mysql/mysql.sock +datadir = /usr/local/mariadb/columnstore/mysql/db skip-external-locking key_buffer_size = 512M max_allowed_packet = 1M @@ -62,10 +62,10 @@ infinidb_um_mem_limit=0 infinidb_use_import_for_batchinsert=1 infinidb_import_for_batchinsert_delimiter=7 -basedir = /usr/local/MariaDB/Columnstore/mysql/ -character-sets-dir = /usr/local/MariaDB/Columnstore/mysql/share/mysql/charsets/ -language = /usr/local/MariaDB/Columnstore/mysql/share/mysql/english/ -plugin_dir = /usr/local/MariaDB/Columnstore/mysql/lib64/mysql/plugin +basedir = /usr/local/mariadb/columnstore/mysql/ +character-sets-dir = /usr/local/mariadb/columnstore/mysql/share/mysql/charsets/ +language = /usr/local/mariadb/columnstore/mysql/share/mysql/english/ +plugin_dir = /usr/local/mariadb/columnstore/mysql/lib64/mysql/plugin # Don't listen on a TCP/IP port at all. This can be a security enhancement, # if all processes that need to connect to mysqld run on the same host. @@ -134,20 +134,20 @@ slave-skip-errors=all #master-port = # # binary logging - not required for slaves, but recommended -log-bin=/usr/local/MariaDB/Columnstore/mysql/db/mysql-bin -relay-log=/usr/local/MariaDB/Columnstore/mysql/db/relay-bin -relay-log-index = /usr/local/MariaDB/Columnstore/mysql/db/relay-bin.index -relay-log-info-file = /usr/local/MariaDB/Columnstore/mysql/db/relay-bin.info +log-bin=/usr/local/mariadb/columnstore/mysql/db/mysql-bin +relay-log=/usr/local/mariadb/columnstore/mysql/db/relay-bin +relay-log-index = /usr/local/mariadb/columnstore/mysql/db/relay-bin.index +relay-log-info-file = /usr/local/mariadb/columnstore/mysql/db/relay-bin.info # Point the following paths to different dedicated disks #tmpdir = /tmp/ #log-update = /path-to-dedicated-directory/hostname # Uncomment the following if you are using InnoDB tables -#innodb_data_home_dir = /usr/local/MariaDB/Columnstore/mysql/lib/mysql/ +#innodb_data_home_dir = /usr/local/mariadb/columnstore/mysql/lib/mysql/ #innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend -#innodb_log_group_home_dir = /usr/local/MariaDB/Columnstore/mysql/lib/mysql/ -#innodb_log_arch_dir = /usr/local/MariaDB/Columnstore/mysql/lib/mysql/ +#innodb_log_group_home_dir = /usr/local/mariadb/columnstore/mysql/lib/mysql/ +#innodb_log_arch_dir = /usr/local/mariadb/columnstore/mysql/lib/mysql/ # You can set .._buffer_pool_size up to 50 - 80 % # of RAM but beware of setting memory usage too high #innodb_buffer_pool_size = 384M diff --git a/dbcon/mysql/mysql-Columnstore b/dbcon/mysql/mysql-Columnstore index fda4f41aa..0fa46869c 100755 --- a/dbcon/mysql/mysql-Columnstore +++ b/dbcon/mysql/mysql-Columnstore @@ -25,7 +25,7 @@ # Description: MySQL is a very fast and reliable SQL database engine. ### END INIT INFO -# If you install MySQL on some other places than /usr/local/MariaDB/Columnstore/mysql, then you +# If you install MySQL on some other places than /usr/local/mariadb/columnstore/mysql, then you # have to do one of the following things for this script to work: # # - Run this script from within the MySQL installation directory @@ -43,8 +43,8 @@ # If you change base dir, you must also change datadir. These may get # overwritten by settings in the MySQL configuration files. -basedir=/usr/local/MariaDB/Columnstore/mysql -datadir=/usr/local/MariaDB/Columnstore/mysql/db +basedir=/usr/local/mariadb/columnstore/mysql +datadir=/usr/local/mariadb/columnstore/mysql/db # Default value, in seconds, afterwhich the script should timeout waiting # for server start. @@ -63,7 +63,7 @@ lock_file_path="$lockdir/mysql-Columnstore" mysqld_pid_file_path= if test -z "$basedir" then - basedir=/usr/local/MariaDB/Columnstore/mysql + basedir=/usr/local/mariadb/columnstore/mysql bindir=/usr/local/bin if test -z "$datadir" then @@ -260,7 +260,7 @@ wait_for_ready () { i=0 while test $i -ne $service_startup_timeout ; do - if $bindir/mysqladmin ping --socket=/usr/local/MariaDB/Columnstore/mysql/lib/mysql/mysql.sock >/dev/null 2>&1; then + if $bindir/mysqladmin ping --socket=/usr/local/mariadb/columnstore/mysql/lib/mysql/mysql.sock >/dev/null 2>&1; then log_success_msg return 0 elif kill -0 $! 2>/dev/null ; then diff --git a/dbcon/mysql/schemaSync.pl b/dbcon/mysql/schemaSync.pl index f10705a4b..29b4d8ef4 100755 --- a/dbcon/mysql/schemaSync.pl +++ b/dbcon/mysql/schemaSync.pl @@ -7,7 +7,7 @@ use DBD::mysql; $| = 1; -$cfgfile='/usr/local/MariaDB/Columnstore/mysql/my.cnf'; +$cfgfile='/usr/local/mariadb/columnstore/mysql/my.cnf'; $username = 'root'; $auth = ''; diff --git a/exemgr/main.cpp b/exemgr/main.cpp index e3fcaea3b..543f7f4b3 100644 --- a/exemgr/main.cpp +++ b/exemgr/main.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/net-snmp/net-snmp-5.2.1.2/CalpontConfigure.sh b/net-snmp/net-snmp-5.2.1.2/CalpontConfigure.sh index 2f27d474d..efbeb1625 100755 --- a/net-snmp/net-snmp-5.2.1.2/CalpontConfigure.sh +++ b/net-snmp/net-snmp-5.2.1.2/CalpontConfigure.sh @@ -4,7 +4,7 @@ # # configures and installs net-snmp modules that we need -prefix=/usr/local/MariaDB/Columnstore +prefix=/usr/local/mariadb/columnstore for arg in "$@"; do if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then prefix="`echo $arg | awk -F= '{print $2}'`" diff --git a/oam/cloud/IDBCloudGetIP.sh b/oam/cloud/IDBCloudGetIP.sh index 9d9003d31..bca6d41f0 100644 --- a/oam/cloud/IDBCloudGetIP.sh +++ b/oam/cloud/IDBCloudGetIP.sh @@ -9,23 +9,23 @@ prefix=/usr/local #get instance name from called instanceName="$1" -ec2=`$prefix/MariaDB/Columnstore/bin/getConfig Installation EC2_HOME` +ec2=`$prefix/mariadb/columnstore/bin/getConfig Installation EC2_HOME` if [ $ec2 == "unassigned" ]; then echo "stopped" exit 1 fi -java=`$prefix/MariaDB/Columnstore/bin/getConfig Installation JAVA_HOME` -path=`$prefix/MariaDB/Columnstore/bin/getConfig Installation EC2_PATH` +java=`$prefix/mariadb/columnstore/bin/getConfig Installation JAVA_HOME` +path=`$prefix/mariadb/columnstore/bin/getConfig Installation EC2_PATH` export PATH=$path export EC2_HOME=$ec2 export JAVA_HOME=$java # get x509 Certification and Private Key -x509Cert=`$prefix/MariaDB/Columnstore/bin/getConfig Installation AmazonX509Certificate` -x509PriKey=`$prefix/MariaDB/Columnstore/bin/getConfig Installation AmazonX509PrivateKey` +x509Cert=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonX509Certificate` +x509PriKey=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonX509PrivateKey` #get instance info ec2-describe-instances -C $x509Cert -K $x509PriKey $instanceName > /tmp/instanceInfo 2> /dev/null diff --git a/oam/cloud/IDBInstanceCmds.sh b/oam/cloud/IDBInstanceCmds.sh index 47a75295a..51e446092 100644 --- a/oam/cloud/IDBInstanceCmds.sh +++ b/oam/cloud/IDBInstanceCmds.sh @@ -88,9 +88,9 @@ if [ "$1" = "deassignElasticIP" ]; then fi -test -f /usr/local/MariaDB/Columnstore/post/functions && . /usr/local/MariaDB/Columnstore/post/functions +test -f /usr/local/mariadb/columnstore/post/functions && . /usr/local/mariadb/columnstore/post/functions -ec2=`$prefix/MariaDB/Columnstore/bin/getConfig Installation EC2_HOME` +ec2=`$prefix/mariadb/columnstore/bin/getConfig Installation EC2_HOME` if [ $ec2 == "unassigned" ]; then if [ "$1" = "getPrivateIP" ]; then @@ -102,21 +102,21 @@ if [ $ec2 == "unassigned" ]; then fi fi -java=`$prefix/MariaDB/Columnstore/bin/getConfig Installation JAVA_HOME` -path=`$prefix/MariaDB/Columnstore/bin/getConfig Installation EC2_PATH` +java=`$prefix/mariadb/columnstore/bin/getConfig Installation JAVA_HOME` +path=`$prefix/mariadb/columnstore/bin/getConfig Installation EC2_PATH` export PATH=$path export EC2_HOME=$ec2 export JAVA_HOME=$java # get Keys and region -AmazonAccessKeyFile=`$prefix/MariaDB/Columnstore/bin/getConfig Installation AmazonAccessKey` +AmazonAccessKeyFile=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonAccessKey` if [ $AmazonAccessKeyFile == "unassigned" ]; then echo "FAILED: missing Config Setting AmazonAccessKey : $AmazonAccessKeyfile" exit 1 fi -AmazonSecretKeyFile=`$prefix/MariaDB/Columnstore/bin/getConfig Installation AmazonSecretKey` +AmazonSecretKeyFile=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonSecretKey` if [ $AmazonSecretKeyFile == "unassigned" ]; then echo "FAILED: missing Config Setting AmazonSecretKeyFile : $AmazonSecretKeyFile" exit 1 @@ -125,8 +125,8 @@ fi AmazonAccessKey=`cat $AmazonAccessKeyFile` AmazonSecretKey=`cat $AmazonSecretKeyFile` -Region=`$prefix/MariaDB/Columnstore/bin/getConfig Installation AmazonRegion` -subnet=`$prefix/MariaDB/Columnstore/bin/getConfig Installation AmazonSubNetID` +Region=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonRegion` +subnet=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonSubNetID` if test ! -f $AmazonAccessKeyfile ; then echo "FAILED: missing AmazonAccessKeyfile : $AmazonAccessKeyfile" @@ -193,7 +193,7 @@ getInstancePrivate() { getZone() { #get from Calpont.xml if it's there, if not, get from instance then store - zone=`$prefix/MariaDB/Columnstore/bin/getConfig Installation AmazonZone` + zone=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonZone` if [ "$zone" = "unassigned" ] || [ "$zone" = "" ]; then #get local Instance ID @@ -213,7 +213,7 @@ getZone() { fi zone=`cat $describeInstanceFile | grep -m 1 $instance | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $11}'` fi - $prefix/MariaDB/Columnstore/bin/setConfig Installation AmazonZone $zone + $prefix/mariadb/columnstore/bin/setConfig Installation AmazonZone $zone fi echo $zone diff --git a/oam/cloud/IDBVolumeCmds.sh b/oam/cloud/IDBVolumeCmds.sh index ff7bf1a3f..3d64007b1 100644 --- a/oam/cloud/IDBVolumeCmds.sh +++ b/oam/cloud/IDBVolumeCmds.sh @@ -93,30 +93,30 @@ if [ "$1" = "createTag" ]; then fi -test -f /usr/local/MariaDB/Columnstore/post/functions && . /usr/local/MariaDB/Columnstore/post/functions +test -f /usr/local/mariadb/columnstore/post/functions && . /usr/local/mariadb/columnstore/post/functions -ec2=`$prefix/MariaDB/Columnstore/bin/getConfig Installation EC2_HOME` +ec2=`$prefix/mariadb/columnstore/bin/getConfig Installation EC2_HOME` if [ $ec2 == "unassigned" ]; then STATUS="unknown" RETVAL=1 fi -java=`$prefix/MariaDB/Columnstore/bin/getConfig Installation JAVA_HOME` -path=`$prefix/MariaDB/Columnstore/bin/getConfig Installation EC2_PATH` +java=`$prefix/mariadb/columnstore/bin/getConfig Installation JAVA_HOME` +path=`$prefix/mariadb/columnstore/bin/getConfig Installation EC2_PATH` export PATH=$path export EC2_HOME=$ec2 export JAVA_HOME=$java # get Keys and region -AmazonAccessKeyFile=`$prefix/MariaDB/Columnstore/bin/getConfig Installation AmazonAccessKey` +AmazonAccessKeyFile=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonAccessKey` if [ $AmazonAccessKeyFile == "unassigned" ]; then echo "FAILED: missing Config Setting AmazonAccessKey : $AmazonAccessKeyfile" exit 1 fi -AmazonSecretKeyFile=`$prefix/MariaDB/Columnstore/bin/getConfig Installation AmazonSecretKey` +AmazonSecretKeyFile=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonSecretKey` if [ $AmazonSecretKeyFile == "unassigned" ]; then echo "FAILED: missing Config Setting AmazonSecretKeyFile : $AmazonSecretKeyFile" exit 1 @@ -135,7 +135,7 @@ if test ! -f $AmazonSecretKeyfile ; then exit 1 fi -Region=`$prefix/MariaDB/Columnstore/bin/getConfig Installation AmazonRegion` +Region=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonRegion` checkInfostatus() { @@ -189,21 +189,21 @@ checkInfostatus() { createvolume() { # get zone - zone=`$prefix/MariaDB/Columnstore/bin/IDBInstanceCmds.sh getZone` + zone=`$prefix/mariadb/columnstore/bin/IDBInstanceCmds.sh getZone` if [ $moduleType == "um" ]; then # get type - volumeType=`$prefix/MariaDB/Columnstore/bin/getConfig Installation UMVolumeType` + volumeType=`$prefix/mariadb/columnstore/bin/getConfig Installation UMVolumeType` if [ $volumeType == "io1" ]; then # get IOPS - volumeIOPS=`$prefix/MariaDB/Columnstore/bin/getConfig Installation UMVolumeIOPS` + volumeIOPS=`$prefix/mariadb/columnstore/bin/getConfig Installation UMVolumeIOPS` fi else # pm # get type - volumeType=`$prefix/MariaDB/Columnstore/bin/getConfig Installation PMVolumeType` + volumeType=`$prefix/mariadb/columnstore/bin/getConfig Installation PMVolumeType` if [ $volumeType == "io1" ]; then # get IOPS - volumeIOPS=`$prefix/MariaDB/Columnstore/bin/getConfig Installation PMVolumeIOPS` + volumeIOPS=`$prefix/mariadb/columnstore/bin/getConfig Installation PMVolumeIOPS` fi fi @@ -246,7 +246,7 @@ detachvolume() { ((retries++)) sleep 1 done - test -f /usr/local/MariaDB/Columnstore/post/functions && . /usr/local/MariaDB/Columnstore/post/functions + test -f /usr/local/mariadb/columnstore/post/functions && . /usr/local/mariadb/columnstore/post/functions cplogger -w 100 "detachvolume failed: $STATUS" echo "failed" exit 1 @@ -257,7 +257,7 @@ detachvolume() { exit 0 fi - test -f /usr/local/MariaDB/Columnstore/post/functions && . /usr/local/MariaDB/Columnstore/post/functions + test -f /usr/local/mariadb/columnstore/post/functions && . /usr/local/mariadb/columnstore/post/functions cplogger -w 100 "detachvolume failed status: $STATUS" echo $STATUS exit 1 @@ -281,7 +281,7 @@ attachvolume() { ((retries++)) sleep 1 done - test -f /usr/local/MariaDB/Columnstore/post/functions && . /usr/local/MariaDB/Columnstore/post/functions + test -f /usr/local/mariadb/columnstore/post/functions && . /usr/local/mariadb/columnstore/post/functions cplogger -w 100 "attachvolume failed: $STATUS" echo "failed" exit 1 @@ -292,7 +292,7 @@ attachvolume() { exit 0 fi - test -f /usr/local/MariaDB/Columnstore/post/functions && . /usr/local/MariaDB/Columnstore/post/functions + test -f /usr/local/mariadb/columnstore/post/functions && . /usr/local/mariadb/columnstore/post/functions cplogger -w 100 "attachvolume failed: $STATUS" echo $STATUS exit 1 diff --git a/oam/etc/ProcessConfig.xml b/oam/etc/ProcessConfig.xml index 9557db4b2..1a83d6910 100644 --- a/oam/etc/ProcessConfig.xml +++ b/oam/etc/ProcessConfig.xml @@ -34,7 +34,7 @@ $INSTALLDIR/etc/snmptrapd.conf -C -Lf - /var/log/Columnstore/snmptrapd.log + /var/log/mariadb/columnstore/snmptrapd.log -p /var/run/snmptrapd.pid 1 diff --git a/oam/etc/ProcessConfig.xml.singleserver b/oam/etc/ProcessConfig.xml.singleserver index e9a36bd10..92d8048e4 100644 --- a/oam/etc/ProcessConfig.xml.singleserver +++ b/oam/etc/ProcessConfig.xml.singleserver @@ -4,7 +4,7 @@ ProcessMonitor ChildExtOAMModule - /usr/local/MariaDB/Columnstore/bin/ProcMon + /usr/local/mariadb/columnstore/bin/ProcMon 0 1 @@ -14,7 +14,7 @@ ProcessManager ParentOAMModule - /usr/local/MariaDB/Columnstore/bin/ProcMgr + /usr/local/mariadb/columnstore/bin/ProcMgr 1 2 @@ -24,17 +24,17 @@ SNMPTrapDaemon ParentOAMModule - /usr/local/MariaDB/Columnstore/sbin/snmptrapd - /usr/local/MariaDB/Columnstore/sbin/snmptrapd + /usr/local/mariadb/columnstore/sbin/snmptrapd + /usr/local/mariadb/columnstore/sbin/snmptrapd -M - /usr/local/MariaDB/Columnstore/share/snmp/mibs + /usr/local/mariadb/columnstore/share/snmp/mibs -m - /usr/local/MariaDB/Columnstore/share/snmp/mibs/CALPONT-MIB.txt + /usr/local/mariadb/columnstore/share/snmp/mibs/CALPONT-MIB.txt -c - /usr/local/MariaDB/Columnstore/etc/snmptrapd.conf + /usr/local/mariadb/columnstore/etc/snmptrapd.conf -C -Lf - /usr/local/MariaDB/Columnstore/snmptrapd.log + /usr/local/mariadb/columnstore/snmptrapd.log -p /var/run/snmptrapd.pid 1 @@ -47,8 +47,8 @@ DBRMControllerNode ParentOAMModule - /usr/local/MariaDB/Columnstore/bin/controllernode - /usr/local/MariaDB/Columnstore/bin/controllernode + /usr/local/mariadb/columnstore/bin/controllernode + /usr/local/mariadb/columnstore/bin/controllernode fg 2 4 @@ -60,13 +60,13 @@ SNMPAgent ChildOAMModule - /usr/local/MariaDB/Columnstore/sbin/snmpd - /usr/local/MariaDB/Columnstore/sbin/snmpd + /usr/local/mariadb/columnstore/sbin/snmpd + /usr/local/mariadb/columnstore/sbin/snmpd -c - /usr/local/MariaDB/Columnstore/etc/snmpd.conf + /usr/local/mariadb/columnstore/etc/snmpd.conf -C -Lf - /usr/local/MariaDB/Columnstore/snmpd.log + /usr/local/mariadb/columnstore/snmpd.log -p /var/run/snmpd.pid 0 @@ -78,8 +78,8 @@ ServerMonitor ChildOAMModule - /usr/local/MariaDB/Columnstore/bin/ServerMonitor - /usr/local/MariaDB/Columnstore/bin/ServerMonitor + /usr/local/mariadb/columnstore/bin/ServerMonitor + /usr/local/mariadb/columnstore/bin/ServerMonitor 2 6 @@ -89,8 +89,8 @@ DBRMWorkerNode ChildExtOAMModule - /usr/local/MariaDB/Columnstore/bin/workernode - /usr/local/MariaDB/Columnstore/bin/workernode + /usr/local/mariadb/columnstore/bin/workernode + /usr/local/mariadb/columnstore/bin/workernode DBRM_Worker fg 2 @@ -102,7 +102,7 @@ DecomSvr pm - /usr/local/MariaDB/Columnstore/bin/DecomSvr + /usr/local/mariadb/columnstore/bin/DecomSvr 2 15 @@ -112,7 +112,7 @@ PrimProc pm - /usr/local/MariaDB/Columnstore/bin/PrimProc + /usr/local/mariadb/columnstore/bin/PrimProc 2 20 @@ -122,7 +122,7 @@ ExeMgr pm - /usr/local/MariaDB/Columnstore/bin/ExeMgr + /usr/local/mariadb/columnstore/bin/ExeMgr 2 30 PrimProc @@ -133,7 +133,7 @@ WriteEngineServer pm - /usr/local/MariaDB/Columnstore/bin/WriteEngineServer + /usr/local/mariadb/columnstore/bin/WriteEngineServer 2 40 LOADSHARE @@ -172,7 +172,7 @@ mysqld pm - /usr/local/MariaDB/Columnstore/mysql/libexe/mysqld + /usr/local/mariadb/columnstore/mysql/libexe/mysqld 0 100 diff --git a/oam/install_scripts/binary_installer.sh b/oam/install_scripts/binary_installer.sh index 9952ec566..51c1f116d 100644 --- a/oam/install_scripts/binary_installer.sh +++ b/oam/install_scripts/binary_installer.sh @@ -24,13 +24,14 @@ set PKGTYPE "binary" set SERVERTYPE [lindex $argv 6] set MYSQLPORT [lindex $argv 7] set DEBUG [lindex $argv 8] -set INSTALLDIR "/usr/local/MariaDB/Columnstore" +set INSTALLDIR "/usr/local/mariadb/columnstore" set IDIR [lindex $argv 9] if { $IDIR != "" } { set INSTALLDIR $IDIR } set env(INFINIDB_INSTALL_DIR) $INSTALLDIR set PREFIX [file dirname $INSTALLDIR] +set PREFIX [file dirname $PREFIX] set USERNAME $env(USER) set UNM [lindex $argv 10] if { $UNM != "" } { diff --git a/oam/install_scripts/calpontAlias b/oam/install_scripts/calpontAlias index 61a9afe77..ffc4a4756 100644 --- a/oam/install_scripts/calpontAlias +++ b/oam/install_scripts/calpontAlias @@ -3,11 +3,11 @@ alias mcsmysql='/usr/local/Calpont/mysql/bin/mysql --defaults-file=/usr/local/Calpont/mysql/my.cnf -u root' alias ma=/usr/local/Calpont/bin/mcsadmin alias mcsadmin=/usr/local/Calpont/bin/mcsadmin -alias home='cd /usr/local/MariaDB/Columnstore' -alias log='cd /var/log/Columnstore/' -alias core='cd /var/log/Columnstore/corefiles' +alias home='cd /usr/local/mariadb/columnstore' +alias log='cd /var/log/mariadb/columnstore/' +alias core='cd /var/log/mariadb/columnstore/corefiles' alias tmsg='tail -f /var/log/messages' -alias tdebug='tail -f /var/log/Columnstore/debug.log' -alias tinfo='tail -f /var/log/Columnstore/info.log' +alias tdebug='tail -f /var/log/mariadb/columnstore/debug.log' +alias tinfo='tail -f /var/log/mariadb/columnstore/info.log' alias dbrm='cd /usr/local/Calpont/data1/systemFiles/dbrm' alias module='cat /usr/local/Calpont/local/module' diff --git a/oam/install_scripts/calpontInstall.sh b/oam/install_scripts/calpontInstall.sh index 60474f042..487866519 100755 --- a/oam/install_scripts/calpontInstall.sh +++ b/oam/install_scripts/calpontInstall.sh @@ -13,7 +13,7 @@ set PACKAGE " " set CONFIGFILE " " set DEBUG 0 set NODEPS "-h" -set INSTALLDIR "/usr/local/MariaDB/Columnstore" +set INSTALLDIR "/usr/local/mariadb/columnstore" spawn -noecho /bin/bash diff --git a/oam/install_scripts/calpontLogRotate b/oam/install_scripts/calpontLogRotate index 780d9743d..193d8f6b6 100644 --- a/oam/install_scripts/calpontLogRotate +++ b/oam/install_scripts/calpontLogRotate @@ -3,21 +3,21 @@ # as part of the RPM installation # -/var/log/Columnstore/*.log { +/var/log/mariadb/columnstore/*.log { missingok rotate 7 daily dateext copytruncate - olddir /var/log/Columnstore/archive + olddir /var/log/mariadb/columnstore/archive } -/var/log/Columnstore/*.log1 { +/var/log/mariadb/columnstore/*.log1 { missingok rotate 7 daily nocreate compress - olddir /var/log/Columnstore/archive + olddir /var/log/mariadb/columnstore/archive } /usr/local/Calpont/etc/Calpont.xml { daily diff --git a/oam/install_scripts/calpontSyslog b/oam/install_scripts/calpontSyslog index dab3c966b..3efd0c101 100644 --- a/oam/install_scripts/calpontSyslog +++ b/oam/install_scripts/calpontSyslog @@ -1,7 +1,7 @@ # Calpont Database Platform Logging -local1.=crit -/var/log/Columnstore/crit.log -local1.=err -/var/log/Columnstore/err.log -local1.=warning -/var/log/Columnstore/warning.log -local1.=info -/var/log/Columnstore/info.log -local1.=debug -/var/log/Columnstore/debug.log -local2.=crit -/var/log/Columnstore/data/data_mods.log +local1.=crit -/var/log/mariadb/columnstore/crit.log +local1.=err -/var/log/mariadb/columnstore/err.log +local1.=warning -/var/log/mariadb/columnstore/warning.log +local1.=info -/var/log/mariadb/columnstore/info.log +local1.=debug -/var/log/mariadb/columnstore/debug.log +local2.=crit -/var/log/mariadb/columnstore/data/data_mods.log diff --git a/oam/install_scripts/calpontSyslog-ng b/oam/install_scripts/calpontSyslog-ng index 8dead4b04..b4b80e1c5 100755 --- a/oam/install_scripts/calpontSyslog-ng +++ b/oam/install_scripts/calpontSyslog-ng @@ -21,27 +21,27 @@ filter f_local1debug { facility(local1) and level(debug); }; filter f_local2crit { facility(local2) and level(crit); }; destination d_crit{ - file("/var/log/Columnstore/crit.log"); + file("/var/log/mariadb/columnstore/crit.log"); }; destination d_err{ - file("/var/log/Columnstore/err.log"); + file("/var/log/mariadb/columnstore/err.log"); }; destination d_warning{ - file("/var/log/Columnstore/warning.log"); + file("/var/log/mariadb/columnstore/warning.log"); }; destination d_info{ - file("/var/log/Columnstore/info.log"); + file("/var/log/mariadb/columnstore/info.log"); }; destination d_debug{ - file("/var/log/Columnstore/debug.log"); + file("/var/log/mariadb/columnstore/debug.log"); }; destination d_data_mods{ - file("/var/log/Columnstore/data/data_mods.log"); + file("/var/log/mariadb/columnstore/data/data_mods.log"); }; log{ diff --git a/oam/install_scripts/calpontSyslog7 b/oam/install_scripts/calpontSyslog7 index 70938eaa8..5274b5b42 100644 --- a/oam/install_scripts/calpontSyslog7 +++ b/oam/install_scripts/calpontSyslog7 @@ -1,8 +1,8 @@ # MariaDB Columnstore Database Platform Logging -local1.crit -/var/log/Columnstore/crit.log -local1.err -/var/log/Columnstore/err.log -local1.warning -/var/log/Columnstore/warning.log -local1.info -/var/log/Columnstore/info.log -local1.debug -/var/log/Columnstore/debug.log -local2.crit -/var/log/Columnstore/data/data_mods.log +local1.crit -/var/log/mariadb/columnstore/crit.log +local1.err -/var/log/mariadb/columnstore/err.log +local1.warning -/var/log/mariadb/columnstore/warning.log +local1.info -/var/log/mariadb/columnstore/info.log +local1.debug -/var/log/mariadb/columnstore/debug.log +local2.crit -/var/log/mariadb/columnstore/data/data_mods.log diff --git a/oam/install_scripts/calpontUninstall.sh b/oam/install_scripts/calpontUninstall.sh index 59c285a72..c7f3b7054 100755 --- a/oam/install_scripts/calpontUninstall.sh +++ b/oam/install_scripts/calpontUninstall.sh @@ -4,7 +4,7 @@ # # Uninstall Package from system -set INFINIDB_INSTALL_DIR "/usr/local/MariaDB/Columnstore" +set INFINIDB_INSTALL_DIR "/usr/local/mariadb/columnstore" set env(INFINIDB_INSTALL_DIR) $INFINIDB_INSTALL_DIR set USERNAME $env(USER) diff --git a/oam/install_scripts/columnstore b/oam/install_scripts/columnstore index 5de5b6d3d..6f45dac2b 100644 --- a/oam/install_scripts/columnstore +++ b/oam/install_scripts/columnstore @@ -27,14 +27,14 @@ if [ -z "$INFINIDB_INSTALL_DIR" ]; then fi if [ -z "$INFINIDB_INSTALL_DIR" ]; then - INFINIDB_INSTALL_DIR=/usr/local/MariaDB/Columnstore + INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore fi export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR InstallDir=$INFINIDB_INSTALL_DIR -if [ $InstallDir != "/usr/local/MariaDB/Columnstore" ]; then +if [ $InstallDir != "/usr/local/mariadb/columnstore" ]; then export PATH=$InstallDir/bin:$InstallDir/mysql/bin:/bin:/usr/bin export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$InstallDir/lib:$InstallDir/mysql/lib/mysql fi @@ -107,7 +107,7 @@ start() { #columnstore core files $SUDO ulimit -c unlimited > /dev/null 2>&1 $SUDO sysctl -q -w kernel.core_uses_pid=1 > /dev/null 2>&1 - $SUDO sysctl -q -w kernel.core_pattern=/var/log/Columnstore/corefiles/core.%e.%p > /dev/null 2>&1 + $SUDO sysctl -q -w kernel.core_pattern=/var/log/mariadb/columnstore/corefiles/core.%e.%p > /dev/null 2>&1 fi RETVAL=0 diff --git a/oam/install_scripts/columnstore.conf b/oam/install_scripts/columnstore.conf index 38a817015..fb47efa80 100644 --- a/oam/install_scripts/columnstore.conf +++ b/oam/install_scripts/columnstore.conf @@ -1,2 +1,2 @@ -/usr/local/MariaDB/Columnstore/lib +/usr/local/mariadb/columnstore/lib diff --git a/oam/install_scripts/columnstore.def b/oam/install_scripts/columnstore.def index 28ec0512a..6e073b76d 100644 --- a/oam/install_scripts/columnstore.def +++ b/oam/install_scripts/columnstore.def @@ -2,7 +2,7 @@ # Copy this file to /etc/default and rename it to 'columnstore'. # Change this line to your InfiniDB installation directory -INFINIDB_INSTALL_DIR=/usr/local/MariaDB/Columnstore +INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore LD_LIBRARY_PATH=$INFINIDB_INSTALL_DIR/lib:$INFINIDB_INSTALL_DIR/mysql/lib/mysql export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR diff --git a/oam/install_scripts/columnstore.upstart b/oam/install_scripts/columnstore.upstart index 1a0767584..b3068395c 100644 --- a/oam/install_scripts/columnstore.upstart +++ b/oam/install_scripts/columnstore.upstart @@ -12,5 +12,5 @@ stop on runlevel 5 stop on runlevel 6 respawn -exec /usr/local/MariaDB/Columnstore/bin/ProcMon +exec /usr/local/mariadb/columnstore/bin/ProcMon diff --git a/oam/install_scripts/columnstoreAlias b/oam/install_scripts/columnstoreAlias index b794b6d26..2cf611819 100644 --- a/oam/install_scripts/columnstoreAlias +++ b/oam/install_scripts/columnstoreAlias @@ -1,13 +1,13 @@ # MariaDB Columnstore Alias Commands # -alias mcsmysql='/usr/local/MariaDB/Columnstore/mysql/bin/mysql --defaults-file=/usr/local/MariaDB/Columnstore/mysql/my.cnf -u root' -alias ma=/usr/local/MariaDB/Columnstore/bin/mcsadmin -alias mcsadmin=/usr/local/MariaDB/Columnstore/bin/mcsadmin -alias home='cd /usr/local/MariaDB/Columnstore' -alias log='cd /var/log/Columnstore/' -alias core='cd /var/log/Columnstore/corefiles' +alias mcsmysql='/usr/local/mariadb/columnstore/mysql/bin/mysql --defaults-file=/usr/local/mariadb/columnstore/mysql/my.cnf -u root' +alias ma=/usr/local/mariadb/columnstore/bin/mcsadmin +alias mcsadmin=/usr/local/mariadb/columnstore/bin/mcsadmin +alias home='cd /usr/local/mariadb/columnstore' +alias log='cd /var/log/mariadb/columnstore/' +alias core='cd /var/log/mariadb/columnstore/corefiles' alias tmsg='tail -f /var/log/messages' -alias tdebug='tail -f /var/log/Columnstore/debug.log' -alias tinfo='tail -f /var/log/Columnstore/info.log' -alias dbrm='cd /usr/local/MariaDB/Columnstore/data1/systemFiles/dbrm' -alias module='cat /usr/local/MariaDB/Columnstore/local/module' +alias tdebug='tail -f /var/log/mariadb/columnstore/debug.log' +alias tinfo='tail -f /var/log/mariadb/columnstore/info.log' +alias dbrm='cd /usr/local/mariadb/columnstore/data1/systemFiles/dbrm' +alias module='cat /usr/local/mariadb/columnstore/local/module' diff --git a/oam/install_scripts/columnstoreInstall.sh b/oam/install_scripts/columnstoreInstall.sh index 60474f042..487866519 100755 --- a/oam/install_scripts/columnstoreInstall.sh +++ b/oam/install_scripts/columnstoreInstall.sh @@ -13,7 +13,7 @@ set PACKAGE " " set CONFIGFILE " " set DEBUG 0 set NODEPS "-h" -set INSTALLDIR "/usr/local/MariaDB/Columnstore" +set INSTALLDIR "/usr/local/mariadb/columnstore" spawn -noecho /bin/bash diff --git a/oam/install_scripts/columnstoreLogRotate b/oam/install_scripts/columnstoreLogRotate index 781b2da6c..dbce1f98b 100644 --- a/oam/install_scripts/columnstoreLogRotate +++ b/oam/install_scripts/columnstoreLogRotate @@ -3,33 +3,33 @@ # as part of the RPM installation # -/var/log/Columnstore/*.log { +/var/log/mariadb/columnstore/*.log { missingok rotate 7 daily dateext copytruncate - olddir /var/log/Columnstore/archive + olddir /var/log/mariadb/columnstore/archive } -/var/log/Columnstore/*.log1 { +/var/log/mariadb/columnstore/*.log1 { missingok rotate 7 daily nocreate compress - olddir /var/log/Columnstore/archive + olddir /var/log/mariadb/columnstore/archive } -/usr/local/MariaDB/Columnstore/etc/Calpont.xml { +/usr/local/mariadb/columnstore/etc/Calpont.xml { daily dateext copy - olddir /usr/local/MariaDB/Columnstore/etc/ + olddir /usr/local/mariadb/columnstore/etc/ } -/usr/local/MariaDB/Columnstore/mysql/db/*.err { +/usr/local/mariadb/columnstore/mysql/db/*.err { missingok rotate 7 daily dateext copytruncate - olddir /usr/local/MariaDB/Columnstore/mysql/db + olddir /usr/local/mariadb/columnstore/mysql/db } diff --git a/oam/install_scripts/columnstoreSyslog b/oam/install_scripts/columnstoreSyslog index c618c7e76..e9adb7706 100644 --- a/oam/install_scripts/columnstoreSyslog +++ b/oam/install_scripts/columnstoreSyslog @@ -1,7 +1,7 @@ # MariaDB Columnstore Database Platform Logging -local1.=crit -/var/log/Columnstore/crit.log -local1.=err -/var/log/Columnstore/err.log -local1.=warning -/var/log/Columnstore/warning.log -local1.=info -/var/log/Columnstore/info.log -local1.=debug -/var/log/Columnstore/debug.log -local2.=crit -/var/log/Columnstore/data/data_mods.log +local1.=crit -/var/log/mariadb/columnstore/crit.log +local1.=err -/var/log/mariadb/columnstore/err.log +local1.=warning -/var/log/mariadb/columnstore/warning.log +local1.=info -/var/log/mariadb/columnstore/info.log +local1.=debug -/var/log/mariadb/columnstore/debug.log +local2.=crit -/var/log/mariadb/columnstore/data/data_mods.log diff --git a/oam/install_scripts/columnstoreSyslog-ng b/oam/install_scripts/columnstoreSyslog-ng index 8dead4b04..b4b80e1c5 100755 --- a/oam/install_scripts/columnstoreSyslog-ng +++ b/oam/install_scripts/columnstoreSyslog-ng @@ -21,27 +21,27 @@ filter f_local1debug { facility(local1) and level(debug); }; filter f_local2crit { facility(local2) and level(crit); }; destination d_crit{ - file("/var/log/Columnstore/crit.log"); + file("/var/log/mariadb/columnstore/crit.log"); }; destination d_err{ - file("/var/log/Columnstore/err.log"); + file("/var/log/mariadb/columnstore/err.log"); }; destination d_warning{ - file("/var/log/Columnstore/warning.log"); + file("/var/log/mariadb/columnstore/warning.log"); }; destination d_info{ - file("/var/log/Columnstore/info.log"); + file("/var/log/mariadb/columnstore/info.log"); }; destination d_debug{ - file("/var/log/Columnstore/debug.log"); + file("/var/log/mariadb/columnstore/debug.log"); }; destination d_data_mods{ - file("/var/log/Columnstore/data/data_mods.log"); + file("/var/log/mariadb/columnstore/data/data_mods.log"); }; log{ diff --git a/oam/install_scripts/columnstoreSyslog7 b/oam/install_scripts/columnstoreSyslog7 index b17a40fe2..05551200e 100644 --- a/oam/install_scripts/columnstoreSyslog7 +++ b/oam/install_scripts/columnstoreSyslog7 @@ -1,8 +1,8 @@ # MariaDb Columnstore Database Platform Logging -local1.crit -/var/log/Columnstore/crit.log -local1.err -/var/log/Columnstore/err.log -local1.warning -/var/log/Columnstore/warning.log -local1.info -/var/log/Columnstore/info.log -local1.debug -/var/log/Columnstore/debug.log -local2.crit -/var/log/Columnstore/data/data_mods.log +local1.crit -/var/log/mariadb/columnstore/crit.log +local1.err -/var/log/mariadb/columnstore/err.log +local1.warning -/var/log/mariadb/columnstore/warning.log +local1.info -/var/log/mariadb/columnstore/info.log +local1.debug -/var/log/mariadb/columnstore/debug.log +local2.crit -/var/log/mariadb/columnstore/data/data_mods.log diff --git a/oam/install_scripts/columnstoreUninstall.sh b/oam/install_scripts/columnstoreUninstall.sh index 59c285a72..c7f3b7054 100755 --- a/oam/install_scripts/columnstoreUninstall.sh +++ b/oam/install_scripts/columnstoreUninstall.sh @@ -4,7 +4,7 @@ # # Uninstall Package from system -set INFINIDB_INSTALL_DIR "/usr/local/MariaDB/Columnstore" +set INFINIDB_INSTALL_DIR "/usr/local/mariadb/columnstore" set env(INFINIDB_INSTALL_DIR) $INFINIDB_INSTALL_DIR set USERNAME $env(USER) diff --git a/oam/install_scripts/crontab b/oam/install_scripts/crontab index 2da8e662e..a840b1b2b 100644 --- a/oam/install_scripts/crontab +++ b/oam/install_scripts/crontab @@ -14,5 +14,5 @@ HOME=/ 42 4 1 * * root run-parts /etc/cron.monthly # Translation Log Archiver, default to every 10 minutes -00,10,20,30,40,50 * * * * root /usr/local/MariaDB/Columnstore/bin/transactionLogArchiver.sh +00,10,20,30,40,50 * * * * root /usr/local/mariadb/columnstore/bin/transactionLogArchiver.sh diff --git a/oam/install_scripts/director_installer.sh b/oam/install_scripts/director_installer.sh index d10bd1cbe..76e7d28f3 100755 --- a/oam/install_scripts/director_installer.sh +++ b/oam/install_scripts/director_installer.sh @@ -20,7 +20,7 @@ set CALPONTMYSQLRPM [lindex $argv 6] set CALPONTMYSQLDRPM [lindex $argv 7] set INSTALLTYPE [lindex $argv 8] set DEBUG [lindex $argv 9] -set INSTALLDIR "/usr/local/MariaDB/Columnstore" +set INSTALLDIR "/usr/local/mariadb/columnstore" set IDIR [lindex $argv 10] if { $IDIR != "" } { set INSTALLDIR $IDIR diff --git a/oam/install_scripts/disable-rep-columnstore.sh b/oam/install_scripts/disable-rep-columnstore.sh index edd3fc19a..7da2c202e 100644 --- a/oam/install_scripts/disable-rep-columnstore.sh +++ b/oam/install_scripts/disable-rep-columnstore.sh @@ -18,12 +18,12 @@ checkForError() { } prefix=/usr/local -installdir=$prefix/MariaDB/Columnstore +installdir=$prefix/mariadb/columnstore pwprompt= for arg in "$@"; do if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then prefix="`echo $arg | awk -F= '{print $2}'`" - installdir=$prefix/MariaDB/Columnstore + installdir=$prefix/mariadb/columnstore elif [ `expr -- "$arg" : '--password='` -eq 11 ]; then password="`echo $arg | awk -F= '{print $2}'`" pwprompt="--password=$password" diff --git a/oam/install_scripts/disable-rep-infinidb.sh b/oam/install_scripts/disable-rep-infinidb.sh index edd3fc19a..7da2c202e 100644 --- a/oam/install_scripts/disable-rep-infinidb.sh +++ b/oam/install_scripts/disable-rep-infinidb.sh @@ -18,12 +18,12 @@ checkForError() { } prefix=/usr/local -installdir=$prefix/MariaDB/Columnstore +installdir=$prefix/mariadb/columnstore pwprompt= for arg in "$@"; do if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then prefix="`echo $arg | awk -F= '{print $2}'`" - installdir=$prefix/MariaDB/Columnstore + installdir=$prefix/mariadb/columnstore elif [ `expr -- "$arg" : '--password='` -eq 11 ]; then password="`echo $arg | awk -F= '{print $2}'`" pwprompt="--password=$password" diff --git a/oam/install_scripts/infinidb b/oam/install_scripts/infinidb index f30c4fdc6..0ac0152a8 100644 --- a/oam/install_scripts/infinidb +++ b/oam/install_scripts/infinidb @@ -107,7 +107,7 @@ start() { #infinidb core files $SUDO ulimit -c unlimited > /dev/null 2>&1 $SUDO sysctl -q -w kernel.core_uses_pid=1 > /dev/null 2>&1 - $SUDO sysctl -q -w kernel.core_pattern=/var/log/Columnstore/corefiles/core.%e.%p > /dev/null 2>&1 + $SUDO sysctl -q -w kernel.core_pattern=/var/log/mariadb/columnstore/corefiles/core.%e.%p > /dev/null 2>&1 fi RETVAL=0 diff --git a/oam/install_scripts/master-rep-columnstore.sh b/oam/install_scripts/master-rep-columnstore.sh index f6a4a5d0f..3420ac39e 100644 --- a/oam/install_scripts/master-rep-columnstore.sh +++ b/oam/install_scripts/master-rep-columnstore.sh @@ -18,12 +18,12 @@ checkForError() { } prefix=/usr/local -installdir=$prefix/MariaDB/Columnstore +installdir=$prefix/mariadb/columnstore pwprompt= for arg in "$@"; do if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then prefix="`echo $arg | awk -F= '{print $2}'`" - installdir=$prefix/MariaDB/Columnstore + installdir=$prefix/mariadb/columnstore elif [ `expr -- "$arg" : '--password='` -eq 11 ]; then password="`echo $arg | awk -F= '{print $2}'`" pwprompt="--password=$password" diff --git a/oam/install_scripts/master-rep-infinidb.sh b/oam/install_scripts/master-rep-infinidb.sh index f6a4a5d0f..3420ac39e 100644 --- a/oam/install_scripts/master-rep-infinidb.sh +++ b/oam/install_scripts/master-rep-infinidb.sh @@ -18,12 +18,12 @@ checkForError() { } prefix=/usr/local -installdir=$prefix/MariaDB/Columnstore +installdir=$prefix/mariadb/columnstore pwprompt= for arg in "$@"; do if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then prefix="`echo $arg | awk -F= '{print $2}'`" - installdir=$prefix/MariaDB/Columnstore + installdir=$prefix/mariadb/columnstore elif [ `expr -- "$arg" : '--password='` -eq 11 ]; then password="`echo $arg | awk -F= '{print $2}'`" pwprompt="--password=$password" diff --git a/oam/install_scripts/module_installer.sh b/oam/install_scripts/module_installer.sh index 001ccbe30..6ef7020c3 100755 --- a/oam/install_scripts/module_installer.sh +++ b/oam/install_scripts/module_installer.sh @@ -10,7 +10,7 @@ # prefix=/usr/local -installdir=$prefix/MariaDB/Columnstore +installdir=$prefix/mariadb/columnstore rpmmode=install user=$USER if [ -z "$user" ]; then @@ -22,7 +22,7 @@ shiftcnt=0 for arg in "$@"; do if [ $(expr -- "$arg" : '--prefix=') -eq 9 ]; then prefix="$(echo $arg | awk -F= '{print $2}')" - installdir=$prefix/MariaDB/Columnstore + installdir=$prefix/mariadb/columnstore ((shiftcnt++)) elif [ $(expr -- "$arg" : '--rpmmode=') -eq 10 ]; then rpmmode="$(echo $arg | awk -F= '{print $2}')" @@ -47,7 +47,7 @@ for arg in "$@"; do done shift $shiftcnt -if [ $installdir != "/usr/local/MariaDB/Columnstore" ]; then +if [ $installdir != "/usr/local/mariadb/columnstore" ]; then export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$INFINIDB_INSTALL_DIR/lib:$INFINIDB_INSTALL_DIR/mysql/lib/mysql fi diff --git a/oam/install_scripts/performance_installer.sh b/oam/install_scripts/performance_installer.sh index 4b0ddd089..bb968494e 100644 --- a/oam/install_scripts/performance_installer.sh +++ b/oam/install_scripts/performance_installer.sh @@ -19,7 +19,7 @@ set INSTALLTYPE [lindex $argv 4] set PKGTYPE [lindex $argv 5] set NODEPS [lindex $argv 6] set DEBUG [lindex $argv 7] -set INSTALLDIR "/usr/local/MariaDB/Columnstore" +set INSTALLDIR "/usr/local/mariadb/columnstore" set IDIR [lindex $argv 8] if { $IDIR != "" } { set INSTALLDIR $IDIR diff --git a/oam/install_scripts/post-install b/oam/install_scripts/post-install index b83afea69..c7dbd537d 100755 --- a/oam/install_scripts/post-install +++ b/oam/install_scripts/post-install @@ -5,7 +5,7 @@ # Post-install steps for columnstore install prefix=/usr/local -installdir=$prefix/MariaDB/Columnstore +installdir=$prefix/mariadb/columnstore rpmmode=install user=$USER if [ -z "$user" ]; then @@ -16,7 +16,7 @@ quiet=0 for arg in "$@"; do if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then prefix="`echo $arg | awk -F= '{print $2}'`" - installdir=$prefix/MariaDB/Columnstore + installdir=$prefix/mariadb/columnstore elif [ `expr -- "$arg" : '--rpmmode='` -eq 10 ]; then rpmmode="`echo $arg | awk -F= '{print $2}'`" elif [ `expr -- "$arg" : '--installdir='` -eq 13 ]; then @@ -33,7 +33,7 @@ for arg in "$@"; do fi done -if [ $installdir != "/usr/local/MariaDB/Columnstore" ]; then +if [ $installdir != "/usr/local/mariadb/columnstore" ]; then export INFINIDB_INSTALL_DIR=$installdir export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib else @@ -101,14 +101,14 @@ chown -h $user.$user libjemalloc.so >/dev/null 2>&1 cd / -test -d /var/log/Columnstore || mkdir /var/log/Columnstore >/dev/null 2>&1 -test -d /var/log/Columnstore/archive || mkdir /var/log/Columnstore/archive >/dev/null 2>&1 -test -d /var/log/Columnstore/corefiles || mkdir /var/log/Columnstore/corefiles >/dev/null 2>&1 -test -d /var/log/Columnstore/trace || mkdir /var/log/Columnstore/trace >/dev/null 2>&1 -test -h /var/log/Columnstore/data && rm -f /var/log/Columnstore/data -test -d /var/log/Columnstore/data || mkdir /var/log/Columnstore/data >/dev/null 2>&1 +test -d /var/log/mariadb/columnstore || mkdir /var/log/mariadb/columnstore >/dev/null 2>&1 +test -d /var/log/mariadb/columnstore/archive || mkdir /var/log/mariadb/columnstore/archive >/dev/null 2>&1 +test -d /var/log/mariadb/columnstore/corefiles || mkdir /var/log/mariadb/columnstore/corefiles >/dev/null 2>&1 +test -d /var/log/mariadb/columnstore/trace || mkdir /var/log/mariadb/columnstore/trace >/dev/null 2>&1 +test -h /var/log/mariadb/columnstore/data && rm -f /var/log/mariadb/columnstore/data +test -d /var/log/mariadb/columnstore/data || mkdir /var/log/mariadb/columnstore/data >/dev/null 2>&1 # make sure trace dir is world-writable and sticky -chmod 1755 /var/log/Columnstore/trace >/dev/null 2>&1 +chmod 1755 /var/log/mariadb/columnstore/trace >/dev/null 2>&1 test -d $installdir/data || mkdir $installdir/data test -d $installdir/data1 || mkdir $installdir/data1 test -d $installdir/data1/systemFiles || mkdir $installdir/data1/systemFiles @@ -132,12 +132,12 @@ chmod -R 755 $installdir/data/bulk >/dev/null 2>&1 mkdir -p /tmp/columnstore_tmp_files >/dev/null 2>&1 #setup core file directory and link -mkdir /var/log/Columnstore/corefiles > /dev/null 2>&1 -chmod 755 /var/log/Columnstore/corefiles > /dev/null 2>&1 +mkdir /var/log/mariadb/columnstore/corefiles > /dev/null 2>&1 +chmod 755 /var/log/mariadb/columnstore/corefiles > /dev/null 2>&1 #create mount directories mkdir /mnt/tmp > /dev/null 2>&1 -mkdir /var/log/Columnstore/data/archive > /dev/null 2>&1 +mkdir /var/log/mariadb/columnstore/data/archive > /dev/null 2>&1 # install Calpont Log Rotate File test -d $installdir/mysql/db || mkdir -p $installdir/mysql/db @@ -169,12 +169,12 @@ else sudo $installdir/bin/syslogSetup.sh --installdir=$installdir install > /tmp/syslog_install.log 2>&1 sudo chown $user:$user $installdir/etc/Calpont.xml sudo chmod 755 /var/log - sudo chmod -R 755 /var/log/Columnstore + sudo chmod -R 755 /var/log/mariadb/columnstore sudo chmod -R 777 /dev/shm sudo rm -f /var/lock/subsys/mysql-Columnstore sudo rm -f /tmp/StopColumnstore - sed -i -e s@/usr/local/MariaDB/Columnstore@$installdir@g $installdir/bin/columnstore.def + sed -i -e s@/usr/local/mariadb/columnstore@$installdir@g $installdir/bin/columnstore.def sudo cp $installdir/bin/columnstore.def /etc/default/columnstore fi @@ -188,8 +188,8 @@ fi eval userhome=~$user bashFile=$userhome/.bashrc touch ${bashFile} -if [ $installdir != "/usr/local/MariaDB/Columnstore" ]; then - sed -i -e s@/usr/local/MariaDB/Columnstore@$installdir@g $installdir/bin/columnstoreAlias +if [ $installdir != "/usr/local/mariadb/columnstore" ]; then + sed -i -e s@/usr/local/mariadb/columnstore@$installdir@g $installdir/bin/columnstoreAlias fi egrep -qs 'MariaDB Columnstore Database Platform Alias Commands' ${bashFile} rc1=$? @@ -221,7 +221,7 @@ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib $installdir/bin/cplogger -i 19 hadoop=`which hadoop 2>/dev/null` if [ -z $hadoop ]; then #check for non-root user - if [ $installdir != "/usr/local/MariaDB/Columnstore" -a $quiet -eq 0 ]; then + if [ $installdir != "/usr/local/mariadb/columnstore" -a $quiet -eq 0 ]; then cat <> ${syslog_conf} - chown syslog:adm /var/log/Columnstore + chown syslog:adm /var/log/mariadb/columnstore else cat ${columnstoreSyslogFile} >> ${syslog_conf} fi @@ -228,7 +228,7 @@ test -f $installdir/post/functions && . $installdir/post/functions number=$RANDOM cplogger -i 100 "InfiniDB Log Test: $number" sleep 3 -egrep -qs "InfiniDB Log Test: $number" /var/log/Columnstore/info.log +egrep -qs "InfiniDB Log Test: $number" /var/log/mariadb/columnstore/info.log if [ $? -eq 0 ]; then echo "InfiniDB System Logging working" exit 0 diff --git a/oam/install_scripts/system_installer.sh b/oam/install_scripts/system_installer.sh index aa21998ca..52186e4b1 100755 --- a/oam/install_scripts/system_installer.sh +++ b/oam/install_scripts/system_installer.sh @@ -129,7 +129,7 @@ if { $INSTALLTYPE == "initial"} { # copy over InfiniDB OS files # send_user "Copy InfiniDB OS files to Module " - send "scp /usr/local/MariaDB/Columnstore/local/etc/$MODULE/* $USERNAME@$SERVER:/usr/local/MariaDB/Columnstore/local/.\n" + send "scp /usr/local/mariadb/columnstore/local/etc/$MODULE/* $USERNAME@$SERVER:/usr/local/mariadb/columnstore/local/.\n" expect "word: " # send the password send "$PASSWORD\n" @@ -144,7 +144,7 @@ if { $INSTALLTYPE == "initial"} { # Start module installer to setup Customer OS files # send_user "Run Module Installer " - send "ssh $USERNAME@$SERVER '/usr/local/MariaDB/Columnstore/bin/module_installer.sh'\n" + send "ssh $USERNAME@$SERVER '/usr/local/mariadb/columnstore/bin/module_installer.sh'\n" expect "word: " # send the password send "$PASSWORD\n" diff --git a/oam/install_scripts/transactionLog b/oam/install_scripts/transactionLog index f1cbbf6bc..414948e94 100644 --- a/oam/install_scripts/transactionLog +++ b/oam/install_scripts/transactionLog @@ -8,5 +8,5 @@ MAILTO=root HOME=/ # Translation Log Archiver, default to every 10 minutes -*/10 * * * * root /usr/local/MariaDB/Columnstore/bin/transactionLogArchiver.sh +*/10 * * * * root /usr/local/mariadb/columnstore/bin/transactionLogArchiver.sh diff --git a/oam/install_scripts/transactionLogArchiver.sh b/oam/install_scripts/transactionLogArchiver.sh index b5f74d234..a6b534187 100755 --- a/oam/install_scripts/transactionLogArchiver.sh +++ b/oam/install_scripts/transactionLogArchiver.sh @@ -3,7 +3,7 @@ # $Id: transactionLogArchiver.sh 1375 2009-04-30 13:53:06Z rdempsey $ DATE=`date +'%s'` -CDATA=/var/log/Columnstore/data +CDATA=/var/log/mariadb/columnstore/data if [ ! -d $CDATA/archive ]; then echo "Installation error: $CDATA/archive is not a directory." 1>&2 diff --git a/oam/install_scripts/upgrade-columnstore.sh b/oam/install_scripts/upgrade-columnstore.sh index f56539873..9e54e78a5 100755 --- a/oam/install_scripts/upgrade-columnstore.sh +++ b/oam/install_scripts/upgrade-columnstore.sh @@ -25,12 +25,12 @@ if [ "x$1" != xdoupgrade ]; then fi prefix=/usr/local -installdir=$prefix/MariaDB/Columnstore +installdir=$prefix/mariadb/columnstore pwprompt= for arg in "$@"; do if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then prefix="`echo $arg | awk -F= '{print $2}'`" - installdir=$prefix/MariaDB/Columnstore + installdir=$prefix/mariadb/columnstore elif [ `expr -- "$arg" : '--password='` -eq 11 ]; then password="`echo $arg | awk -F= '{print $2}'`" pwprompt="--password=$password" diff --git a/oam/install_scripts/upgrade-infinidb.sh b/oam/install_scripts/upgrade-infinidb.sh index f56539873..9e54e78a5 100755 --- a/oam/install_scripts/upgrade-infinidb.sh +++ b/oam/install_scripts/upgrade-infinidb.sh @@ -25,12 +25,12 @@ if [ "x$1" != xdoupgrade ]; then fi prefix=/usr/local -installdir=$prefix/MariaDB/Columnstore +installdir=$prefix/mariadb/columnstore pwprompt= for arg in "$@"; do if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then prefix="`echo $arg | awk -F= '{print $2}'`" - installdir=$prefix/MariaDB/Columnstore + installdir=$prefix/mariadb/columnstore elif [ `expr -- "$arg" : '--password='` -eq 11 ]; then password="`echo $arg | awk -F= '{print $2}'`" pwprompt="--password=$password" diff --git a/oam/install_scripts/user_installer.sh b/oam/install_scripts/user_installer.sh index 41841d4ec..d52499e2a 100644 --- a/oam/install_scripts/user_installer.sh +++ b/oam/install_scripts/user_installer.sh @@ -21,7 +21,7 @@ set NODEPS [lindex $argv 6] set MYSQLPW [lindex $argv 7] set MYSQLPORT [lindex $argv 8] set DEBUG [lindex $argv 9] -set INSTALLDIR "/usr/local/MariaDB/Columnstore" +set INSTALLDIR "/usr/local/mariadb/columnstore" set IDIR [lindex $argv 10] if { $IDIR != "" } { set INSTALLDIR $IDIR diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp index 7f15c6c68..1caa77e49 100644 --- a/oam/oamcpp/liboamcpp.cpp +++ b/oam/oamcpp/liboamcpp.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -2320,7 +2320,7 @@ namespace oam moduleName = boost::get<0>(st); } catch (...) { - //system("touch /var/log/Columnstore/test2"); + //system("touch /var/log/mariadb/columnstore/test2"); } for ( int i = 0 ; i < 5 ; i++) @@ -2342,7 +2342,7 @@ namespace oam } catch(...) { - //system("touch /var/log/Columnstore/test3"); + //system("touch /var/log/mariadb/columnstore/test3"); } sleep(1); @@ -2724,7 +2724,7 @@ namespace oam if (localModule.empty() ) { // not found - //system("touch /var/log/Columnstore/test8"); + //system("touch /var/log/mariadb/columnstore/test8"); exceptionControl("getModuleInfo", API_FAILURE); } @@ -2785,7 +2785,7 @@ namespace oam moduleName = boost::get<0>(st); } catch (...) { - //system("touch /var/log/Columnstore/test4"); + //system("touch /var/log/mariadb/columnstore/test4"); exceptionControl("getMyProcessStatus", API_FAILURE); } @@ -2826,7 +2826,7 @@ namespace oam { // shutdown connection processor.shutdown(); - //system("touch /var/log/Columnstore/test5"); + //system("touch /var/log/mariadb/columnstore/test5"); exceptionControl("getMyProcessStatus", API_FAILURE); } @@ -2838,14 +2838,14 @@ namespace oam } catch(...) { - //system("touch /var/log/Columnstore/test6"); + //system("touch /var/log/mariadb/columnstore/test6"); processor.shutdown(); exceptionControl("getMyProcessStatus", API_INVALID_PARAMETER); } } catch(...) { - //system("touch /var/log/Columnstore/test7"); + //system("touch /var/log/mariadb/columnstore/test7"); processor.shutdown(); exceptionControl("getMyProcessStatus", API_INVALID_PARAMETER); } @@ -2857,7 +2857,7 @@ namespace oam catch(...) {} } - //system("touch /var/log/Columnstore/test9"); + //system("touch /var/log/mariadb/columnstore/test9"); exceptionControl("getMyProcessStatus", API_FAILURE); return boost::make_tuple(-1, "", -1); @@ -3390,7 +3390,7 @@ namespace oam //make 1 log file made up of archive and current *.log (void)system("touch /tmp/logs"); - string logdir("/var/log/Columnstore"); + string logdir("/var/log/mariadb/columnstore"); if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp"; string cmd = "ls " + path + logdir + "/archive | grep '" + logFileName + "' > /tmp/logfiles"; (void)system(cmd.c_str()); diff --git a/oam/oamcpp/liboamcpp.h b/oam/oamcpp/liboamcpp.h index 462f9ad07..b2be8c81a 100644 --- a/oam/oamcpp/liboamcpp.h +++ b/oam/oamcpp/liboamcpp.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -358,12 +358,12 @@ namespace oam */ const std::string LogFile[] = { - "local1.=crit -/var/log/Columnstore/crit.log", - "local1.=err -/var/log/Columnstore/err.log", - "local1.=warning -/var/log/Columnstore/warning.log", - "local1.=info -/var/log/Columnstore/info.log", - "local1.=debug -/var/log/Columnstore/debug.log", - "local2.=crit -/var/log/Columnstore/data/data_mods.log", + "local1.=crit -/var/log/mariadb/columnstore/crit.log", + "local1.=err -/var/log/mariadb/columnstore/err.log", + "local1.=warning -/var/log/mariadb/columnstore/warning.log", + "local1.=info -/var/log/mariadb/columnstore/info.log", + "local1.=debug -/var/log/mariadb/columnstore/debug.log", + "local2.=crit -/var/log/mariadb/columnstore/data/data_mods.log", "" }; diff --git a/oam/oamcpp/oamcache.cpp b/oam/oamcpp/oamcache.cpp index c4f57cf19..362543595 100644 --- a/oam/oamcpp/oamcache.cpp +++ b/oam/oamcpp/oamcache.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oam/oamcpp/oamcache.h b/oam/oamcpp/oamcache.h index 44561aa0a..7d981f652 100644 --- a/oam/oamcpp/oamcache.h +++ b/oam/oamcpp/oamcache.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oam/post/functions b/oam/post/functions index 6667e4658..2a0f88302 100755 --- a/oam/post/functions +++ b/oam/post/functions @@ -7,7 +7,7 @@ if [ -z "$INFINIDB_INSTALL_DIR" ]; then fi if [ -z "$INFINIDB_INSTALL_DIR" ]; then - INFINIDB_INSTALL_DIR=/usr/local/MariaDB/Columnstore + INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore fi export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR diff --git a/oam/post/test-001.sh b/oam/post/test-001.sh index 2e25db3ea..23ef49927 100755 --- a/oam/post/test-001.sh +++ b/oam/post/test-001.sh @@ -7,7 +7,7 @@ if [ -z "$INFINIDB_INSTALL_DIR" ]; then fi if [ -z "$INFINIDB_INSTALL_DIR" ]; then - INFINIDB_INSTALL_DIR=/usr/local/MariaDB/Columnstore + INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore fi export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR diff --git a/oam/post/test-002.sh b/oam/post/test-002.sh index 80fee3a06..bb9800a3e 100755 --- a/oam/post/test-002.sh +++ b/oam/post/test-002.sh @@ -7,7 +7,7 @@ if [ -z "$INFINIDB_INSTALL_DIR" ]; then fi if [ -z "$INFINIDB_INSTALL_DIR" ]; then - INFINIDB_INSTALL_DIR=/usr/local/MariaDB/Columnstore + INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore fi export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR diff --git a/oam/post/test-003.sh b/oam/post/test-003.sh index 8b9a986ed..32e21e8e6 100755 --- a/oam/post/test-003.sh +++ b/oam/post/test-003.sh @@ -7,7 +7,7 @@ if [ -z "$INFINIDB_INSTALL_DIR" ]; then fi if [ -z "$INFINIDB_INSTALL_DIR" ]; then - INFINIDB_INSTALL_DIR=/usr/local/MariaDB/Columnstore + INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore fi export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR diff --git a/oam/post/test-004.sh b/oam/post/test-004.sh index 048ab2cb1..ec13d5bf3 100644 --- a/oam/post/test-004.sh +++ b/oam/post/test-004.sh @@ -11,7 +11,7 @@ if [ -z "$INFINIDB_INSTALL_DIR" ]; then fi if [ -z "$INFINIDB_INSTALL_DIR" ]; then - INFINIDB_INSTALL_DIR=/usr/local/MariaDB/Columnstore + INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore fi export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR diff --git a/oam/replaytxnlog/replaytxnlog.cpp b/oam/replaytxnlog/replaytxnlog.cpp index 936764934..f84ba7c1b 100644 --- a/oam/replaytxnlog/replaytxnlog.cpp +++ b/oam/replaytxnlog/replaytxnlog.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -349,7 +349,7 @@ list ReplayTxnLog::getLogFileNames() oam.getLogFile("pm1", "data", fullLogFileName); #else */ - fullLogFileName = "/var/log/Columnstore/data/data_mods.log"; + fullLogFileName = "/var/log/mariadb/columnstore/data/data_mods.log"; /* #endif */ diff --git a/oamapps/Makefile.am b/oamapps/Makefile.am index 95ef5f9d0..6d023dd2e 100644 --- a/oamapps/Makefile.am +++ b/oamapps/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2014 InfiniDB, Inc. +# Copyright (C) 2016 MariaDB, Corporation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/oamapps/calpontConsole/calpontConsole.cpp b/oamapps/calpontConsole/calpontConsole.cpp index 467420c7f..8dfd35779 100644 --- a/oamapps/calpontConsole/calpontConsole.cpp +++ b/oamapps/calpontConsole/calpontConsole.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/calpontConsole/calpontConsole.h b/oamapps/calpontConsole/calpontConsole.h index e313d54c0..13cf91fb3 100644 --- a/oamapps/calpontConsole/calpontConsole.h +++ b/oamapps/calpontConsole/calpontConsole.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -57,7 +57,7 @@ const int ArgNum = 10; const int DescNumMax = 10; const int cmdNum = 68; -const std::string DEFAULT_LOG_FILE = "/var/log/Columnstore/uiCommands.log"; +const std::string DEFAULT_LOG_FILE = "/var/log/mariadb/columnstore/uiCommands.log"; std::ofstream logFile; /** diff --git a/oamapps/calpontDB/calpontDB.cpp b/oamapps/calpontDB/calpontDB.cpp index 7369f12f4..043656d61 100644 --- a/oamapps/calpontDB/calpontDB.cpp +++ b/oamapps/calpontDB/calpontDB.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -103,7 +103,7 @@ int main(int argc, char **argv) { dbrm.setSystemSuspended(true); sleep(5); - string cmd = startup::StartUp::installDir() + "/bin/save_brm > /var/log/Columnstore/save_brm.log1 2>&1"; + string cmd = startup::StartUp::installDir() + "/bin/save_brm > /var/log/mariadb/columnstore/save_brm.log1 2>&1"; int rtnCode = system(cmd.c_str()); if (rtnCode == 0) { diff --git a/oamapps/calpontSupport/alarmReport.sh b/oamapps/calpontSupport/alarmReport.sh index eabd7fe10..865ea95a4 100755 --- a/oamapps/calpontSupport/alarmReport.sh +++ b/oamapps/calpontSupport/alarmReport.sh @@ -23,12 +23,12 @@ echo " " echo "-- Today's Alarms --" echo " " -cat /var/log/Columnstore/alarm.log 2>/dev/null +cat /var/log/mariadb/columnstore/alarm.log 2>/dev/null -if test -f /var/log/Columnstore/archive/alarm.log-$DATE ; then +if test -f /var/log/mariadb/columnstore/archive/alarm.log-$DATE ; then echo "-- Archived Alarms --" echo " " - cat /var/log/Columnstore/archive/alarm.log-$DATE 2>/dev/null + cat /var/log/mariadb/columnstore/archive/alarm.log-$DATE 2>/dev/null fi } > /tmp/logReport.log diff --git a/oamapps/calpontSupport/approximateRowCount.sh b/oamapps/calpontSupport/approximateRowCount.sh index 09652fded..a1a2bfc62 100755 --- a/oamapps/calpontSupport/approximateRowCount.sh +++ b/oamapps/calpontSupport/approximateRowCount.sh @@ -9,7 +9,7 @@ # if [ -z "$MYSQLCMD" ]; then - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" MYSQLCNF=$INSTALLDIR/mysql/my.cnf MYSQLCMD="$INSTALLDIR/mysql/bin/mysql --defaults-file=$MYSQLCNF -u root" fi @@ -51,7 +51,7 @@ colWidth=`$MYSQLCMD calpontsys --skip-column-names -e "$sql"` # # Use editem to count the extents. # -extentCount=`/usr/local/MariaDB/Columnstore/bin/editem -o $objectid | wc -l` +extentCount=`/usr/local/mariadb/columnstore/bin/editem -o $objectid | wc -l` let extentCount-=2 # Take out the 2 extra rows for header and blank line at end. let approximateRowCount=$extentCount*8192*1024; diff --git a/oamapps/calpontSupport/bulklogReport.sh b/oamapps/calpontSupport/bulklogReport.sh index 631c3a83c..755aa29d2 100755 --- a/oamapps/calpontSupport/bulklogReport.sh +++ b/oamapps/calpontSupport/bulklogReport.sh @@ -11,7 +11,7 @@ fi if [ $2 ] ; then INSTALLDIR=$2 else - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" fi if [ $USER = "root" ]; then diff --git a/oamapps/calpontSupport/configReport.sh b/oamapps/calpontSupport/configReport.sh index 62f16e724..6b7cf3499 100755 --- a/oamapps/calpontSupport/configReport.sh +++ b/oamapps/calpontSupport/configReport.sh @@ -11,7 +11,7 @@ fi if [ $2 ] ; then INSTALLDIR=$2 else - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" fi if [ $USER = "root" ]; then diff --git a/oamapps/calpontSupport/findStranded.sh b/oamapps/calpontSupport/findStranded.sh index 8f7314333..7f861f5a6 100755 --- a/oamapps/calpontSupport/findStranded.sh +++ b/oamapps/calpontSupport/findStranded.sh @@ -11,12 +11,12 @@ # Close enough for hand grenades. if [ -z "$INFINIDB_INSTALL_DIR" ]; then - INFINIDB_INSTALL_DIR=/usr/local/MariaDB/Columnstore + INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore fi export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR -if [ $INFINIDB_INSTALL_DIR != "/usr/local/MariaDB/Columnstore" ]; then +if [ $INFINIDB_INSTALL_DIR != "/usr/local/mariadb/columnstore" ]; then export PATH=$INFINIDB_INSTALL_DIR/bin:$INFINIDB_INSTALL_DIR/mysql/bin:/bin:/usr/bin export LD_LIBRARY_PATH=$INFINIDB_INSTALL_DIR/lib:$INFINIDB_INSTALL_DIR/mysql/lib/mysql fi diff --git a/oamapps/calpontSupport/getMinMax.sh b/oamapps/calpontSupport/getMinMax.sh index 7c69c5fad..aab502da1 100755 --- a/oamapps/calpontSupport/getMinMax.sh +++ b/oamapps/calpontSupport/getMinMax.sh @@ -9,7 +9,7 @@ # if [ -z "$MYSQLCMD" ]; then - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" MYSQLCNF=$INSTALLDIR/mysql/my.cnf MYSQLCMD="$INSTALLDIR/mysql/bin/mysql --defaults-file=$MYSQLCNF -u root" fi @@ -77,7 +77,7 @@ fi # # Use the editem utility to get the min and max value. # -/usr/local/MariaDB/Columnstore/bin/editem -o $objectid $parm | grep max | awk -v dataType=$dataType ' +/usr/local/mariadb/columnstore/bin/editem -o $objectid $parm | grep max | awk -v dataType=$dataType ' BEGIN { allValid=1; foundValidExtent=0; diff --git a/oamapps/calpontSupport/hadoopReport.sh b/oamapps/calpontSupport/hadoopReport.sh index 983ee19ef..644e696d9 100755 --- a/oamapps/calpontSupport/hadoopReport.sh +++ b/oamapps/calpontSupport/hadoopReport.sh @@ -10,7 +10,7 @@ fi if [ $2 ] ; then INSTALLDIR=$2 else - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" fi if [ $USER = "hdfs" ]; then diff --git a/oamapps/calpontSupport/hardwareReport.sh b/oamapps/calpontSupport/hardwareReport.sh index f2865f327..1fedeffaa 100755 --- a/oamapps/calpontSupport/hardwareReport.sh +++ b/oamapps/calpontSupport/hardwareReport.sh @@ -11,7 +11,7 @@ fi if [ $2 ] ; then INSTALLDIR=$2 else - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" fi if [ $USER = "root" ]; then diff --git a/oamapps/calpontSupport/logReport.sh b/oamapps/calpontSupport/logReport.sh index f03ade048..18da759a2 100755 --- a/oamapps/calpontSupport/logReport.sh +++ b/oamapps/calpontSupport/logReport.sh @@ -11,7 +11,7 @@ fi if [ $2 ] ; then INSTALLDIR=$2 else - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" fi if [ $USER = "root" ]; then @@ -22,6 +22,6 @@ fi $SUDO rm -f /tmp/${MODULE}_logReport.tar.gz -tar -zcf /tmp/${MODULE}_logReport.tar.gz /var/log/Columnstore > /dev/null 2>&1 +tar -zcf /tmp/${MODULE}_logReport.tar.gz /var/log/mariadb/columnstore > /dev/null 2>&1 exit 0 diff --git a/oamapps/calpontSupport/minMaxCheck.sh b/oamapps/calpontSupport/minMaxCheck.sh index e1afd9669..4aab0f31e 100755 --- a/oamapps/calpontSupport/minMaxCheck.sh +++ b/oamapps/calpontSupport/minMaxCheck.sh @@ -45,11 +45,11 @@ # if [ -z "$MYSQLCMD" ]; then - MYSQLCMD="/usr/local/MariaDB/Columnstore/mysql/bin/mysql --defaults-file=/usr/local/MariaDB/Columnstore/mysql/my.cnf -u root" + MYSQLCMD="/usr/local/mariadb/columnstore/mysql/bin/mysql --defaults-file=/usr/local/mariadb/columnstore/mysql/my.cnf -u root" fi if [ -z "$INSTALLDIR" ]; then - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" fi if [ -z "$PGMPATH" ]; then diff --git a/oamapps/calpontSupport/resourceReport.sh b/oamapps/calpontSupport/resourceReport.sh index 5bd0e0c06..5beda4a76 100755 --- a/oamapps/calpontSupport/resourceReport.sh +++ b/oamapps/calpontSupport/resourceReport.sh @@ -11,7 +11,7 @@ fi if [ $2 ] ; then INSTALLDIR=$2 else - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" fi if [ $USER = "root" ]; then diff --git a/oamapps/calpontSupport/softwareReport.sh b/oamapps/calpontSupport/softwareReport.sh index 880a4e11a..81c57c715 100755 --- a/oamapps/calpontSupport/softwareReport.sh +++ b/oamapps/calpontSupport/softwareReport.sh @@ -11,7 +11,7 @@ fi if [ $2 ] ; then INSTALLDIR=$2 else - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" fi if [ $USER = "root" ]; then diff --git a/oamapps/calpontSupport/sqlLogs.sh b/oamapps/calpontSupport/sqlLogs.sh index 958d9cc09..67c26a951 100755 --- a/oamapps/calpontSupport/sqlLogs.sh +++ b/oamapps/calpontSupport/sqlLogs.sh @@ -7,12 +7,12 @@ DB=idb_idb_sqllogs TABLE=statements if [ -z "$INFINIDB_INSTALL_DIR" ]; then - INFINIDB_INSTALL_DIR=/usr/local/MariaDB/Columnstore + INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore fi export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR -if [ $INFINIDB_INSTALL_DIR != "/usr/local/MariaDB/Columnstore" ]; then +if [ $INFINIDB_INSTALL_DIR != "/usr/local/mariadb/columnstore" ]; then export PATH=$INFINIDB_INSTALL_DIR/bin:$INFINIDB_INSTALL_DIR/mysql/bin:/bin:/usr/bin export LD_LIBRARY_PATH=$INFINIDB_INSTALL_DIR/lib:$INFINIDB_INSTALL_DIR/mysql/lib/mysql fi diff --git a/oamapps/columnstoreDB/columnstoreDB.cpp b/oamapps/columnstoreDB/columnstoreDB.cpp index 1cb05018b..4faab87f8 100644 --- a/oamapps/columnstoreDB/columnstoreDB.cpp +++ b/oamapps/columnstoreDB/columnstoreDB.cpp @@ -103,7 +103,7 @@ int main(int argc, char **argv) { dbrm.setSystemSuspended(true); sleep(5); - string cmd = startup::StartUp::installDir() + "/bin/save_brm > /var/log/MariaDB/Columnstore/save_brm.log1 2>&1"; + string cmd = startup::StartUp::installDir() + "/bin/save_brm > /var/log/mariadb/columnstore/save_brm.log1 2>&1"; int rtnCode = system(cmd.c_str()); if (rtnCode == 0) { diff --git a/oamapps/columnstoreSupport/alarmReport.sh b/oamapps/columnstoreSupport/alarmReport.sh index 66763c31b..865ea95a4 100755 --- a/oamapps/columnstoreSupport/alarmReport.sh +++ b/oamapps/columnstoreSupport/alarmReport.sh @@ -23,12 +23,12 @@ echo " " echo "-- Today's Alarms --" echo " " -cat /var/log/MariaDB/Columnstore/alarm.log 2>/dev/null +cat /var/log/mariadb/columnstore/alarm.log 2>/dev/null -if test -f /var/log/MariaDB/Columnstore/archive/alarm.log-$DATE ; then +if test -f /var/log/mariadb/columnstore/archive/alarm.log-$DATE ; then echo "-- Archived Alarms --" echo " " - cat /var/log/MariaDB/Columnstore/archive/alarm.log-$DATE 2>/dev/null + cat /var/log/mariadb/columnstore/archive/alarm.log-$DATE 2>/dev/null fi } > /tmp/logReport.log diff --git a/oamapps/columnstoreSupport/approximateRowCount.sh b/oamapps/columnstoreSupport/approximateRowCount.sh index 7e683c531..9b5a356be 100755 --- a/oamapps/columnstoreSupport/approximateRowCount.sh +++ b/oamapps/columnstoreSupport/approximateRowCount.sh @@ -9,7 +9,7 @@ # if [ -z "$MYSQLCMD" ]; then - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" MYSQLCNF=$INSTALLDIR/mysql/my.cnf MYSQLCMD="$INSTALLDIR/mysql/bin/mysql --defaults-file=$MYSQLCNF -u root" fi @@ -32,7 +32,7 @@ table=$2 # Validate that the table exists. # sql="select count(*) from systable where \`schema\`='$db' and tablename='$table';" -count=`$MYSQLCMD columnstoresys --skip-column-names -e "$sql;"` +count=`$MYSQLCMD calpontsys --skip-column-names -e "$sql;"` if [ $count -le 0 ]; then echo "" echo "$db.$table does not exist in Columnstore." @@ -44,14 +44,14 @@ fi # Grab the objectid and column width for a column in the table. # sql="select objectid from syscolumn where \`schema\`='$db' and tablename='$table' limit 1;" -objectid=`$MYSQLCMD columnstoresys --skip-column-names -e "$sql"` +objectid=`$MYSQLCMD calpontsys --skip-column-names -e "$sql"` sql="select columnlength from syscolumn where objectid=$objectid;" -colWidth=`$MYSQLCMD columnstoresys --skip-column-names -e "$sql"` +colWidth=`$MYSQLCMD calpontsys --skip-column-names -e "$sql"` # # Use editem to count the extents. # -extentCount=`/usr/local/MariaDB/Columnstore/bin/editem -o $objectid | wc -l` +extentCount=`/usr/local/mariadb/columnstore/bin/editem -o $objectid | wc -l` let extentCount-=2 # Take out the 2 extra rows for header and blank line at end. let approximateRowCount=$extentCount*8192*1024; diff --git a/oamapps/columnstoreSupport/bulklogReport.sh b/oamapps/columnstoreSupport/bulklogReport.sh index 631c3a83c..755aa29d2 100755 --- a/oamapps/columnstoreSupport/bulklogReport.sh +++ b/oamapps/columnstoreSupport/bulklogReport.sh @@ -11,7 +11,7 @@ fi if [ $2 ] ; then INSTALLDIR=$2 else - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" fi if [ $USER = "root" ]; then diff --git a/oamapps/columnstoreSupport/calpontSupport.cpp b/oamapps/columnstoreSupport/calpontSupport.cpp index 4bdb215ff..c88f2c99d 100644 --- a/oamapps/columnstoreSupport/calpontSupport.cpp +++ b/oamapps/columnstoreSupport/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/MariaDB/Columnstore.xml ################# ' >> " + outputFile; + cmd = "echo '################# cat /etc/mariadb/columnstore.xml ################# ' >> " + outputFile; system(cmd.c_str()); cmd = "echo ' ' >> " + outputFile; system(cmd.c_str()); - cmd = "cat " + installDir + "/etc/MariaDB/Columnstore.xml >> " + outputFile; + cmd = "cat " + installDir + "/etc/mariadb/columnstore.xml >> " + outputFile; system(cmd.c_str()); } @@ -864,41 +864,41 @@ int main(int argc, char *argv[]) system("echo ' ' >> columnstoreSupportReport.txt"); system("echo '******************** DBMS Mysql Columnstore System Column ********************' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt"); - cmd = "echo '################# " + columnstoreMysql + " -e desc columnstoresys.syscolumn ################# ' >> columnstoreSupportReport.txt"; + cmd = "echo '################# " + columnstoreMysql + " -e desc calpontsys.syscolumn ################# ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); cmd = "echo ' ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); - cmd = columnstoreMysql + " -e 'desc columnstoresys.syscolumn;' >> columnstoreSupportReport.txt"; + cmd = columnstoreMysql + " -e 'desc calpontsys.syscolumn;' >> columnstoreSupportReport.txt"; system(cmd.c_str()); system("echo ' ' >> columnstoreSupportReport.txt"); system("echo '******************** DBMS Mysql Columnstore System Table ********************' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt"); - cmd = "echo '################# " + columnstoreMysql + " -e desc columnstoresys.systable ################# ' >> columnstoreSupportReport.txt"; + cmd = "echo '################# " + columnstoreMysql + " -e desc calpontsys.systable ################# ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); cmd = "echo ' ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); - cmd = columnstoreMysql + " -e 'desc columnstoresys.systable;' >> columnstoreSupportReport.txt"; + cmd = columnstoreMysql + " -e 'desc calpontsys.systable;' >> columnstoreSupportReport.txt"; system(cmd.c_str()); system("echo ' ' >> columnstoreSupportReport.txt"); system("echo '******************** DBMS Mysql Columnstore System Catalog Data ********************' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt"); - cmd = "echo '################# " + columnstoreMysql + " columnstoresys < " + installDir + "/mysql/dumpcat_mysql.sql ################# ' >> columnstoreSupportReport.txt"; + cmd = "echo '################# " + columnstoreMysql + " calpontsys < " + installDir + "/mysql/dumpcat_mysql.sql ################# ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); cmd = "echo ' ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); - cmd = columnstoreMysql + " columnstoresys < " + installDir + "/mysql/dumpcat_mysql.sql >> columnstoreSupportReport.txt"; + cmd = columnstoreMysql + " calpontsys < " + installDir + "/mysql/dumpcat_mysql.sql >> columnstoreSupportReport.txt"; system(cmd.c_str()); system("echo ' ' >> columnstoreSupportReport.txt"); system("echo '******************** DBMS Mysql Columnstore System Table Data ********************' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt"); - cmd = "echo '################# " + columnstoreMysql + " -e select * from columnstoresys.systable ################# ' >> columnstoreSupportReport.txt"; + cmd = "echo '################# " + columnstoreMysql + " -e select * from calpontsys.systable ################# ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); cmd = "echo ' ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); - cmd = columnstoreMysql + " -e 'select * from columnstoresys.systable;' >> columnstoreSupportReport.txt"; + cmd = columnstoreMysql + " -e 'select * from calpontsys.systable;' >> columnstoreSupportReport.txt"; system(cmd.c_str()); system("echo ' ' >> columnstoreSupportReport.txt"); diff --git a/oamapps/columnstoreSupport/columnstoreSupport.cpp b/oamapps/columnstoreSupport/columnstoreSupport.cpp index e8d601095..bc7592031 100644 --- a/oamapps/columnstoreSupport/columnstoreSupport.cpp +++ b/oamapps/columnstoreSupport/columnstoreSupport.cpp @@ -864,41 +864,41 @@ int main(int argc, char *argv[]) system("echo ' ' >> columnstoreSupportReport.txt"); system("echo '******************** DBMS Mysql Columnstore System Column ********************' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt"); - cmd = "echo '################# " + columnstoreMysql + " -e desc columnstoresys.syscolumn ################# ' >> columnstoreSupportReport.txt"; + cmd = "echo '################# " + columnstoreMysql + " -e desc calpontsys.syscolumn ################# ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); cmd = "echo ' ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); - cmd = columnstoreMysql + " -e 'desc columnstoresys.syscolumn;' >> columnstoreSupportReport.txt"; + cmd = columnstoreMysql + " -e 'desc calpontsys.syscolumn;' >> columnstoreSupportReport.txt"; system(cmd.c_str()); system("echo ' ' >> columnstoreSupportReport.txt"); system("echo '******************** DBMS Mysql Columnstore System Table ********************' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt"); - cmd = "echo '################# " + columnstoreMysql + " -e desc columnstoresys.systable ################# ' >> columnstoreSupportReport.txt"; + cmd = "echo '################# " + columnstoreMysql + " -e desc calpontsys.systable ################# ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); cmd = "echo ' ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); - cmd = columnstoreMysql + " -e 'desc columnstoresys.systable;' >> columnstoreSupportReport.txt"; + cmd = columnstoreMysql + " -e 'desc calpontsys.systable;' >> columnstoreSupportReport.txt"; system(cmd.c_str()); system("echo ' ' >> columnstoreSupportReport.txt"); system("echo '******************** DBMS Mysql Columnstore System Catalog Data ********************' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt"); - cmd = "echo '################# " + columnstoreMysql + " columnstoresys < " + installDir + "/mysql/dumpcat_mysql.sql ################# ' >> columnstoreSupportReport.txt"; + cmd = "echo '################# " + columnstoreMysql + " calpontsys < " + installDir + "/mysql/dumpcat_mysql.sql ################# ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); cmd = "echo ' ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); - cmd = columnstoreMysql + " columnstoresys < " + installDir + "/mysql/dumpcat_mysql.sql >> columnstoreSupportReport.txt"; + cmd = columnstoreMysql + " calpontsys < " + installDir + "/mysql/dumpcat_mysql.sql >> columnstoreSupportReport.txt"; system(cmd.c_str()); system("echo ' ' >> columnstoreSupportReport.txt"); system("echo '******************** DBMS Mysql Columnstore System Table Data ********************' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt"); - cmd = "echo '################# " + columnstoreMysql + " -e select * from columnstoresys.systable ################# ' >> columnstoreSupportReport.txt"; + cmd = "echo '################# " + columnstoreMysql + " -e select * from calpontsys.systable ################# ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); cmd = "echo ' ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); - cmd = columnstoreMysql + " -e 'select * from columnstoresys.systable;' >> columnstoreSupportReport.txt"; + cmd = columnstoreMysql + " -e 'select * from calpontsys.systable;' >> columnstoreSupportReport.txt"; system(cmd.c_str()); system("echo ' ' >> columnstoreSupportReport.txt"); @@ -927,17 +927,23 @@ int main(int argc, char *argv[]) system("echo ' ' >> columnstoreSupportReport.txt"); system("echo '******************** Database Size Report ********************' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt"); - string cmd = "echo '################# /bin/databaseSizeReport ################# ' >> columnstoreSupportReport.txt"; - system(cmd.c_str()); - cmd = "echo ' ' >> columnstoreSupportReport.txt"; - system(cmd.c_str()); - cmd = installDir + "/bin/databaseSizeReport >> columnstoreSupportReport.txt"; - system(cmd.c_str()); + + string file = installDir + "/bin/databaseSizeReport"; + ifstream File (file.c_str()); + if (File) { + + string cmd = "echo '################# /bin/databaseSizeReport ################# ' >> columnstoreSupportReport.txt"; + system(cmd.c_str()); + cmd = "echo ' ' >> columnstoreSupportReport.txt"; + system(cmd.c_str()); + cmd = installDir + "/bin/databaseSizeReport >> columnstoreSupportReport.txt"; + system(cmd.c_str()); + } system("echo ' ' >> columnstoreSupportReport.txt"); system("echo '******************** DBMS Mysql Columnstore config file ********************' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt"); - cmd = "echo '################# cat /mysql/my.cnf ################# ' >> columnstoreSupportReport.txt"; + string cmd = "echo '################# cat /mysql/my.cnf ################# ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); cmd = "echo ' ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); diff --git a/oamapps/columnstoreSupport/configReport.sh b/oamapps/columnstoreSupport/configReport.sh index 93d5a409a..7acbd9ea8 100755 --- a/oamapps/columnstoreSupport/configReport.sh +++ b/oamapps/columnstoreSupport/configReport.sh @@ -11,7 +11,7 @@ fi if [ $2 ] ; then INSTALLDIR=$2 else - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" fi if [ $USER = "root" ]; then diff --git a/oamapps/columnstoreSupport/findStranded.sh b/oamapps/columnstoreSupport/findStranded.sh index 6bb7f1dd5..8577e06e3 100755 --- a/oamapps/columnstoreSupport/findStranded.sh +++ b/oamapps/columnstoreSupport/findStranded.sh @@ -11,12 +11,12 @@ # Close enough for hand grenades. if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then - COLUMNSTORE_INSTALL_DIR=/usr/local/MariaDB/Columnstore + COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore fi export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR -if [ $COLUMNSTORE_INSTALL_DIR != "/usr/local/MariaDB/Columnstore" ]; then +if [ $COLUMNSTORE_INSTALL_DIR != "/usr/local/mariadb/columnstore" ]; then export PATH=$COLUMNSTORE_INSTALL_DIR/bin:$COLUMNSTORE_INSTALL_DIR/mysql/bin:/bin:/usr/bin export LD_LIBRARY_PATH=$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib/mysql fi diff --git a/oamapps/columnstoreSupport/getMinMax.sh b/oamapps/columnstoreSupport/getMinMax.sh index 3ad844867..58faeeb3c 100755 --- a/oamapps/columnstoreSupport/getMinMax.sh +++ b/oamapps/columnstoreSupport/getMinMax.sh @@ -9,7 +9,7 @@ # if [ -z "$MYSQLCMD" ]; then - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" MYSQLCNF=$INSTALLDIR/mysql/my.cnf MYSQLCMD="$INSTALLDIR/mysql/bin/mysql --defaults-file=$MYSQLCNF -u root" fi @@ -35,7 +35,7 @@ column=$3 # Validate that the column exists. # sql="select count(*) from syscolumn where \`schema\`='$db' and tablename='$table' and columnname='$column';" -count=`$MYSQLCMD columnstoresys --skip-column-names -e "$sql;"` +count=`$MYSQLCMD calpontsys --skip-column-names -e "$sql;"` if [ $count -le 0 ]; then echo "" echo "$db.$table.$column does not exist in Columnstore." @@ -51,7 +51,7 @@ fi # 9 bigint # 11 datetime sql="select datatype from syscolumn where \`schema\`='$db' and tablename='$table' and columnname='$column';" -dataType=`$MYSQLCMD columnstoresys --skip-column-names -e "$sql"` +dataType=`$MYSQLCMD calpontsys --skip-column-names -e "$sql"` if [ $dataType -ne 6 ] && [ $dataType -ne 8 ] && [ $dataType -ne 9 ] && [ $dataType -ne 11 ]; then echo "" echo "The column data type must be an int, bigint, date, or datetime." @@ -63,7 +63,7 @@ fi # Grab the objectid for the column. # sql="select objectid from syscolumn where \`schema\`='$db' and tablename='$table' and columnname='$column';" -objectid=`$MYSQLCMD columnstoresys --skip-column-names -e "$sql"` +objectid=`$MYSQLCMD calpontsys --skip-column-names -e "$sql"` # # Set the editem specific parameter if the column is a date or datetime. @@ -77,7 +77,7 @@ fi # # Use the editem utility to get the min and max value. # -/usr/local/MariaDB/Columnstore/bin/editem -o $objectid $parm | grep max | awk -v dataType=$dataType ' +/usr/local/mariadb/columnstore/bin/editem -o $objectid $parm | grep max | awk -v dataType=$dataType ' BEGIN { allValid=1; foundValidExtent=0; diff --git a/oamapps/columnstoreSupport/hadoopReport.sh b/oamapps/columnstoreSupport/hadoopReport.sh index 983ee19ef..644e696d9 100755 --- a/oamapps/columnstoreSupport/hadoopReport.sh +++ b/oamapps/columnstoreSupport/hadoopReport.sh @@ -10,7 +10,7 @@ fi if [ $2 ] ; then INSTALLDIR=$2 else - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" fi if [ $USER = "hdfs" ]; then diff --git a/oamapps/columnstoreSupport/hardwareReport.sh b/oamapps/columnstoreSupport/hardwareReport.sh index c789b0cdf..7499687eb 100755 --- a/oamapps/columnstoreSupport/hardwareReport.sh +++ b/oamapps/columnstoreSupport/hardwareReport.sh @@ -11,7 +11,7 @@ fi if [ $2 ] ; then INSTALLDIR=$2 else - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" fi if [ $USER = "root" ]; then @@ -82,7 +82,7 @@ for scsi_dev in `mount | awk '/mnt\/tmp/ {print $1}' | awk -F/ '{print $3}' | se echo '/dev/'$scsi_dev ' scheduler setup is' cat /sys/block/$scsi_dev/queue/scheduler 2>/dev/null done -for scsi_dev in `mount | awk '/MariaDB/Columnstore\/data/ {print $1}' | awk -F/ '{print $3}' | sed 's/[0-9]*$//'`; do +for scsi_dev in `mount | awk '/MariaDB\/Columnstore\/data/ {print $1}' | awk -F/ '{print $3}' | sed 's/[0-9]*$//'`; do if [ $scsi_dev != "local" ] ; then echo '/dev/'$scsi_dev ' scheduler setup is' cat /sys/block/$scsi_dev/queue/scheduler 2>/dev/null diff --git a/oamapps/columnstoreSupport/logReport.sh b/oamapps/columnstoreSupport/logReport.sh index 13a44c041..18da759a2 100755 --- a/oamapps/columnstoreSupport/logReport.sh +++ b/oamapps/columnstoreSupport/logReport.sh @@ -11,7 +11,7 @@ fi if [ $2 ] ; then INSTALLDIR=$2 else - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" fi if [ $USER = "root" ]; then @@ -22,6 +22,6 @@ fi $SUDO rm -f /tmp/${MODULE}_logReport.tar.gz -tar -zcf /tmp/${MODULE}_logReport.tar.gz /var/log/MariaDB/Columnstore > /dev/null 2>&1 +tar -zcf /tmp/${MODULE}_logReport.tar.gz /var/log/mariadb/columnstore > /dev/null 2>&1 exit 0 diff --git a/oamapps/columnstoreSupport/minMaxCheck.sh b/oamapps/columnstoreSupport/minMaxCheck.sh index c29d7be0b..4aab0f31e 100755 --- a/oamapps/columnstoreSupport/minMaxCheck.sh +++ b/oamapps/columnstoreSupport/minMaxCheck.sh @@ -39,17 +39,17 @@ # Define the cols array. Here's a sql statement that will list the date and datetime cols in the expected format. -# idbmysql columnstoresys -e "select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where datatype in (8, 11) and tablename not like 'temp%';" > www.txt +# idbmysql calpontsys -e "select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where datatype in (8, 11) and tablename not like 'temp%';" > www.txt # # NOTE: The objectid will be looked up again when it's going through the columns in case the one in the array becomes stale. # if [ -z "$MYSQLCMD" ]; then - MYSQLCMD="/usr/local/MariaDB/Columnstore/mysql/bin/mysql --defaults-file=/usr/local/MariaDB/Columnstore/mysql/my.cnf -u root" + MYSQLCMD="/usr/local/mariadb/columnstore/mysql/bin/mysql --defaults-file=/usr/local/mariadb/columnstore/mysql/my.cnf -u root" fi if [ -z "$INSTALLDIR" ]; then - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" fi if [ -z "$PGMPATH" ]; then @@ -71,7 +71,7 @@ cols=( # If called with "all", run the script against all of the column types that use CP. # if [ $# -eq 1 ] && [ "$1" == "all" ]; then - $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where datatype not in (4, 10, 13) and not (datatype = 2 and columnlength > 8) and not (datatype = 12 and columnlength > 7);" columnstoresys --skip-column-names > /tmp/idb_mm_mon.cols + $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where datatype not in (4, 10, 13) and not (datatype = 2 and columnlength > 8) and not (datatype = 12 and columnlength > 7);" calpontsys --skip-column-names > /tmp/idb_mm_mon.cols cols=( $( cat /tmp/idb_mm_mon.cols ) ) rm -f /tmp/idb_mm_mon.cols @@ -80,7 +80,7 @@ if [ $# -eq 1 ] && [ "$1" == "all" ]; then # elif [ $# -eq 1 ]; then db=$1 - $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where datatype not in (4, 10, 13) and not (datatype = 2 and columnlength > 8) and not (datatype = 12 and columnlength > 7) and \`schema\` = '$db';" columnstoresys --skip-column-names > /tmp/idb_mm_mon.cols + $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where datatype not in (4, 10, 13) and not (datatype = 2 and columnlength > 8) and not (datatype = 12 and columnlength > 7) and \`schema\` = '$db';" calpontsys --skip-column-names > /tmp/idb_mm_mon.cols cols=( $( cat /tmp/idb_mm_mon.cols ) ) rm -f /tmp/idb_mm_mon.cols @@ -90,7 +90,7 @@ elif [ $# -eq 1 ]; then elif [ $# -eq 2 ]; then db=$1 tbl=$2 - $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where datatype not in (4, 10, 13) and not (datatype = 2 and columnlength > 8) and not (datatype = 12 and columnlength > 7) and \`schema\` = '$db' and tablename = '$tbl';" columnstoresys --skip-column-names > /tmp/idb_mm_mon.cols + $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where datatype not in (4, 10, 13) and not (datatype = 2 and columnlength > 8) and not (datatype = 12 and columnlength > 7) and \`schema\` = '$db' and tablename = '$tbl';" calpontsys --skip-column-names > /tmp/idb_mm_mon.cols cols=( $( cat /tmp/idb_mm_mon.cols ) ) rm -f /tmp/idb_mm_mon.cols @@ -101,7 +101,7 @@ elif [ $# -eq 3 ]; then db=$1 tbl=$2 col=$3 - $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where \`schema\` = '$db' and tablename = '$tbl' and columnname='$col';" columnstoresys --skip-column-names > /tmp/idb_mm_mon.cols + $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where \`schema\` = '$db' and tablename = '$tbl' and columnname='$col';" calpontsys --skip-column-names > /tmp/idb_mm_mon.cols cols=( $( cat /tmp/idb_mm_mon.cols ) ) rm -f /tmp/idb_mm_mon.cols fi @@ -127,7 +127,7 @@ while [ $i -lt ${#cols[@]} ]; do # Look up the oid if the cols array is being used to keep from having to continually update the array if tables are dropped and recreated. # if [ $# -eq 0 ]; then - $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where \`schema\` = '$schema' and tablename='$table' and columnname='$column';" columnstoresys --skip-column-names > /tmp/idb_mm_mon.cols + $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where \`schema\` = '$schema' and tablename='$table' and columnname='$column';" calpontsys --skip-column-names > /tmp/idb_mm_mon.cols results=`wc -l /tmp/idb_mm_mon.cols | awk '{print $1}'` if [ $results -eq 0 ]; then oid=0 diff --git a/oamapps/columnstoreSupport/resourceReport.sh b/oamapps/columnstoreSupport/resourceReport.sh index 5bd0e0c06..5beda4a76 100755 --- a/oamapps/columnstoreSupport/resourceReport.sh +++ b/oamapps/columnstoreSupport/resourceReport.sh @@ -11,7 +11,7 @@ fi if [ $2 ] ; then INSTALLDIR=$2 else - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" fi if [ $USER = "root" ]; then diff --git a/oamapps/columnstoreSupport/softwareReport.sh b/oamapps/columnstoreSupport/softwareReport.sh index f29e05d2a..d263c514b 100755 --- a/oamapps/columnstoreSupport/softwareReport.sh +++ b/oamapps/columnstoreSupport/softwareReport.sh @@ -11,7 +11,7 @@ fi if [ $2 ] ; then INSTALLDIR=$2 else - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" fi if [ $USER = "root" ]; then diff --git a/oamapps/columnstoreSupport/sqlLogs.sh b/oamapps/columnstoreSupport/sqlLogs.sh index 5cf607c04..5a06a76ea 100755 --- a/oamapps/columnstoreSupport/sqlLogs.sh +++ b/oamapps/columnstoreSupport/sqlLogs.sh @@ -7,12 +7,12 @@ DB=idb_idb_sqllogs TABLE=statements if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then - COLUMNSTORE_INSTALL_DIR=/usr/local/MariaDB/Columnstore + COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore fi export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR -if [ $COLUMNSTORE_INSTALL_DIR != "/usr/local/MariaDB/Columnstore" ]; then +if [ $COLUMNSTORE_INSTALL_DIR != "/usr/local/mariadb/columnstore" ]; then export PATH=$COLUMNSTORE_INSTALL_DIR/bin:$COLUMNSTORE_INSTALL_DIR/mysql/bin:/bin:/usr/bin export LD_LIBRARY_PATH=$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib/mysql fi diff --git a/oamapps/mcsadmin/1 b/oamapps/mcsadmin/1 index c7802aa3c..0582db633 100644 --- a/oamapps/mcsadmin/1 +++ b/oamapps/mcsadmin/1 @@ -1,7 +1,7 @@ :****************************************************************************************** # $Id: Makefile 2339 2012-05-02 18:20:56Z pleblanc $ # -# Copyright (C) 2009-2012 Calpont Corporation +# Copyright (C) 2016 MariaDB, Corporation # All rights reserved #*****************************************************************************************/ include ../../rules.mak diff --git a/oamapps/mcsadmin/mcsadmin.h b/oamapps/mcsadmin/mcsadmin.h index 53c178da1..02fe01a5e 100644 --- a/oamapps/mcsadmin/mcsadmin.h +++ b/oamapps/mcsadmin/mcsadmin.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -57,7 +57,7 @@ const int ArgNum = 10; const int DescNumMax = 10; const int cmdNum = 68; -const std::string DEFAULT_LOG_FILE = "/var/log/Columnstore/uiCommands.log"; +const std::string DEFAULT_LOG_FILE = "/var/log/mariadb/columnstore/uiCommands.log"; std::ofstream logFile; /** diff --git a/oamapps/postConfigure/amazonInstaller.cpp b/oamapps/postConfigure/amazonInstaller.cpp index 13391b950..14260ac3a 100644 --- a/oamapps/postConfigure/amazonInstaller.cpp +++ b/oamapps/postConfigure/amazonInstaller.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -113,7 +113,7 @@ string SystemSection = "SystemConfig"; string InstallSection = "Installation"; string ModuleSection = "SystemModuleConfig"; -string installDir = "/usr/local/MariaDB/Columnstore"; +string installDir = "/usr/local/mariadb/columnstore"; InstanceList uminstancelist; InstanceList pminstancelist; @@ -2750,7 +2750,7 @@ void cleanupSystem(bool terminate) if ( terminate ) { cout << endl << "***** Performing System Cleanup *****" << endl << endl; - system("umount /usr/local/MariaDB/Columnstore/data* > /dev/null 2>&1"); + system("umount /usr/local/mariadb/columnstore/data* > /dev/null 2>&1"); //run pre-uninstall string cmd = installDir + "/bin/pre-uninstall > /dev/null 2>&1"; diff --git a/oamapps/postConfigure/helpers.h b/oamapps/postConfigure/helpers.h index c7df2e83e..1f7730f83 100644 --- a/oamapps/postConfigure/helpers.h +++ b/oamapps/postConfigure/helpers.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp index 72716e870..1987a8523 100644 --- a/oamapps/postConfigure/installer.cpp +++ b/oamapps/postConfigure/installer.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -123,7 +123,7 @@ int main(int argc, char *argv[]) if (argc >= 13) installDir = argv[12]; else - installDir = "/usr/local/MariaDB/Columnstore"; + installDir = "/usr/local/mariadb/columnstore"; ofstream file("/dev/null"); @@ -870,7 +870,7 @@ int main(int argc, char *argv[]) else { cout << " FAILED" << endl; - cout << endl << "ERROR: MariaDB Columnstore Process failed to start, check log files in /var/log/Columnstore" << endl; + cout << endl << "ERROR: MariaDB Columnstore Process failed to start, check log files in /var/log/mariadb/columnstore" << endl; } } @@ -1112,7 +1112,7 @@ bool makeRClocal(string moduleName, int IserverTypeInstall) mount1 = "/mnt\\/tmp/"; else if ( moduleType == "pm" ) - mount1 = "/MariaDB/Columnstore\\/data/"; + mount1 = "/mariadb/columnstore\\/data/"; else return true; break; @@ -1121,7 +1121,7 @@ bool makeRClocal(string moduleName, int IserverTypeInstall) { if ( moduleType == "pm" ) { mount1 = "/mnt\\/tmp/"; - mount2 = "/MariaDB/Columnstore\\/data/"; + mount2 = "/mariadb/columnstore\\/data/"; } else return true; @@ -1133,7 +1133,7 @@ bool makeRClocal(string moduleName, int IserverTypeInstall) mount1 = "/mnt\\/tmp/"; else if ( moduleType == "pm" ) - mount1 = "/MariaDB/Columnstore\\/data/"; + mount1 = "/mariadb/columnstore\\/data/"; else return true; break; @@ -1142,7 +1142,7 @@ bool makeRClocal(string moduleName, int IserverTypeInstall) { if ( moduleType == "pm" ) { mount1 = "/mnt\\/tmp/"; - mount2 = "/MariaDB/Columnstore\\/data/"; + mount2 = "/mariadb/columnstore\\/data/"; } else return true; diff --git a/oamapps/postConfigure/mycnfUpgrade.cpp b/oamapps/postConfigure/mycnfUpgrade.cpp index ec0701773..e99f53f34 100644 --- a/oamapps/postConfigure/mycnfUpgrade.cpp +++ b/oamapps/postConfigure/mycnfUpgrade.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/postConfigure/patchInstaller.cpp b/oamapps/postConfigure/patchInstaller.cpp index 27956a05e..c886d06a2 100644 --- a/oamapps/postConfigure/patchInstaller.cpp +++ b/oamapps/postConfigure/patchInstaller.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -140,7 +140,7 @@ int main(int argc, char *argv[]) if ( moduleName != parentOAMModuleName ) { //run remote patch installer script cout << endl << "----- Performing Patch installation of Module '" + moduleName + "' -----" << endl << endl; - string cmd = "/usr/local/MariaDB/Columnstore/bin/patch_installer.sh " + moduleName + " " + moduleIPAddr + " " + password + " " + patchLocation + " " + installLocation + " " + softwareFile + " " + installer_debug; + string cmd = "/usr/local/mariadb/columnstore/bin/patch_installer.sh " + moduleName + " " + moduleIPAddr + " " + password + " " + patchLocation + " " + installLocation + " " + softwareFile + " " + installer_debug; int rtnCode = system(cmd.c_str()); if (rtnCode != 0) diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp index 121a2cd09..0599fcd40 100644 --- a/oamapps/postConfigure/postConfigure.cpp +++ b/oamapps/postConfigure/postConfigure.cpp @@ -233,7 +233,7 @@ int main(int argc, char *argv[]) if (rlrc > 0) { thisexepath[rlrc] = 0; - //should look something like '/usr/local/MariaDB/Columnstore/bin/postConfigure' + //should look something like '/usr/local/mariadb/columnstore/bin/postConfigure' char* ptr; ptr = strrchr(thisexepath, '/'); if (ptr) @@ -1446,6 +1446,7 @@ int main(int argc, char *argv[]) if ( pmNumber > 1 && ( IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM ) ) { mysqlRep = true; + MySQLRep = "y"; try { sysConfig->setConfig(InstallSection, "MySQLRep", "y"); } @@ -1460,6 +1461,7 @@ int main(int argc, char *argv[]) if ( umNumber > 1 ) { mysqlRep = true; + MySQLRep = "y"; try { sysConfig->setConfig(InstallSection, "MySQLRep", "y"); } @@ -2845,16 +2847,16 @@ int main(int argc, char *argv[]) } //check if pkgs are located in $HOME directory - string version = systemsoftware.Version + "-" + systemsoftware.Release; + string version = systemsoftware.Version + "*" + systemsoftware.Release; if ( EEPackageType != "binary") { string separator = "-"; if ( EEPackageType == "deb" ) separator = "_"; - calpontPackage1 = "mariadb-columnstore-platform" + separator + systemsoftware.Version + "-" + systemsoftware.Release; - calpontPackage2 = "mariadb-columnstore-libs" + separator + systemsoftware.Version + "-" + systemsoftware.Release; - calpontPackage3 = "mariadb-columnstore-enterprise" + separator + systemsoftware.Version + "-" + systemsoftware.Release; - mysqlPackage = "mariadb-columnstore-storage-engine" + separator + systemsoftware.Version + "-" + systemsoftware.Release; - mysqldPackage = "mariadb-columnstore-mysql" + separator + systemsoftware.Version + "-" + systemsoftware.Release; + calpontPackage1 = "mariadb-columnstore-platform" + separator + version; + calpontPackage2 = "mariadb-columnstore-libs" + separator + version; + calpontPackage3 = "mariadb-columnstore-enterprise" + separator + version; + mysqlPackage = "mariadb-columnstore-storage-engine" + separator + version; + mysqldPackage = "mariadb-columnstore-mysql" + separator + version; if( !pkgCheck() ) { exit(1); @@ -2862,7 +2864,7 @@ int main(int argc, char *argv[]) else { //mariadb - calpontPackage1 = "mariadb-columnstore-*" + separator + systemsoftware.Version + "-" + systemsoftware.Release; + calpontPackage1 = "mariadb-columnstore-*" + separator + version; calpontPackage1 = HOME + "/" + calpontPackage1 + "*." + EEPackageType; calpontPackage2 = HOME + "/" + calpontPackage2 + "*." + EEPackageType; @@ -2877,9 +2879,9 @@ int main(int argc, char *argv[]) string fileName = installDir + "/bin/healthcheck"; ifstream file (fileName.c_str()); if (!file) // CE - calpontPackage1 = "mariadb-columnstore-" + systemsoftware.Version + "-" + systemsoftware.Release; + calpontPackage1 = "mariadb-columnstore-" + version; else // EE - calpontPackage1 = "mariadb-columnstore-ent-" + systemsoftware.Version + "-" + systemsoftware.Release; + calpontPackage1 = "mariadb-columnstore-ent-" + version; calpontPackage2 = "dummy"; calpontPackage3 = "dummy"; mysqlPackage = calpontPackage1; @@ -3542,7 +3544,7 @@ int main(int argc, char *argv[]) else { cout << " FAILED" << endl; - cout << endl << "MariaDB Columnstore System failed to start, check log files in /var/log/Columnstore" << endl; + cout << endl << "MariaDB Columnstore System failed to start, check log files in /var/log/mariadb/columnstore" << endl; exit(1); } @@ -4241,7 +4243,7 @@ bool storageSetup(bool amazonInstall) { cout << " Running HDFS Sanity Test (please wait): "; cout.flush(); - string logdir("/var/log/Columnstore"); + string logdir("/var/log/mariadb/columnstore"); if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp"; string hdfslog = logdir + "/hdfsCheck.log1"; @@ -4899,7 +4901,7 @@ bool storageSetup(bool amazonInstall) { cout << endl << " Running HDFS Sanity Test (please wait): "; cout.flush(); - string logdir("/var/log/Columnstore"); + string logdir("/var/log/mariadb/columnstore"); if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp"; string hdfslog = logdir + "/hdfsCheck.log1"; diff --git a/oamapps/resourceMonitor/resourceMonitor.cpp b/oamapps/resourceMonitor/resourceMonitor.cpp index 8dcc2ef2e..a69ac4221 100644 --- a/oamapps/resourceMonitor/resourceMonitor.cpp +++ b/oamapps/resourceMonitor/resourceMonitor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -43,7 +43,7 @@ enum HOST_INFO IDLE }; -const string FE_MOUNT_DIR = "/var/log/Columnstore/"; // FE mount dir +const string FE_MOUNT_DIR = "/var/log/mariadb/columnstore/"; // FE mount dir const int MONITOR_FREQ = 15; // monitor frequency in sec const int LOG_FREQ = 900; // log frequency in sec const int DEBUG = false; diff --git a/oamapps/serverMonitor/cpuMonitor.cpp b/oamapps/serverMonitor/cpuMonitor.cpp index 95d17e19e..101e172e4 100644 --- a/oamapps/serverMonitor/cpuMonitor.cpp +++ b/oamapps/serverMonitor/cpuMonitor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -39,7 +39,7 @@ pthread_mutex_t CPU_LOCK; * constants define */ -const std::string FE_MOUNT_DIR = "/var/log/Columnstore/"; // FE mount dir +const std::string FE_MOUNT_DIR = "/var/log/mariadb/columnstore/"; // FE mount dir const int MONITOR_FREQ = 5; // monitor frequency in sec const int LOG_FREQ = 900; // log frequency in sec const int RESOURCE_DEBUG = false; diff --git a/oamapps/serverMonitor/dbhealthMonitor.cpp b/oamapps/serverMonitor/dbhealthMonitor.cpp index e78d8dcbf..24c729f11 100644 --- a/oamapps/serverMonitor/dbhealthMonitor.cpp +++ b/oamapps/serverMonitor/dbhealthMonitor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -160,11 +160,11 @@ int ServerMonitor::healthCheck(bool action) ACK_FLAG ackTemp = ACK_YES; //run Health script - string cmd = startup::StartUp::installDir() + "/bin/dbhealth.sh > /var/log/Columnstore/dbfunctional.log1 2>&1"; + string cmd = startup::StartUp::installDir() + "/bin/dbhealth.sh > /var/log/mariadb/columnstore/dbfunctional.log1 2>&1"; system(cmd.c_str()); - if (!oam.checkLogStatus("/var/log/Columnstore/dbfunctional.log1", "OK")) { - if (oam.checkLogStatus("/var/log/Columnstore/dbfunctional.log1", "ERROR 1045") ) { + if (!oam.checkLogStatus("/var/log/mariadb/columnstore/dbfunctional.log1", "OK")) { + if (oam.checkLogStatus("/var/log/mariadb/columnstore/dbfunctional.log1", "ERROR 1045") ) { LoggingID lid(SERVER_MONITOR_LOG_ID); MessageLog ml(lid); Message msg; diff --git a/oamapps/serverMonitor/diskMonitor.cpp b/oamapps/serverMonitor/diskMonitor.cpp index 2a751aa87..b6208e668 100644 --- a/oamapps/serverMonitor/diskMonitor.cpp +++ b/oamapps/serverMonitor/diskMonitor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -222,7 +222,7 @@ void diskMonitor() string fileName; // check local if ( deviceName == "/") { - fileName = deviceName + "usr/local/MariaDB/Columnstore/releasenum"; + fileName = deviceName + "usr/local/mariadb/columnstore/releasenum"; } else { diff --git a/oamapps/serverMonitor/memoryMonitor.cpp b/oamapps/serverMonitor/memoryMonitor.cpp index 5b5d8d31f..694b42ca4 100644 --- a/oamapps/serverMonitor/memoryMonitor.cpp +++ b/oamapps/serverMonitor/memoryMonitor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/serverMonitor/msgProcessor.cpp b/oamapps/serverMonitor/msgProcessor.cpp index 61c16bc8e..432cf9766 100644 --- a/oamapps/serverMonitor/msgProcessor.cpp +++ b/oamapps/serverMonitor/msgProcessor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -348,7 +348,7 @@ void msgProcessor() time_t moduleStartTime = 0; time_t queryStartTime = 0; - string fileName = "/var/log/Columnstore/debug.log"; + string fileName = "/var/log/mariadb/columnstore/debug.log"; try { // Get ServerMonitor start time. We don't report any SQL that started before then. diff --git a/primitives/blockcache/blockrequestprocessor.cpp b/primitives/blockcache/blockrequestprocessor.cpp index c06d1752e..4dc596c27 100644 --- a/primitives/blockcache/blockrequestprocessor.cpp +++ b/primitives/blockcache/blockrequestprocessor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -67,7 +67,7 @@ BlockRequestProcessor::BlockRequestProcessor(uint32_t numBlcks, #ifdef _MSC_VER brpLogFileName << "C:/Calpont/log/trace/brp." << tid; #else - brpLogFileName << "/var/log/Columnstore/trace/brp." << tid; + brpLogFileName << "/var/log/mariadb/columnstore/trace/brp." << tid; #endif fLogFile.open(brpLogFileName.str().c_str(), ios_base::app | ios_base::ate); } diff --git a/primitives/blockcache/filebuffermgr.cpp b/primitives/blockcache/filebuffermgr.cpp index df2698672..ea4afaef9 100644 --- a/primitives/blockcache/filebuffermgr.cpp +++ b/primitives/blockcache/filebuffermgr.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -71,7 +71,7 @@ FileBufferMgr::FileBufferMgr(const uint32_t numBlcks, const uint32_t blkSz, cons #ifdef _MSC_VER fLog.open("C:/Calpont/log/trace/bc", ios_base::app | ios_base::ate); #else - fLog.open("/var/log/Columnstore/trace/bc", ios_base::app | ios_base::ate); + fLog.open("/var/log/mariadb/columnstore/trace/bc", ios_base::app | ios_base::ate); #endif } diff --git a/primitives/blockcache/iomanager.cpp b/primitives/blockcache/iomanager.cpp index 3a200fda5..389714a5a 100644 --- a/primitives/blockcache/iomanager.cpp +++ b/primitives/blockcache/iomanager.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -489,7 +489,7 @@ void* thr_popper(ioManager *arg) { iomLogFileName << "C:/Calpont/log/trace/iom." << threadId; #else threadId=pthread_self(); - iomLogFileName << "/var/log/Columnstore/trace/iom." << threadId; + iomLogFileName << "/var/log/mariadb/columnstore/trace/iom." << threadId; #endif lFile.open(iomLogFileName.str().c_str(), ios_base::app | ios_base::ate); } @@ -1293,7 +1293,7 @@ ioManager::ioManager(FileBufferMgr& fbm, #ifdef _MSC_VER FDTraceFile().open("C:/Calpont/log/trace/fdcache", ios_base::ate | ios_base::app); #else - FDTraceFile().open("/var/log/Columnstore/trace/fdcache", ios_base::ate | ios_base::app); + FDTraceFile().open("/var/log/mariadb/columnstore/trace/fdcache", ios_base::ate | ios_base::app); #endif } diff --git a/primitives/blockcache/stats.cpp b/primitives/blockcache/stats.cpp index 25385d9a8..adf9f3370 100644 --- a/primitives/blockcache/stats.cpp +++ b/primitives/blockcache/stats.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -104,7 +104,7 @@ public: #ifdef _MSC_VER oss << "C:/Calpont/log/trace/" << outName << '.' << sessionID; #else - oss << "/var/log/Columnstore/trace/" << outName << '.' << sessionID; + oss << "/var/log/mariadb/columnstore/trace/" << outName << '.' << sessionID; #endif oFile.reset(new ofstream()); oFile->open(oss.str().c_str(), ios_base::out | ios_base::ate | ios_base::app); diff --git a/primitives/primproc/batchprimitiveprocessor.cpp b/primitives/primproc/batchprimitiveprocessor.cpp index 9ab8a6ea0..437bba3e8 100644 --- a/primitives/primproc/batchprimitiveprocessor.cpp +++ b/primitives/primproc/batchprimitiveprocessor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/primitives/primproc/bppseeder.cpp b/primitives/primproc/bppseeder.cpp index aae0a277b..f3646b288 100644 --- a/primitives/primproc/bppseeder.cpp +++ b/primitives/primproc/bppseeder.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -221,7 +221,7 @@ int BPPSeeder::operator()() #ifdef _MSC_VER LogFileName << "C:/Calpont/log/trace/pt." << tid; #else - LogFileName << "/var/log/Columnstore/trace/pt." << tid; + LogFileName << "/var/log/mariadb/columnstore/trace/pt." << tid; #endif spof.reset(new PTLogs_t(gThdCnt, LogFileName.str().c_str())); gThdCnt++; diff --git a/primitives/primproc/primitiveserver.cpp b/primitives/primproc/primitiveserver.cpp index 0e2973eec..c70bc1c23 100644 --- a/primitives/primproc/primitiveserver.cpp +++ b/primitives/primproc/primitiveserver.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/primitives/primproc/primitiveserver.h b/primitives/primproc/primitiveserver.h index 2c0e839ff..a7b4706c9 100644 --- a/primitives/primproc/primitiveserver.h +++ b/primitives/primproc/primitiveserver.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/primitives/primproc/primproc.cpp b/primitives/primproc/primproc.cpp index 2a657c65f..3b57170e2 100644 --- a/primitives/primproc/primproc.cpp +++ b/primitives/primproc/primproc.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -252,7 +252,7 @@ void* waitForSIGUSR1(void* p) #ifdef _MSC_VER ofstream out("C:/Calpont/log/trace/pplru.dat"); #else - ofstream out("/var/log/Columnstore/trace/pplru.dat"); + ofstream out("/var/log/mariadb/columnstore/trace/pplru.dat"); #endif for (int i = 0; i < cacheCount; i++) { @@ -602,7 +602,7 @@ int main(int argc, char* argv[]) #ifdef _MSC_VER ofstream* qszLog = new ofstream("C:/Calpont/log/trace/ppqsz.dat"); #else - ofstream* qszLog = new ofstream("/var/log/Columnstore/trace/ppqsz.dat"); + ofstream* qszLog = new ofstream("/var/log/mariadb/columnstore/trace/ppqsz.dat"); #endif if (!qszLog->good()) { diff --git a/procmgr/main.cpp b/procmgr/main.cpp index c07576dae..5593c7621 100644 --- a/procmgr/main.cpp +++ b/procmgr/main.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp index 97f83fd43..2c4306c19 100644 --- a/procmgr/processmanager.cpp +++ b/procmgr/processmanager.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -2455,7 +2455,7 @@ void processMSG(messageqcpp::IOSocket* cfIos) // Wait for everything to settle down sleep(5); // Save the BRM. This command presages a system backup. Best to have a current BRM on disk - string logdir("/var/log/Columnstore"); + string logdir("/var/log/mariadb/columnstore"); if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp"; string cmd = startup::StartUp::installDir() + "/bin/save_brm > " + logdir + "/save_brm.log1 2>&1"; int rtnCode = system(cmd.c_str()); @@ -6172,7 +6172,7 @@ std::string ProcessManager::sendMsgProcMon1( std::string module, ByteStream msg, void ProcessManager::saveBRM(bool skipSession, bool clearshm) { Oam oam; - string logdir("/var/log/Columnstore"); + string logdir("/var/log/mariadb/columnstore"); if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp"; log.writeLog(__LINE__, "Running reset_locks", LOG_TYPE_DEBUG); diff --git a/procmgr/processmanager.h b/procmgr/processmanager.h index 9f61f627b..858b4f2ea 100644 --- a/procmgr/processmanager.h +++ b/procmgr/processmanager.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -97,7 +97,7 @@ namespace processmanager{ typedef std::map srvStateList; const int MAX_ARGUMENTS = 10; - const std::string DEFAULT_LOG_FILE = "/var/log/Columnstore/ProcessManager.log"; + const std::string DEFAULT_LOG_FILE = "/var/log/mariadb/columnstore/ProcessManager.log"; /** diff --git a/procmon/main.cpp b/procmon/main.cpp index e6b3120e7..af6e35752 100644 --- a/procmon/main.cpp +++ b/procmon/main.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -424,7 +424,7 @@ int main(int argc, char **argv) if ( !gOAMParentModuleFlag ) { runStandby = true; // delete any old active alarm log file - unlink ("/var/log/Columnstore/activeAlarms"); + unlink ("/var/log/mariadb/columnstore/activeAlarms"); } //launch Status table control thread on 'pm' modules diff --git a/procmon/processmonitor.cpp b/procmon/processmonitor.cpp index eb911fbfd..658228cb5 100644 --- a/procmon/processmonitor.cpp +++ b/procmon/processmonitor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -540,7 +540,7 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO log.writeLog(__LINE__, "ProcMon Running Hot-Standby"); // delete any old active alarm log file - unlink ("/var/log/Columnstore/activeAlarms"); + unlink ("/var/log/mariadb/columnstore/activeAlarms"); } //Check for SIMPLEX runtype processes @@ -823,7 +823,7 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO //reset BRM locks and clearShm if ( requestStatus == oam::API_SUCCESS ) { - string logdir("/var/log/Columnstore"); + string logdir("/var/log/mariadb/columnstore"); if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp"; string cmd = startup::StartUp::installDir() + "/bin/reset_locks > " + logdir + "/reset_locks.log1 2>&1"; system(cmd.c_str()); @@ -1528,7 +1528,7 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO runStandby = true; // delete any old active alarm log file - unlink ("/var/log/Columnstore/activeAlarms"); + unlink ("/var/log/mariadb/columnstore/activeAlarms"); log.writeLog(__LINE__, "Running Standby", LOG_TYPE_INFO); //give time for Status Control thread to start reading incoming messages @@ -2396,7 +2396,7 @@ pid_t ProcessMonitor::startProcess(string processModuleType, string processName, // dbrmFile = tempDBRMDir + dbrmFile.substr(pos,80);; // } - string logdir("/var/log/Columnstore"); + string logdir("/var/log/mariadb/columnstore"); if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp"; string cmd = startup::StartUp::installDir() + "/bin/reset_locks > " + logdir + "/reset_locks.log1 2>&1"; @@ -2470,7 +2470,7 @@ pid_t ProcessMonitor::startProcess(string processModuleType, string processName, char timestamp[200]; strftime (timestamp, 200, "%m:%d:%y-%H:%M:%S", &tm); - string logdir("/var/log/Columnstore"); + string logdir("/var/log/mariadb/columnstore"); if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp"; string outFileName = logdir + "/" + processName + ".out"; string errFileName = logdir + "/" + processName + ".err"; @@ -3552,7 +3552,7 @@ int ProcessMonitor::buildSystemTables() string fileName = DBdir + "/000.dir"; if (!IDBPolicy::exists(fileName.c_str())) { - string logdir("/var/log/Columnstore"); + string logdir("/var/log/mariadb/columnstore"); if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp"; string cmd = startup::StartUp::installDir() + "/bin/dbbuilder 7 > " + logdir + "/dbbuilder.log &"; system(cmd.c_str()); @@ -4335,7 +4335,7 @@ int ProcessMonitor::runStartupTest() return oam::API_SUCCESS; //run startup test script - string logdir("/var/log/Columnstore"); + string logdir("/var/log/mariadb/columnstore"); if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp"; string cmd = startup::StartUp::installDir() + "/bin/startupTests.sh > " + logdir + "/startupTests.log1 2>&1"; system(cmd.c_str()); @@ -4399,7 +4399,7 @@ int ProcessMonitor::runHDFSTest() Oam oam; bool fail = false; - string logdir("/var/log/Columnstore"); + string logdir("/var/log/mariadb/columnstore"); if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp"; string hdfslog = logdir + "/hdfsCheck.log1"; @@ -5472,7 +5472,7 @@ bool ProcessMonitor::amazonIPCheck() log.writeLog(__LINE__, "Module is Running: '" + moduleName + "' / Instance '" + instanceID + "' current IP being reconfigured in Calpont.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"; + string cmd = "sed -i s/" + IPAddr + "/" + currentIPAddr + "/g /usr/local/mariadb/columnstore/etc/Calpont.xml"; system(cmd.c_str()); } else diff --git a/snmpd/etc/snmpdx.conf b/snmpd/etc/snmpdx.conf index d5bd57da8..c37c06ead 100644 --- a/snmpd/etc/snmpdx.conf +++ b/snmpd/etc/snmpdx.conf @@ -482,7 +482,7 @@ rwuser myuser # # External process to retrieve cpu usage info -#exec cpuLoad /usr/local/MariaDB/Columnstore/bin/resourceMonitor +#exec cpuLoad /usr/local/mariadb/columnstore/bin/resourceMonitor # For snmpget and snmpwalk to work. # The above lines won't set info to extTable (to be investigated) diff --git a/snmpd/etc/snmpdx.conf.singleserver b/snmpd/etc/snmpdx.conf.singleserver index 9eeab396c..952322fd4 100644 --- a/snmpd/etc/snmpdx.conf.singleserver +++ b/snmpd/etc/snmpdx.conf.singleserver @@ -482,7 +482,7 @@ rwuser myuser # # External process to retrieve cpu usage info -#exec cpuLoad /usr/local/MariaDB/Columnstore/bin/resourceMonitor +#exec cpuLoad /usr/local/mariadb/columnstore/bin/resourceMonitor # For snmpget and snmpwalk to work. # The above lines won't set info to extTable (to be investigated) diff --git a/snmpd/etc/snmptrapd.conf b/snmpd/etc/snmptrapd.conf index 9c594cd01..458938d88 100644 --- a/snmpd/etc/snmptrapd.conf +++ b/snmpd/etc/snmptrapd.conf @@ -6,9 +6,9 @@ disableAuthorization yes #forward .1.3.6.1.4.1.2021 0.0.0.0 #CALPONT_NMSADDR #forward default 0.0.0.0 -#traphandle default /usr/local/MariaDB/Columnstore/bin/trapHandler default -traphandle .1.3.6.1.2.1.88 /usr/local/MariaDB/Columnstore/bin/trapHandler agentTrap -#traphandle .1.3.6.1.4.1.2021 /usr/local/MariaDB/Columnstore/bin/trapHandler processAlarm -#traphandle .1.3.6.1.4.1.8072 /usr/local/MariaDB/Columnstore/bin/trapHandler processAlarm -traphandle UCD-SNMP-MIB::ucdavis /usr/local/MariaDB/Columnstore/bin/trapHandler processAlarm +#traphandle default /usr/local/mariadb/columnstore/bin/trapHandler default +traphandle .1.3.6.1.2.1.88 /usr/local/mariadb/columnstore/bin/trapHandler agentTrap +#traphandle .1.3.6.1.4.1.2021 /usr/local/mariadb/columnstore/bin/trapHandler processAlarm +#traphandle .1.3.6.1.4.1.8072 /usr/local/mariadb/columnstore/bin/trapHandler processAlarm +traphandle UCD-SNMP-MIB::ucdavis /usr/local/mariadb/columnstore/bin/trapHandler processAlarm diff --git a/snmpd/etc/snmptrapd.conf.singleserver b/snmpd/etc/snmptrapd.conf.singleserver index 9c594cd01..458938d88 100644 --- a/snmpd/etc/snmptrapd.conf.singleserver +++ b/snmpd/etc/snmptrapd.conf.singleserver @@ -6,9 +6,9 @@ disableAuthorization yes #forward .1.3.6.1.4.1.2021 0.0.0.0 #CALPONT_NMSADDR #forward default 0.0.0.0 -#traphandle default /usr/local/MariaDB/Columnstore/bin/trapHandler default -traphandle .1.3.6.1.2.1.88 /usr/local/MariaDB/Columnstore/bin/trapHandler agentTrap -#traphandle .1.3.6.1.4.1.2021 /usr/local/MariaDB/Columnstore/bin/trapHandler processAlarm -#traphandle .1.3.6.1.4.1.8072 /usr/local/MariaDB/Columnstore/bin/trapHandler processAlarm -traphandle UCD-SNMP-MIB::ucdavis /usr/local/MariaDB/Columnstore/bin/trapHandler processAlarm +#traphandle default /usr/local/mariadb/columnstore/bin/trapHandler default +traphandle .1.3.6.1.2.1.88 /usr/local/mariadb/columnstore/bin/trapHandler agentTrap +#traphandle .1.3.6.1.4.1.2021 /usr/local/mariadb/columnstore/bin/trapHandler processAlarm +#traphandle .1.3.6.1.4.1.8072 /usr/local/mariadb/columnstore/bin/trapHandler processAlarm +traphandle UCD-SNMP-MIB::ucdavis /usr/local/mariadb/columnstore/bin/trapHandler processAlarm diff --git a/snmpd/snmpmanager/snmpglobal.h b/snmpd/snmpmanager/snmpglobal.h index 318d56973..88f5ad609 100644 --- a/snmpd/snmpmanager/snmpglobal.h +++ b/snmpd/snmpmanager/snmpglobal.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -46,9 +46,9 @@ typedef oid CALPONT_OID; const int SET = 1; const int CLEAR = 0; -const std::string ACTIVE_ALARM_FILE = "/var/log/Columnstore/activeAlarms"; -const std::string ALARM_FILE = "/var/log/Columnstore/alarm.log"; -const std::string ALARM_ARCHIVE_FILE = "/var/log/Columnstore/archive"; +const std::string ACTIVE_ALARM_FILE = "/var/log/mariadb/columnstore/activeAlarms"; +const std::string ALARM_FILE = "/var/log/mariadb/columnstore/alarm.log"; +const std::string ALARM_ARCHIVE_FILE = "/var/log/mariadb/columnstore/archive"; const CALPONT_OID SNMPTRAP_OID [] = { 1, 3, 6, 1, 6, 3, 1, 1, 4, 1, 0 }; const CALPONT_OID CALPONT_TRAP_OID [] = { 1, 3, 6, 1, 4, 1, 2021, 991 }; diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp index db79a79ef..1b1dac819 100644 --- a/tools/configMgt/autoConfigure.cpp +++ b/tools/configMgt/autoConfigure.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -1456,7 +1456,7 @@ int main(int argc, char *argv[]) { int id = *pt; string DBrootID = "DBRoot" + oam.itoa(id);; - string pathID = "/usr/local/MariaDB/Columnstore/data" + oam.itoa(id); + string pathID = "/usr/local/mariadb/columnstore/data" + oam.itoa(id); try { sysConfigNew->setConfig(SystemSection, DBrootID, pathID); @@ -1528,7 +1528,7 @@ int main(int argc, char *argv[]) { int id = *pt; string DBrootID = "DBRoot" + oam.itoa(id);; - string pathID = "/usr/local/MariaDB/Columnstore/data" + oam.itoa(id); + string pathID = "/usr/local/mariadb/columnstore/data" + oam.itoa(id); try { sysConfigNew->setConfig(SystemSection, DBrootID, pathID); @@ -1596,7 +1596,7 @@ int main(int argc, char *argv[]) } string DBrootID = "DBRoot" + oam.itoa(i); - string pathID = "/usr/local/MariaDB/Columnstore/data" + oam.itoa(i); + string pathID = "/usr/local/mariadb/columnstore/data" + oam.itoa(i); try { sysConfigNew->setConfig(SystemSection, DBrootID, pathID); diff --git a/tools/configMgt/autoInstaller.cpp b/tools/configMgt/autoInstaller.cpp index ed22d6e31..0badcee9a 100644 --- a/tools/configMgt/autoInstaller.cpp +++ b/tools/configMgt/autoInstaller.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -197,7 +197,7 @@ int main(int argc, char *argv[]) if ( product == "columnstore" ) { company = "MariaDB-Columnstore"; calpontPackagename = "mariadb-columnstore"; - installLocation = "/MariaDB/Columnstore"; + installLocation = "/mariadb/columnstore"; adminCommand = "mcsadmin"; } else if ( product != "infinidb" ) diff --git a/tools/configMgt/configure.cpp b/tools/configMgt/configure.cpp index e3c31cf21..7ca68b916 100644 --- a/tools/configMgt/configure.cpp +++ b/tools/configMgt/configure.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -213,7 +213,7 @@ 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/Calpont.xml 0 "; rtnCode = system(cmd.c_str()); if (rtnCode == 0) { cmd = "mv Calpont.xml systems/" + systemName + "/."; @@ -507,7 +507,7 @@ int main(int argc, char *argv[]) } string DBrootID = "DBRoot" + oam.itoa(i); - string pathID = "/usr/local/MariaDB/Columnstore/data" + oam.itoa(i); + string pathID = "/usr/local/mariadb/columnstore/data" + oam.itoa(i); try { sysConfig->setConfig(SystemSection, DBrootID, pathID); diff --git a/tools/configMgt/dm_parent_installer_v3.sh b/tools/configMgt/dm_parent_installer_v3.sh index f5d908959..fc4e2cdf7 100755 --- a/tools/configMgt/dm_parent_installer_v3.sh +++ b/tools/configMgt/dm_parent_installer_v3.sh @@ -143,7 +143,7 @@ if { $CONFIGFILE != "NULL"} { # copy over Calpont.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/Calpont.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/Calpont.xml\n" expect -re "word: " # send the password send "$PASSWORD\n" @@ -175,7 +175,7 @@ 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 Calpont.xml Calpont.xml.install;cp -v Calpont.xml.rpmsave Calpont.xml'\n" expect -re "word: " # password for ssh send "$PASSWORD\n" diff --git a/tools/configMgt/parent_installer.sh b/tools/configMgt/parent_installer.sh index 3cf5365ba..464ffca93 100755 --- a/tools/configMgt/parent_installer.sh +++ b/tools/configMgt/parent_installer.sh @@ -189,7 +189,7 @@ if { $CONFIGFILE != "NULL"} { # copy over Calpont.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/Calpont.xml\n" expect -re "word: " # send the password send "$PASSWORD\n" @@ -206,7 +206,7 @@ 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 Calpont.xml Calpont.xml.install;cp -v Calpont.xml.rpmsave Calpont.xml'\n" expect -re "word: " # password for ssh send "$PASSWORD\n" diff --git a/tools/configMgt/pm_parent_installer_v3.sh b/tools/configMgt/pm_parent_installer_v3.sh index 5b2506a5b..b1b0428c4 100755 --- a/tools/configMgt/pm_parent_installer_v3.sh +++ b/tools/configMgt/pm_parent_installer_v3.sh @@ -130,7 +130,7 @@ if { $CONFIGFILE != "NULL"} { # copy over Calpont.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/Calpont.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/Calpont.xml\n" expect -re "word: " # send the password send "$PASSWORD\n" @@ -162,7 +162,7 @@ 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 Calpont.xml Calpont.xml.install;cp -v Calpont.xml.rpmsave Calpont.xml'\n" expect -re "word: " # password for ssh send "$PASSWORD\n" diff --git a/tools/configMgt/stackReleaseChecker.cpp b/tools/configMgt/stackReleaseChecker.cpp index 0f1bb5a6c..08ed32416 100644 --- a/tools/configMgt/stackReleaseChecker.cpp +++ b/tools/configMgt/stackReleaseChecker.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/tools/evalidx/checkidx.py b/tools/evalidx/checkidx.py index 5a8596016..2ca213520 100755 --- a/tools/evalidx/checkidx.py +++ b/tools/evalidx/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' + config_file = '/usr/local/mariadb/columnstore/etc' os.lstat(config_file) except: sys.exit('No config file available') diff --git a/tools/hdfsCheck/hdfsCheck.cpp b/tools/hdfsCheck/hdfsCheck.cpp index 9a03c2dff..f54045668 100644 --- a/tools/hdfsCheck/hdfsCheck.cpp +++ b/tools/hdfsCheck/hdfsCheck.cpp @@ -241,7 +241,7 @@ bool TestRunner::runTest( IDBDataFile::Types filetype, unsigned open_opts ) for( int i = 0; i < m_opts.numDbRoots; ++i ) { ostringstream dbroot; - dbroot << "/usr/local/MariaDB/Columnstore/data" << i+1; + dbroot << "/usr/local/mariadb/columnstore/data" << i+1; if( !fs.exists(dbroot.str().c_str()) ) { ostringstream msg; diff --git a/tools/reserveStacks/stack b/tools/reserveStacks/stack index 2c02de64b..ee6544d1f 100755 --- a/tools/reserveStacks/stack +++ b/tools/reserveStacks/stack @@ -37,7 +37,7 @@ elif [ $(expr 'release' : "$cmd") -gt 2 ]; then INST=$4 fi if [ -z "$INSTALLDIR" ]; then - INSTALLDIR="/usr/local/MariaDB/Columnstore" + INSTALLDIR="/usr/local/mariadb/columnstore" if [ $INST ]; then INSTALLDIR=$INST fi diff --git a/tools/setConfig/configxml.sh b/tools/setConfig/configxml.sh index 8ff2ec222..2b9dcaadb 100755 --- a/tools/setConfig/configxml.sh +++ b/tools/setConfig/configxml.sh @@ -9,14 +9,14 @@ if [ -z "$INFINIDB_INSTALL_DIR" ]; then fi if [ -z "$INFINIDB_INSTALL_DIR" ]; then - INFINIDB_INSTALL_DIR=/usr/local/MariaDB/Columnstore + INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore fi export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR InstallDir=$INFINIDB_INSTALL_DIR -if [ $InstallDir != "/usr/local/MariaDB/Columnstore" ]; then +if [ $InstallDir != "/usr/local/mariadb/columnstore" ]; then export PATH=$InstallDir/bin:$InstallDir/mysql/bin:/bin:/usr/bin export LD_LIBRARY_PATH=$InstallDir/lib:$InstallDir/mysql/lib/mysql fi diff --git a/utils/autoconf/INSTALL b/utils/autoconf/INSTALL index 613949bc4..8c755d8e0 100644 --- a/utils/autoconf/INSTALL +++ b/utils/autoconf/INSTALL @@ -4,7 +4,7 @@ Installation Instructions Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. -Copyright (C) 2014 InfiniDB, Inc. +Copyright (C) 2016 MariaDB, Corporation This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -43,10 +43,10 @@ the entire Calpont directory tree there. After untaring the sofware or installing the RPM's, setup the software to run (this script needs to run with root privileges). Check the Installation Guide for addition details on using postConfigure: -/usr/local/MariaDB/Columnstore/bin/postConfigure +/usr/local/mariadb/columnstore/bin/postConfigure Setup some aliases: -. /usr/local/MariaDB/Columnstore/bin/columnsoreAlias +. /usr/local/mariadb/columnstore/bin/columnsoreAlias Connect to MySQL: idbmysql @@ -70,7 +70,7 @@ To use bulk load: 200|2002| 2. Save/place this file in a directory. 3. From that same directory, import the rows: - /usr/local/MariaDB/Columnstore/bin/cpimport calpont caltest caltest.tbl + /usr/local/mariadb/columnstore/bin/cpimport calpont caltest caltest.tbl And check the import: calpontmysql calpont diff --git a/utils/autoconf/README b/utils/autoconf/README index e537d7db0..0776daa62 100644 --- a/utils/autoconf/README +++ b/utils/autoconf/README @@ -3,8 +3,8 @@ To build the software from source, consult the file INSTALL. Brief Install Instructions: 1. Install the 3 MariaDB Columnstore RPMs. -2. Install and start the software, run: /usr/local/MariaDB/Columnstore/bin/postConfigure -3. Setup some aliases: . /usr/local/MariaDB/Columnstore/bin/MariaDB ColumnstoreAlias +2. Install and start the software, run: /usr/local/mariadb/columnstore/bin/postConfigure +3. Setup some aliases: . /usr/local/mariadb/columnstore/bin/MariaDB ColumnstoreAlias 4. Connect to MySQL: idbmysql 5. Try the test in step 12 below @@ -21,7 +21,7 @@ Detailed Installation Instructions: tar xvf MariaDB Columnstore-2.2.0-2.x86_64.rpm.tar.gz 4. Install the 3 RPMs in this order, the MariaDB Columnstore software will be installed in - /usr/local/MariaDB/Columnstore. + /usr/local/mariadb/columnstore. rpm -ivh infinidb-libs-2.2.0-2.x86_64.rpm rpm -ivh infinidb-platform-2.2.0-2.x86_64.rpm @@ -31,19 +31,19 @@ Detailed Installation Instructions: 5a.To configure and run on a single server system utilizing local disk storage, run install script: - /usr/local/MariaDB/Columnstore/bin/postConfigure + /usr/local/mariadb/columnstore/bin/postConfigure 5b.To configure and run on a multi-server system and/or to utilize a SAN storage system, follow the instructions in the MariaDB Columnstore Installation Guide. - /usr/local/MariaDB/Columnstore/bin/postConfigure + /usr/local/mariadb/columnstore/bin/postConfigure 6. Ports utilized by the MariaDB Columnstore Software The MariaDB Columnstore MySQL daemon utilizes port 3306. To use a different port, update the 2 locations in the following file: - /usr/local/MariaDB/Columnstore/mysql/my.cnf + /usr/local/mariadb/columnstore/mysql/my.cnf port = 3306 port = 3306 @@ -53,7 +53,7 @@ Detailed Installation Instructions: 8600 - 8622, 8700, and 8800 7. Setup some aliases: -. /usr/local/MariaDB/Columnstore/bin/MariaDB ColumnstoreAlias +. /usr/local/mariadb/columnstore/bin/MariaDB ColumnstoreAlias 8. To manually start and stop the MariaDB Columnstore Software as the root user run: @@ -127,7 +127,7 @@ Detailed Installation Instructions: mysql> -12. Run the following upgrade script to create calponsys schema and upgrade the syscolumn table: /usr/local/MariaDB/Columnstore/bin/upgrade-infinidb.sh +12. Run the following upgrade script to create calponsys schema and upgrade the syscolumn table: /usr/local/mariadb/columnstore/bin/upgrade-infinidb.sh 13. As an example to get you started, try this: diff --git a/utils/funcexp/func_from_unixtime.cpp b/utils/funcexp/func_from_unixtime.cpp index 85aef442b..a7f7b2c88 100644 --- a/utils/funcexp/func_from_unixtime.cpp +++ b/utils/funcexp/func_from_unixtime.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/utils/funcexp/func_nullif.cpp b/utils/funcexp/func_nullif.cpp index 4123faee7..865d9d396 100644 --- a/utils/funcexp/func_nullif.cpp +++ b/utils/funcexp/func_nullif.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/utils/idbhdfs/hdfs-12/setenv-hdfs-12 b/utils/idbhdfs/hdfs-12/setenv-hdfs-12 index 1237818f4..e3d031c27 100755 --- a/utils/idbhdfs/hdfs-12/setenv-hdfs-12 +++ b/utils/idbhdfs/hdfs-12/setenv-hdfs-12 @@ -1,6 +1,6 @@ #!/bin/bash if [ -z "$INFINIDB_INSTALL_DIR" ]; then - INFINIDB_INSTALL_DIR=/usr/local/MariaDB/Columnstore + INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore fi export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR diff --git a/utils/idbhdfs/hdfs-20/setenv-hdfs-20 b/utils/idbhdfs/hdfs-20/setenv-hdfs-20 index 9d7754e77..e2b318f7a 100755 --- a/utils/idbhdfs/hdfs-20/setenv-hdfs-20 +++ b/utils/idbhdfs/hdfs-20/setenv-hdfs-20 @@ -1,6 +1,6 @@ #!/bin/bash if [ -z "$INFINIDB_INSTALL_DIR" ]; then - INFINIDB_INSTALL_DIR=/usr/local/MariaDB/Columnstore + INFINIDB_INSTALL_DIR=/usr/local/mariadb/columnstore fi export INFINIDB_INSTALL_DIR=$INFINIDB_INSTALL_DIR diff --git a/utils/infinidb_hadoop/infinidb_hadoop_bulkload.sh b/utils/infinidb_hadoop/infinidb_hadoop_bulkload.sh index 7fab449a1..ae8036362 100755 --- a/utils/infinidb_hadoop/infinidb_hadoop_bulkload.sh +++ b/utils/infinidb_hadoop/infinidb_hadoop_bulkload.sh @@ -1,7 +1,7 @@ #!/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 PATH=$PATH:/usr/local/hadoop-0.20.2/bin:/usr/local/MariaDB/Columnstore/bin -export CALPONT_HOME=/usr/local/MariaDB/Columnstore/etc +export LD_LIBRARY_PATH=/usr/local/mariadb/columnstore/lib:$LD_LIBRARY_PATH +export CALPONT_CONFIG_FILE=/usr/local/mariadb/columnstore/etc/Calpont.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/infinidb_hadoop/src/infinidb/hadoop/example/InfiniDBOutputDriver.java b/utils/infinidb_hadoop/src/infinidb/hadoop/example/InfiniDBOutputDriver.java index 952575009..307624995 100755 --- a/utils/infinidb_hadoop/src/infinidb/hadoop/example/InfiniDBOutputDriver.java +++ b/utils/infinidb_hadoop/src/infinidb/hadoop/example/InfiniDBOutputDriver.java @@ -63,7 +63,7 @@ public class InfiniDBOutputDriver extends Configured implements Tool InfiniDBConfiguration idbconf = new InfiniDBConfiguration(jobconf); idbconf.setInputPath("input"); idbconf.setOutputPath("output"); - idbconf.setInfiniDBHome("/usr/local/MariaDB/Columnstore"); + idbconf.setInfiniDBHome("/usr/local/mariadb/columnstore"); jobconf.setMapperClass(InfiniDoopMapper.class); jobconf.setNumMapTasks(1); diff --git a/utils/loggingcpp/errorids.h b/utils/loggingcpp/errorids.h index 0182e319c..f4c418c37 100644 --- a/utils/loggingcpp/errorids.h +++ b/utils/loggingcpp/errorids.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/utils/loggingcpp/messagelog.cpp b/utils/loggingcpp/messagelog.cpp index 07bb182c6..d65380ab7 100644 --- a/utils/loggingcpp/messagelog.cpp +++ b/utils/loggingcpp/messagelog.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/utils/loggingcpp/tdriver.cpp b/utils/loggingcpp/tdriver.cpp index 21f660187..9d8396e12 100644 --- a/utils/loggingcpp/tdriver.cpp +++ b/utils/loggingcpp/tdriver.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -195,7 +195,7 @@ void m4() //------------------------------------------------------------------------------ // This method is intended to test the messages used to profile db performance. // The method also provides an example on how to use these log messages. -// Test can be verified by viewing /var/log/Columnstore/debug.log. +// Test can be verified by viewing /var/log/mariadb/columnstore/debug.log. // // Message types are: // diff --git a/utils/net-snmp/net-snmp-config.h b/utils/net-snmp/net-snmp-config.h index 8d9e724ba..89c97e630 100644 --- a/utils/net-snmp/net-snmp-config.h +++ b/utils/net-snmp/net-snmp-config.h @@ -30,7 +30,7 @@ /* default location to look for mibs to load using the above tokens and/or those in the MIBS envrionment variable*/ -#define DEFAULT_MIBDIRS "$HOME/.snmp/mibs:/usr/local/MariaDB/Columnstore/share/snmp/mibs" +#define DEFAULT_MIBDIRS "$HOME/.snmp/mibs:/usr/local/mariadb/columnstore/share/snmp/mibs" /* default mib files to load, specified by path. */ /* #undef DEFAULT_MIBFILES */ @@ -107,10 +107,10 @@ /* #undef DEFAULT_CLIENT_RECV_BUF */ /* SNMPLIBDIR contains important files */ -#define SNMPLIBPATH "/usr/local/MariaDB/Columnstore/lib/snmp" -#define SNMPSHAREPATH "/usr/local/MariaDB/Columnstore/share/snmp" -#define SNMPCONFPATH "/usr/local/MariaDB/Columnstore/etc/snmp" -#define SNMPDLMODPATH "/usr/local/MariaDB/Columnstore/lib/snmp/dlmod" +#define SNMPLIBPATH "/usr/local/mariadb/columnstore/lib/snmp" +#define SNMPSHAREPATH "/usr/local/mariadb/columnstore/share/snmp" +#define SNMPCONFPATH "/usr/local/mariadb/columnstore/etc/snmp" +#define SNMPDLMODPATH "/usr/local/mariadb/columnstore/lib/snmp/dlmod" /* LOGFILE: If defined it closes stdout/err/in and opens this in out/err's place. (stdin is closed so that sh scripts won't wait for it) */ @@ -1339,7 +1339,7 @@ #define LASTFIELD -1 /* internal define */ /* configure options specified */ -#define CONFIGURE_OPTIONS "\"'--prefix=/usr/local/MariaDB/Columnstore' '--with-mib-modules=disman/event-mib' '--with-cc=gcc'\"" +#define CONFIGURE_OPTIONS "\"'--prefix=/usr/local/mariadb/columnstore' '--with-mib-modules=disman/event-mib' '--with-cc=gcc'\"" /* got socklen_t? */ #define HAVE_SOCKLEN_T 1 diff --git a/utils/prat/copy2here.sh b/utils/prat/copy2here.sh index 9a301ef53..7912ac0af 100644 --- a/utils/prat/copy2here.sh +++ b/utils/prat/copy2here.sh @@ -10,7 +10,7 @@ #* #******************************************************************************/ -CTOOLS=/usr/local/MariaDB/Columnstore/tools +CTOOLS=/usr/local/mariadb/columnstore/tools localhost=$(hostname -s) # @@ -38,9 +38,9 @@ while read moduletype hostname hostdir; do echo Collecting files on remote host $servername echo " and copying them to this server" tarfile=$hostdir.tar - /usr/local/MariaDB/Columnstore/bin/remote_command.sh $servername $srvpwd "$CTOOLS/tarfiles.sh $hostdir $tarfile" + /usr/local/mariadb/columnstore/bin/remote_command.sh $servername $srvpwd "$CTOOLS/tarfiles.sh $hostdir $tarfile" cd $CTOOLS/data - /usr/local/MariaDB/Columnstore/bin/remote_scp_get.sh $servername $srvpwd $CTOOLS/data/$tarfile + /usr/local/mariadb/columnstore/bin/remote_scp_get.sh $servername $srvpwd $CTOOLS/data/$tarfile fi done fi diff --git a/utils/prat/getlogs.sh b/utils/prat/getlogs.sh index f33c0bee2..d805d6f97 100644 --- a/utils/prat/getlogs.sh +++ b/utils/prat/getlogs.sh @@ -10,12 +10,12 @@ #* hostdir - directory name for this run #******************************************************************************/ -CTOOLS=/usr/local/MariaDB/Columnstore/tools +CTOOLS=/usr/local/mariadb/columnstore/tools date=$1 hostdir=$2 localhost=$(hostname -s) -modulename=`cat /usr/local/MariaDB/Columnstore/local/module` +modulename=`cat /usr/local/mariadb/columnstore/local/module` currentdate=`date +%d` if [ -f /tmp/.prat/.hostlist2.txt ]; then sc=`wc -l < /tmp/.prat/.hostlist2.txt` @@ -45,15 +45,15 @@ readserverlist () # getlogsremote () { # Send the command to the remote module(s) to copy the Calpont logs - /usr/local/MariaDB/Columnstore/bin/remote_command.sh $servername $srvpwd "$CTOOLS/getlogs.sh $date $hostdir" + /usr/local/mariadb/columnstore/bin/remote_command.sh $servername $srvpwd "$CTOOLS/getlogs.sh $date $hostdir" } # getlogslocal () { mkdir -p $CTOOLS/data/$hostdir/logs if [ $date = $currentdate ]; then - cp -r /var/log/Columnstore/* /usr/local/MariaDB/Columnstore/tools/data/$hostdir/logs + cp -r /var/log/mariadb/columnstore/* /usr/local/mariadb/columnstore/tools/data/$hostdir/logs else - find /var/log/Columnstore -type f -name "*$date" -exec sh -c 'exec cp -f "$@" '$CTOOLS/data/$hostdir/logs'' find-copy {} + + find /var/log/mariadb/columnstore -type f -name "*$date" -exec sh -c 'exec cp -f "$@" '$CTOOLS/data/$hostdir/logs'' find-copy {} + fi } # diff --git a/utils/prat/getmodules.sh b/utils/prat/getmodules.sh index 0a5648610..3f55b5d6d 100644 --- a/utils/prat/getmodules.sh +++ b/utils/prat/getmodules.sh @@ -10,7 +10,7 @@ #* #***************************************************************************/ # -moduletype=`cat /usr/local/MariaDB/Columnstore/local/module` +moduletype=`cat /usr/local/mariadb/columnstore/local/module` hostdir=`date +%Y%m%d%H%M%S` # # Module check @@ -35,7 +35,7 @@ then fi # issue Calpont console command and send the output to a file -/usr/local/MariaDB/Columnstore/bin/mcsadmin getsystemnetworkconfig ACK_YES | +/usr/local/mariadb/columnstore/bin/mcsadmin getsystemnetworkconfig ACK_YES | egrep -w 'Director|User|Performance' | awk -F" " '{print $1"\t" $2"\t" $3"\t" $4"\t" $6}' > /tmp/modulelist.txt # diff --git a/utils/prat/getps.sh b/utils/prat/getps.sh index fd97304c0..e6e971c5a 100644 --- a/utils/prat/getps.sh +++ b/utils/prat/getps.sh @@ -12,14 +12,14 @@ #* #******************************************************************************/ -CTOOLS=/usr/local/MariaDB/Columnstore/tools +CTOOLS=/usr/local/mariadb/columnstore/tools date=$1 starttime=$2 endtime=$3 hostdir=$4 localhost=$(hostname -s) -modulename=`cat /usr/local/MariaDB/Columnstore/local/module` +modulename=`cat /usr/local/mariadb/columnstore/local/module` if [ -f /tmp/.prat/.hostlist2.txt ]; then sc=`wc -l < /tmp/.prat/.hostlist2.txt` else @@ -48,7 +48,7 @@ readserverlist () # getpsremote () { # Send the command to the remote module(s) to extract ps data - /usr/local/MariaDB/Columnstore/bin/remote_command.sh $servername $srvpwd "$CTOOLS/getps.sh $date $starttime $endtime $hostdir" + /usr/local/mariadb/columnstore/bin/remote_command.sh $servername $srvpwd "$CTOOLS/getps.sh $date $starttime $endtime $hostdir" } # getpslocal () diff --git a/utils/prat/getsar.sh b/utils/prat/getsar.sh index 065cadc1b..eb35e48ff 100644 --- a/utils/prat/getsar.sh +++ b/utils/prat/getsar.sh @@ -11,14 +11,14 @@ #* hostdir - directory name for this run #******************************************************************************/ -CTOOLS=/usr/local/MariaDB/Columnstore/tools +CTOOLS=/usr/local/mariadb/columnstore/tools date=$1 starttime=$2 endtime=$3 hostdir=$4 localhost=$(hostname -s) -modulename=`cat /usr/local/MariaDB/Columnstore/local/module` +modulename=`cat /usr/local/mariadb/columnstore/local/module` if [ -f /tmp/.prat/.hostlist2.txt ]; then sc=`wc -l < /tmp/.prat/.hostlist2.txt` else @@ -47,7 +47,7 @@ readserverlist () # getsarremote () { # Send the sar extraction statments to the remote module - /usr/local/MariaDB/Columnstore/bin/remote_command.sh $servername $srvpwd "$CTOOLS/getsar.sh $date $starttime $endtime $hostdir" + /usr/local/mariadb/columnstore/bin/remote_command.sh $servername $srvpwd "$CTOOLS/getsar.sh $date $starttime $endtime $hostdir" } # getsarlocal () diff --git a/utils/prat/getuserinput.sh b/utils/prat/getuserinput.sh index 01d016760..8628da91d 100644 --- a/utils/prat/getuserinput.sh +++ b/utils/prat/getuserinput.sh @@ -8,7 +8,7 @@ #* Parameter: None #******************************************************************************/ -CTOOLS=/usr/local/MariaDB/Columnstore/tools +CTOOLS=/usr/local/mariadb/columnstore/tools getuserinput () { echo -n "Enter the two digit day of the month for the desired timeframe > " diff --git a/utils/prat/prat.sh b/utils/prat/prat.sh index 8b067ffbc..4bf3e66e6 100644 --- a/utils/prat/prat.sh +++ b/utils/prat/prat.sh @@ -8,7 +8,7 @@ #* Parameter: None #******************************************************************************/ -CTOOLS=/usr/local/MariaDB/Columnstore/tools +CTOOLS=/usr/local/mariadb/columnstore/tools # Retrieve the names of servers in this Calpont stack $CTOOLS/getmodules.sh diff --git a/utils/prat/tarfiles.sh b/utils/prat/tarfiles.sh index 0728846d3..5c25ff46a 100644 --- a/utils/prat/tarfiles.sh +++ b/utils/prat/tarfiles.sh @@ -15,7 +15,7 @@ hostdir=$1 tarfile=$2 # # tar the files -cd /usr/local/MariaDB/Columnstore/tools/data +cd /usr/local/mariadb/columnstore/tools/data tar -cf $tarfile $hostdir # # End of Script diff --git a/utils/scenarios/common/sh/bulkExecResult.sh b/utils/scenarios/common/sh/bulkExecResult.sh index 93dc4b329..6f1ff7f42 100755 --- a/utils/scenarios/common/sh/bulkExecResult.sh +++ b/utils/scenarios/common/sh/bulkExecResult.sh @@ -12,25 +12,25 @@ function getTestInfo { function copySQLResultFiles { # - rm -f /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestSummary.* - rm -f /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestTime.* - rm -f /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestStats.* + rm -f /usr/local/mariadb/columnstore/data/bulk/data/import/TestSummary.* + rm -f /usr/local/mariadb/columnstore/data/bulk/data/import/TestTime.* + rm -f /usr/local/mariadb/columnstore/data/bulk/data/import/TestStats.* # - cp -f testResultSummary.txt /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestSummary.tbl - cp -f testResultTime.txt /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestTime.tbl - cp -f testResultStats.txt /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestStats.tbl + cp -f testResultSummary.txt /usr/local/mariadb/columnstore/data/bulk/data/import/TestSummary.tbl + cp -f testResultTime.txt /usr/local/mariadb/columnstore/data/bulk/data/import/TestTime.tbl + cp -f testResultStats.txt /usr/local/mariadb/columnstore/data/bulk/data/import/TestStats.tbl } function CalLoadSQLTestResult { # - /usr/local/MariaDB/Columnstore/bin/colxml perfstats -t TestSummary -j 1001 - /usr/local/MariaDB/Columnstore/bin/colxml perfstats -t TestTime -j 1002 - /usr/local/MariaDB/Columnstore/bin/colxml perfstats -t TestStats -j 1003 + /usr/local/mariadb/columnstore/bin/colxml perfstats -t TestSummary -j 1001 + /usr/local/mariadb/columnstore/bin/colxml perfstats -t TestTime -j 1002 + /usr/local/mariadb/columnstore/bin/colxml perfstats -t TestStats -j 1003 # - /usr/local/MariaDB/Columnstore/bin/cpimport -j 1001 - /usr/local/MariaDB/Columnstore/bin/cpimport -j 1002 - /usr/local/MariaDB/Columnstore/bin/cpimport -j 1003 + /usr/local/mariadb/columnstore/bin/cpimport -j 1001 + /usr/local/mariadb/columnstore/bin/cpimport -j 1002 + /usr/local/mariadb/columnstore/bin/cpimport -j 1003 } # function MySQLLoadSQLTestResult { @@ -47,38 +47,38 @@ function MySQLLoadSQLTestResult { #========================================================================================= function CalLoadSQLTestResult { # - rm -f /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestSummary.* - rm -f /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestTime.* - rm -f /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestStats.* + rm -f /usr/local/mariadb/columnstore/data/bulk/data/import/TestSummary.* + rm -f /usr/local/mariadb/columnstore/data/bulk/data/import/TestTime.* + rm -f /usr/local/mariadb/columnstore/data/bulk/data/import/TestStats.* # - /usr/local/MariaDB/Columnstore/bin/colxml perfstats -t TestSummary -j 1001 - /usr/local/MariaDB/Columnstore/bin/colxml perfstats -t TestTime -j 1002 - /usr/local/MariaDB/Columnstore/bin/colxml perfstats -t TestStats -j 1003 + /usr/local/mariadb/columnstore/bin/colxml perfstats -t TestSummary -j 1001 + /usr/local/mariadb/columnstore/bin/colxml perfstats -t TestTime -j 1002 + /usr/local/mariadb/columnstore/bin/colxml perfstats -t TestStats -j 1003 # - cp -f testResultSummary.txt /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestSummary.tbl - cp -f testResultTime.txt /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestTime.tbl - cp -f testResultStats.txt /usr/local/MariaDB/Columnstore/data/bulk/data/import/TestStats.tbl + cp -f testResultSummary.txt /usr/local/mariadb/columnstore/data/bulk/data/import/TestSummary.tbl + cp -f testResultTime.txt /usr/local/mariadb/columnstore/data/bulk/data/import/TestTime.tbl + cp -f testResultStats.txt /usr/local/mariadb/columnstore/data/bulk/data/import/TestStats.tbl # - /usr/local/MariaDB/Columnstore/bin/cpimport -j 1001 - /usr/local/MariaDB/Columnstore/bin/cpimport -j 1002 - /usr/local/MariaDB/Columnstore/bin/cpimport -j 1003 + /usr/local/mariadb/columnstore/bin/cpimport -j 1001 + /usr/local/mariadb/columnstore/bin/cpimport -j 1002 + /usr/local/mariadb/columnstore/bin/cpimport -j 1003 } #========================================================================================= # cpimport bulk test results #========================================================================================= function CalLoadBulkTestResult { # - rm -f /usr/local/MariaDB/Columnstore/data/bulk/data/import/BulkSummary.* - rm -f /usr/local/MariaDB/Columnstore/data/bulk/data/import/BulkTime.* + rm -f /usr/local/mariadb/columnstore/data/bulk/data/import/BulkSummary.* + rm -f /usr/local/mariadb/columnstore/data/bulk/data/import/BulkTime.* # - /usr/local/MariaDB/Columnstore/bin/colxml perfstats -t BulkSummary -j 1001 - /usr/local/MariaDB/Columnstore/bin/colxml perfstats -t BulkStats -j 1002 + /usr/local/mariadb/columnstore/bin/colxml perfstats -t BulkSummary -j 1001 + /usr/local/mariadb/columnstore/bin/colxml perfstats -t BulkStats -j 1002 # - cp -f testResultSummary.txt /usr/local/MariaDB/Columnstore/data/bulk/data/import/BulkSummary.tbl - cp -f testResultTime.txt /usr/local/MariaDB/Columnstore/data/bulk/data/import/BulkStats.tbl + cp -f testResultSummary.txt /usr/local/mariadb/columnstore/data/bulk/data/import/BulkSummary.tbl + cp -f testResultTime.txt /usr/local/mariadb/columnstore/data/bulk/data/import/BulkStats.tbl # - /usr/local/MariaDB/Columnstore/bin/cpimport -j 1001 - /usr/local/MariaDB/Columnstore/bin/cpimport -j 1002 + /usr/local/mariadb/columnstore/bin/cpimport -j 1001 + /usr/local/mariadb/columnstore/bin/cpimport -j 1002 } #========================================================================================= diff --git a/utils/scenarios/common/sh/execSQLScript_m.sh b/utils/scenarios/common/sh/execSQLScript_m.sh index 54e669350..da731b527 100755 --- a/utils/scenarios/common/sh/execSQLScript_m.sh +++ b/utils/scenarios/common/sh/execSQLScript_m.sh @@ -22,5 +22,5 @@ # # Execute script on test database # - /usr/local/MariaDB/Columnstore/mysql/bin/mysql --defaults-file=/usr/local/MariaDB/Columnstore/mysql/my.cnf -f -u root $1 <$6 > $logFileName.test.log 2>&1 + /usr/local/mariadb/columnstore/mysql/bin/mysql --defaults-file=/usr/local/mariadb/columnstore/mysql/my.cnf -f -u root $1 <$6 > $logFileName.test.log 2>&1 diff $logFileName.ref.log $logFileName.test.log > $logFileName.diff.log diff --git a/utils/scenarios/common/sh/restore100gb.sh b/utils/scenarios/common/sh/restore100gb.sh index 871a0101e..dd844ebfd 100755 --- a/utils/scenarios/common/sh/restore100gb.sh +++ b/utils/scenarios/common/sh/restore100gb.sh @@ -3,17 +3,17 @@ #========================================================================================= mount /dev/sdj1 /mnt/qadbs # -rm -rf /usr/local/MariaDB/Columnstore/data1/000.dir -rm -rf /usr/local/MariaDB/Columnstore/data2/000.dir -rm -rf /usr/local/MariaDB/Columnstore/data3/000.dir -rm -rf /usr/local/MariaDB/Columnstore/data4/000.dir -rm -f /usr/local/MariaDB/Columnstore/data1/systemFiles/dbrm/* +rm -rf /usr/local/mariadb/columnstore/data1/000.dir +rm -rf /usr/local/mariadb/columnstore/data2/000.dir +rm -rf /usr/local/mariadb/columnstore/data3/000.dir +rm -rf /usr/local/mariadb/columnstore/data4/000.dir +rm -f /usr/local/mariadb/columnstore/data1/systemFiles/dbrm/* # -cp /mnt/qadbs/tpch/1m-1-10-100/dbrm/* /usr/local/MariaDB/Columnstore/data1/systemFiles/dbrm +cp /mnt/qadbs/tpch/1m-1-10-100/dbrm/* /usr/local/mariadb/columnstore/data1/systemFiles/dbrm # -cp -r /mnt/qadbs/tpch/1m-1-10-100/data1/000.dir /usr/local/MariaDB/Columnstore/data1 & -cp -r /mnt/qadbs/tpch/1m-1-10-100/data2/000.dir /usr/local/MariaDB/Columnstore/data2 & -cp -r /mnt/qadbs/tpch/1m-1-10-100/data3/000.dir /usr/local/MariaDB/Columnstore/data3 & -cp -r /mnt/qadbs/tpch/1m-1-10-100/data4/000.dir /usr/local/MariaDB/Columnstore/data4 & +cp -r /mnt/qadbs/tpch/1m-1-10-100/data1/000.dir /usr/local/mariadb/columnstore/data1 & +cp -r /mnt/qadbs/tpch/1m-1-10-100/data2/000.dir /usr/local/mariadb/columnstore/data2 & +cp -r /mnt/qadbs/tpch/1m-1-10-100/data3/000.dir /usr/local/mariadb/columnstore/data3 & +cp -r /mnt/qadbs/tpch/1m-1-10-100/data4/000.dir /usr/local/mariadb/columnstore/data4 & # diff --git a/utils/scenarios/common/sh/testExecEngine.sh b/utils/scenarios/common/sh/testExecEngine.sh index c682bae79..e21bd1bec 100755 --- a/utils/scenarios/common/sh/testExecEngine.sh +++ b/utils/scenarios/common/sh/testExecEngine.sh @@ -59,11 +59,11 @@ 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/. - /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 - /usr/local/MariaDB/Columnstore/bin/mcsadmin getprocessstatus > $1/getProcessStatus.$2.log + cp /usr/local/mariadb/columnstore/etc/Calpont.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 + /usr/local/mariadb/columnstore/bin/mcsadmin getprocessstatus > $1/getProcessStatus.$2.log } #========================================================================================= # log environment info @@ -186,7 +186,7 @@ function execOneTestRun { fi if [ $dbmsType = "M" ]; then pathSfn=$1\/$sess - /usr/local/MariaDB/Columnstore/mysql/bin/mysql --defaults-file=/usr/local/MariaDB/Columnstore/mysql/my.cnf -u root $testDB <$sfn 2> $pathSfn\/$sfn.err.log |grep "^Calpont" > $pathSfn\/$sfn.log & + /usr/local/mariadb/columnstore/mysql/bin/mysql --defaults-file=/usr/local/mariadb/columnstore/mysql/my.cnf -u root $testDB <$sfn 2> $pathSfn\/$sfn.err.log |grep "^Calpont" > $pathSfn\/$sfn.log & else su - oracle -c "sqlplus /nolog @/home/qa/srv/common/script/callogin.sql $testDB $testDB xe srvqaperf2 <$sfn" |grep "^Calpont" > $1\/$sess\/$sfn.log & fi diff --git a/utils/scenarios/common/sql/load_TestStats.sql b/utils/scenarios/common/sql/load_TestStats.sql index e1478de78..018928ea5 100644 --- a/utils/scenarios/common/sql/load_TestStats.sql +++ b/utils/scenarios/common/sql/load_TestStats.sql @@ -4,7 +4,7 @@ * Author: Joseph Williams * Purpose: Script to load the performance test result from a CSV file. ******************************************************************************/ -LOAD DATA INFILE '/usr/local/MariaDB/Columnstore/data/bulk/data/import/TestStats.tbl' +LOAD DATA INFILE '/usr/local/mariadb/columnstore/data/bulk/data/import/TestStats.tbl' INTO TABLE TestStats FIELDS TERMINATED BY '|' diff --git a/utils/scenarios/common/sql/load_TestSummary.sql b/utils/scenarios/common/sql/load_TestSummary.sql index 22745ade5..2a28a3a58 100644 --- a/utils/scenarios/common/sql/load_TestSummary.sql +++ b/utils/scenarios/common/sql/load_TestSummary.sql @@ -4,7 +4,7 @@ * Author: Joseph Williams * Purpose: Script to load the performance test result from a CSV file. ******************************************************************************/ -LOAD DATA INFILE '/usr/local/MariaDB/Columnstore/data/bulk/data/import/TestSummary.tbl' +LOAD DATA INFILE '/usr/local/mariadb/columnstore/data/bulk/data/import/TestSummary.tbl' INTO TABLE TestSummary FIELDS TERMINATED BY '|' diff --git a/utils/scenarios/common/sql/load_TestTime.sql b/utils/scenarios/common/sql/load_TestTime.sql index e2689fdb4..6ea77ff7d 100644 --- a/utils/scenarios/common/sql/load_TestTime.sql +++ b/utils/scenarios/common/sql/load_TestTime.sql @@ -4,7 +4,7 @@ * Author: Joseph Williams * Purpose: Script to load the performance test result from a CSV file. ******************************************************************************/ -LOAD DATA INFILE '/usr/local/MariaDB/Columnstore/data/bulk/data/import/TestTime.tbl' +LOAD DATA INFILE '/usr/local/mariadb/columnstore/data/bulk/data/import/TestTime.tbl' INTO TABLE TestTime FIELDS TERMINATED BY '|' diff --git a/utils/scenarios/dwweek/test/dwSubmitCpimport.sh b/utils/scenarios/dwweek/test/dwSubmitCpimport.sh index 6fe959bb4..d697556e0 100644 --- a/utils/scenarios/dwweek/test/dwSubmitCpimport.sh +++ b/utils/scenarios/dwweek/test/dwSubmitCpimport.sh @@ -22,13 +22,13 @@ echo \#!/bin/bash > $bulkScriptName echo \# >> $bulkScriptName # - echo rm -f /usr/local/MariaDB/Columnstore/data/bulk/log/Jobxml_9999.log >> $bulkScriptName - echo rm -f /usr/local/MariaDB/Columnstore/data/bulk/log/Job_9999.log >> $bulkScriptName - echo /usr/local/MariaDB/Columnstore/bin/colxml $testDB -t lineitem -l $sourceFileName -j 9999 >> $bulkScriptName - echo /usr/local/MariaDB/Columnstore/bin/cpimport -j 9999 >> $bulkScriptName - echo cp /usr/local/MariaDB/Columnstore/data/bulk/job/Job_9999.xml . >> $bulkScriptName - echo cp /usr/local/MariaDB/Columnstore/data/bulk/log/Jobxml_9999.log . >> $bulkScriptName - echo cp /usr/local/MariaDB/Columnstore/data/bulk/log/Job_9999.log . >> $bulkScriptName + echo rm -f /usr/local/mariadb/columnstore/data/bulk/log/Jobxml_9999.log >> $bulkScriptName + echo rm -f /usr/local/mariadb/columnstore/data/bulk/log/Job_9999.log >> $bulkScriptName + echo /usr/local/mariadb/columnstore/bin/colxml $testDB -t lineitem -l $sourceFileName -j 9999 >> $bulkScriptName + echo /usr/local/mariadb/columnstore/bin/cpimport -j 9999 >> $bulkScriptName + echo cp /usr/local/mariadb/columnstore/data/bulk/job/Job_9999.xml . >> $bulkScriptName + echo cp /usr/local/mariadb/columnstore/data/bulk/log/Jobxml_9999.log . >> $bulkScriptName + echo cp /usr/local/mariadb/columnstore/data/bulk/log/Job_9999.log . >> $bulkScriptName chmod 777 $bulkScriptName # #append current directory path to to script file name diff --git a/utils/scenarios/dwweek/test/dwbackup.sh b/utils/scenarios/dwweek/test/dwbackup.sh index 9180d5ce3..332392ab5 100644 --- a/utils/scenarios/dwweek/test/dwbackup.sh +++ b/utils/scenarios/dwweek/test/dwbackup.sh @@ -3,7 +3,7 @@ numRoots=4 # for ((idx=1; $idx<=$numRoots; idx++)); do - rm -rf /usr/local/MariaDB/Columnstore/data$idx/dwbackup/2 & + rm -rf /usr/local/mariadb/columnstore/data$idx/dwbackup/2 & pids[$idx]=$! done # @@ -26,9 +26,9 @@ done # for ((idx=1; $idx<=$numRoots; idx++)); do - mv /usr/local/MariaDB/Columnstore/data$idx/dwbackup/1 /usr/local/MariaDB/Columnstore/data$idx/dwbackup/2 - mkdir -p /usr/local/MariaDB/Columnstore/data$idx/dwbackup/1 - cp -r /usr/local/MariaDB/Columnstore/data$idx/000.dir /usr/local/MariaDB/Columnstore/data$idx/dwbackup/1 & + mv /usr/local/mariadb/columnstore/data$idx/dwbackup/1 /usr/local/mariadb/columnstore/data$idx/dwbackup/2 + mkdir -p /usr/local/mariadb/columnstore/data$idx/dwbackup/1 + cp -r /usr/local/mariadb/columnstore/data$idx/000.dir /usr/local/mariadb/columnstore/data$idx/dwbackup/1 & pids[$idx]=$! done # @@ -49,4 +49,4 @@ done sleep 5 done - cp -r /mnt/OAM/dbrm /usr/local/MariaDB/Columnstore/data1/dwbackup/1/. + cp -r /mnt/OAM/dbrm /usr/local/mariadb/columnstore/data1/dwbackup/1/. diff --git a/utils/scenarios/perf/sh/pfExeSQLscript.sh b/utils/scenarios/perf/sh/pfExeSQLscript.sh index ca40e7ceb..8b80bc1cf 100755 --- a/utils/scenarios/perf/sh/pfExeSQLscript.sh +++ b/utils/scenarios/perf/sh/pfExeSQLscript.sh @@ -19,5 +19,5 @@ # # Execute script on test database # - /usr/local/MariaDB/Columnstore/mysql/bin/mysql --defaults-file=/usr/local/MariaDB/Columnstore/mysql/my.cnf -u root $1 <$2 > $logFileName.test.log + /usr/local/mariadb/columnstore/mysql/bin/mysql --defaults-file=/usr/local/mariadb/columnstore/mysql/my.cnf -u root $1 <$2 > $logFileName.test.log exit 0 diff --git a/utils/scenarios/perf/source/pf/common/exeStreamTest.sh b/utils/scenarios/perf/source/pf/common/exeStreamTest.sh index e2fcdca67..4471a5da2 100755 --- a/utils/scenarios/perf/source/pf/common/exeStreamTest.sh +++ b/utils/scenarios/perf/source/pf/common/exeStreamTest.sh @@ -50,15 +50,15 @@ while [ $k -le $repeatNum ] do if [ $restart == Y ] || [ $restart == y ] then - /usr/local/MariaDB/Columnstore/bin/mcsadmin restartsystem y + /usr/local/mariadb/columnstore/bin/mcsadmin restartsystem y sleep 90 fi mkdir $k cd $k - cp /usr/local/MariaDB/Columnstore/etc/Calpont.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 + cp /usr/local/mariadb/columnstore/etc/Calpont.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 $exeCommand > $logFileName 2>&1 # if [ $streamNum == 1_7 ] @@ -71,7 +71,7 @@ do done fi # - /usr/local/MariaDB/Columnstore/bin/mcsadmin getProcessStatus >stackConfigAfter.txt + /usr/local/mariadb/columnstore/bin/mcsadmin getProcessStatus >stackConfigAfter.txt /home/pf/auto/common/extractstartstoptimes.sh cd .. ((k++)) diff --git a/utils/scenarios/perf/source/pf/common/sendPlanExec.sh b/utils/scenarios/perf/source/pf/common/sendPlanExec.sh index 75df1028d..329181b5f 100755 --- a/utils/scenarios/perf/source/pf/common/sendPlanExec.sh +++ b/utils/scenarios/perf/source/pf/common/sendPlanExec.sh @@ -14,7 +14,7 @@ echo --------------------------------------------------------------------------- echo sendPlan start: $3 date echo -/usr/local/MariaDB/Columnstore/bin/sendPlan -v -s$1 -t$2 $3 +/usr/local/mariadb/columnstore/bin/sendPlan -v -s$1 -t$2 $3 echo date echo sendPlan end: $3 diff --git a/utils/scenarios/perf/source/pf/common/setDBRoots.sh b/utils/scenarios/perf/source/pf/common/setDBRoots.sh index b901aa9f0..b7ea3de61 100755 --- a/utils/scenarios/perf/source/pf/common/setDBRoots.sh +++ b/utils/scenarios/perf/source/pf/common/setDBRoots.sh @@ -22,48 +22,48 @@ echo *****-----*****-----*****-----*****-----***** # unmount dbroots from all PMs #----------------------------------------------------------------------------- echo unmounting PM1 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf3 qalpont! "umount -a" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf3 qalpont! "umount -a" echo unmounting PM2 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf4 qalpont! "umount -a" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf4 qalpont! "umount -a" echo unmounting PM3 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf5 qalpont! "umount -a" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf5 qalpont! "umount -a" echo unmounting PM4 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf8 qalpont! "umount -a" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf8 qalpont! "umount -a" #----------------------------------------------------------------------------- # save current fstab to fstab.auto then move 'set number' fstab to 'real' fstab #----------------------------------------------------------------------------- echo *-* echo doing the hokey pokey with fstabs on PM1 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf3 qalpont! "rm -f /etc/fstab.auto" -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf3 qalpont! "mv /etc/fstab /etc/fstab.auto" -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf3 qalpont! "cp /etc/fstab.[$setNum] /etc/fstab" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf3 qalpont! "rm -f /etc/fstab.auto" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf3 qalpont! "mv /etc/fstab /etc/fstab.auto" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf3 qalpont! "cp /etc/fstab.[$setNum] /etc/fstab" echo *-* echo doing the funky chicken with fstabs on PM2 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf4 qalpont! "rm -f /etc/fstab.auto" -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf4 qalpont! "mv /etc/fstab /etc/fstab.auto" -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf4 qalpont! "cp /etc/fstab.[$setNum] /etc/fstab" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf4 qalpont! "rm -f /etc/fstab.auto" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf4 qalpont! "mv /etc/fstab /etc/fstab.auto" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf4 qalpont! "cp /etc/fstab.[$setNum] /etc/fstab" echo *-* echo doing the swim with fstabs on PM3 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf5 qalpont! "rm -f /etc/fstab.auto" -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf5 qalpont! "mv /etc/fstab /etc/fstab.auto" -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf5 qalpont! "cp /etc/fstab.[$setNum] /etc/fstab" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf5 qalpont! "rm -f /etc/fstab.auto" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf5 qalpont! "mv /etc/fstab /etc/fstab.auto" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf5 qalpont! "cp /etc/fstab.[$setNum] /etc/fstab" echo *-* echo doing the stroll with fstabs on PM4 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf8 qalpont! "rm -f /etc/fstab.auto" -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf8 qalpont! "mv /etc/fstab /etc/fstab.auto" -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf8 qalpont! "cp /etc/fstab.[$setNum] /etc/fstab" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf8 qalpont! "rm -f /etc/fstab.auto" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf8 qalpont! "mv /etc/fstab /etc/fstab.auto" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf8 qalpont! "cp /etc/fstab.[$setNum] /etc/fstab" #----------------------------------------------------------------------------- # re-mount dbroots on all PMs #----------------------------------------------------------------------------- echo *-* echo mounting PM1 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf3 qalpont! "mount -a" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf3 qalpont! "mount -a" echo mounting PM2 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf4 qalpont! "mount -a" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf4 qalpont! "mount -a" echo mounting PM3 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf5 qalpont! "mount -a" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf5 qalpont! "mount -a" echo mounting PM4 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf8 qalpont! "mount -a" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf8 qalpont! "mount -a" #----------------------------------------------------------------------------- echo #----------------------------------------------------------------------------- @@ -71,13 +71,13 @@ echo set disk scheduler to deadline for newly mounted LUNs #----------------------------------------------------------------------------- echo echo setting disk scheduler to deadline on PM1 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf3 qalpont! "/etc/rc.d/rc.local" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf3 qalpont! "/etc/rc.d/rc.local" echo setting disk scheduler to deadline on PM2 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf4 qalpont! "/etc/rc.d/rc.local" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf4 qalpont! "/etc/rc.d/rc.local" echo setting disk scheduler to deadline on PM3 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf5 qalpont! "/etc/rc.d/rc.local" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf5 qalpont! "/etc/rc.d/rc.local" echo setting disk scheduler to deadline on PM4 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh srvqaperf8 qalpont! "/etc/rc.d/rc.local" +/usr/local/mariadb/columnstore/bin/remote_command.sh srvqaperf8 qalpont! "/etc/rc.d/rc.local" # echo -----*****-----*****-----*****-----*****-----** echo End - set dbroots to RAID Configuration $setNum diff --git a/utils/scenarios/perf/source/pf/common/setPMConfig.sh b/utils/scenarios/perf/source/pf/common/setPMConfig.sh index 20ded54ca..91b0d8675 100755 --- a/utils/scenarios/perf/source/pf/common/setPMConfig.sh +++ b/utils/scenarios/perf/source/pf/common/setPMConfig.sh @@ -13,7 +13,7 @@ echo Start - Set PM configuration # # Stopping the Calpont software -/usr/local/MariaDB/Columnstore/bin/mcsadmin stopsystem y ACK_YES +/usr/local/mariadb/columnstore/bin/mcsadmin stopsystem y ACK_YES # # set maximum number of PMs possible for the stack maxPMs=4 @@ -26,7 +26,7 @@ numPMs=$1 #----------------------------------------------------------------------------- k=1 while [ $k -le $maxPMs ]; do - /usr/local/MariaDB/Columnstore/bin/mcsadmin enableModule pm$k ACK_YES + /usr/local/mariadb/columnstore/bin/mcsadmin enableModule pm$k ACK_YES ((k++)) done #----------------------------------------------------------------------------- @@ -34,12 +34,12 @@ done #----------------------------------------------------------------------------- k=$maxPMs while [ $k -gt $numPMs ]; do - /usr/local/MariaDB/Columnstore/bin/mcsadmin disableModule pm$k ACK_YES + /usr/local/mariadb/columnstore/bin/mcsadmin disableModule pm$k ACK_YES ((k--)) done #----------------------------------------------------------------------------- # Starting the Calpont software -/usr/local/MariaDB/Columnstore/bin/mcsadmin startsystem y ACK_YES +/usr/local/mariadb/columnstore/bin/mcsadmin startsystem y ACK_YES sleep 60 echo *-*-*-*-*-*-*-*-*-*-*-*-*-*-* echo End - Set PM configuration diff --git a/utils/scenarios/perf/source/pf/common/setStackConfig.sh b/utils/scenarios/perf/source/pf/common/setStackConfig.sh index e5dcae0d9..0ce2e14ae 100755 --- a/utils/scenarios/perf/source/pf/common/setStackConfig.sh +++ b/utils/scenarios/perf/source/pf/common/setStackConfig.sh @@ -14,7 +14,7 @@ echo Start - Set stack configuration # # Stopping the Calpont software -/usr/local/MariaDB/Columnstore/bin/mcsadmin stopsystem y ACK_YES +/usr/local/mariadb/columnstore/bin/mcsadmin stopsystem y ACK_YES # # set maximum number of UMs and PMs possible the stack maxUMs=2 @@ -29,7 +29,7 @@ numPMs=$2 #----------------------------------------------------------------------------- k=1 while [ $k -le $maxUMs ]; do - /usr/local/MariaDB/Columnstore/bin/mcsadmin enableModule um$k ACK_YES + /usr/local/mariadb/columnstore/bin/mcsadmin enableModule um$k ACK_YES ((k++)) done #----------------------------------------------------------------------------- @@ -37,7 +37,7 @@ done #----------------------------------------------------------------------------- k=$maxUMs while [ $k -gt $numUMs ]; do - /usr/local/MariaDB/Columnstore/bin/mcsadmin disableModule um$k ACK_YES + /usr/local/mariadb/columnstore/bin/mcsadmin disableModule um$k ACK_YES ((k--)) done #----------------------------------------------------------------------------- @@ -45,7 +45,7 @@ done #----------------------------------------------------------------------------- k=1 while [ $k -le $maxPMs ]; do - /usr/local/MariaDB/Columnstore/bin/mcsadmin enableModule pm$k ACK_YES + /usr/local/mariadb/columnstore/bin/mcsadmin enableModule pm$k ACK_YES ((k++)) done #----------------------------------------------------------------------------- @@ -53,7 +53,7 @@ done #----------------------------------------------------------------------------- k=$maxPMs while [ $k -gt $numPMs ]; do - /usr/local/MariaDB/Columnstore/bin/mcsadmin disableModule pm$k ACK_YES + /usr/local/mariadb/columnstore/bin/mcsadmin disableModule pm$k ACK_YES ((k--)) done #----------------------------------------------------------------------------- diff --git a/utils/scenarios/perf/source/pf/common/setTestEnv.sh b/utils/scenarios/perf/source/pf/common/setTestEnv.sh index 70bb0c0d7..e4fbc334a 100755 --- a/utils/scenarios/perf/source/pf/common/setTestEnv.sh +++ b/utils/scenarios/perf/source/pf/common/setTestEnv.sh @@ -21,7 +21,7 @@ setNum=$3 # /home/pf/auto/common/setStackConfig.sh $numUMs $numPMs /home/pf/auto/common/setDBRoots.sh $setNum -/usr/local/MariaDB/Columnstore/bin/mcsadmin startsystem +/usr/local/mariadb/columnstore/bin/mcsadmin startsystem sleep 90 # # End of script diff --git a/utils/scenarios/perf/source/pf/common/step1.sh b/utils/scenarios/perf/source/pf/common/step1.sh index 70bb0c0d7..e4fbc334a 100755 --- a/utils/scenarios/perf/source/pf/common/step1.sh +++ b/utils/scenarios/perf/source/pf/common/step1.sh @@ -21,7 +21,7 @@ setNum=$3 # /home/pf/auto/common/setStackConfig.sh $numUMs $numPMs /home/pf/auto/common/setDBRoots.sh $setNum -/usr/local/MariaDB/Columnstore/bin/mcsadmin startsystem +/usr/local/mariadb/columnstore/bin/mcsadmin startsystem sleep 90 # # End of script diff --git a/utils/scenarios/perf/source/pf/common/step2.sh b/utils/scenarios/perf/source/pf/common/step2.sh index c4f9689cf..a32a995f3 100755 --- a/utils/scenarios/perf/source/pf/common/step2.sh +++ b/utils/scenarios/perf/source/pf/common/step2.sh @@ -46,15 +46,15 @@ while [ $k -le $repeatNum ] do if [ $restart == Y ] || [ $restart == y ] then - /usr/local/MariaDB/Columnstore/bin/mcsadmin restartsystem y + /usr/local/mariadb/columnstore/bin/mcsadmin restartsystem y sleep 90 fi mkdir $k cd $k - cp /usr/local/MariaDB/Columnstore/etc/Calpont.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 + cp /usr/local/mariadb/columnstore/etc/Calpont.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 $exeCommand > $logFileName 2>&1 # if [ $streamNum == 1_7 ] @@ -67,7 +67,7 @@ do done fi # - /usr/local/MariaDB/Columnstore/bin/mcsadmin getProcessStatus >stackConfigAfter.txt + /usr/local/mariadb/columnstore/bin/mcsadmin getProcessStatus >stackConfigAfter.txt cd .. ((k++)) done diff --git a/utils/scenarios/perf/source/pf/fm/getlogs.sh b/utils/scenarios/perf/source/pf/fm/getlogs.sh index a34a8cac0..a93adf9e1 100755 --- a/utils/scenarios/perf/source/pf/fm/getlogs.sh +++ b/utils/scenarios/perf/source/pf/fm/getlogs.sh @@ -28,6 +28,6 @@ then fi # mkdir /tmp/$host/logs -cp -r /var/log/Columnstore/* /tmp/$host/logs +cp -r /var/log/mariadb/columnstore/* /tmp/$host/logs # # End of script diff --git a/utils/scenarios/perf/source/pf/fm/getsar.sh b/utils/scenarios/perf/source/pf/fm/getsar.sh index a12977c26..f1f617422 100755 --- a/utils/scenarios/perf/source/pf/fm/getsar.sh +++ b/utils/scenarios/perf/source/pf/fm/getsar.sh @@ -57,9 +57,9 @@ smbclient //calweb/perf -Wcalpont -Uoamuser%Calpont1 -c "cd ${host1};prompt OFF; #------------------------------------------------------------------------------ # Execute the script on the other servers in the stack # -/usr/local/MariaDB/Columnstore/bin/remote_command.sh $host2 qalpont! "/home/pf/auto/fm/sar.sh $1 $2 $3" 1 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh $host3 qalpont! "/home/pf/auto/fm/sar.sh $1 $2 $3" 1 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh $host4 qalpont! "/home/pf/auto/fm/sar.sh $1 $2 $3" 1 -/usr/local/MariaDB/Columnstore/bin/remote_command.sh $host5 qalpont! "/home/pf/auto/fm/sar.sh $1 $2 $3" 1 +/usr/local/mariadb/columnstore/bin/remote_command.sh $host2 qalpont! "/home/pf/auto/fm/sar.sh $1 $2 $3" 1 +/usr/local/mariadb/columnstore/bin/remote_command.sh $host3 qalpont! "/home/pf/auto/fm/sar.sh $1 $2 $3" 1 +/usr/local/mariadb/columnstore/bin/remote_command.sh $host4 qalpont! "/home/pf/auto/fm/sar.sh $1 $2 $3" 1 +/usr/local/mariadb/columnstore/bin/remote_command.sh $host5 qalpont! "/home/pf/auto/fm/sar.sh $1 $2 $3" 1 # # End of Script diff --git a/utils/scenarios/perf/source/pf/fm/getsql.orig b/utils/scenarios/perf/source/pf/fm/getsql.orig index e0f8e46f4..5284101e0 100755 --- a/utils/scenarios/perf/source/pf/fm/getsql.orig +++ b/utils/scenarios/perf/source/pf/fm/getsql.orig @@ -41,7 +41,7 @@ cmd="/$startdate/,/$enddate/ {print \$0} " echo $cmd > /tmp/$host/sql/cmd.$$ # # execute the command -awk -f /tmp/$host/sql/cmd.$$ /usr/local/MariaDB/Columnstore/mysql/db/$host.log > /tmp/$host/sql/temp.log +awk -f /tmp/$host/sql/cmd.$$ /usr/local/mariadb/columnstore/mysql/db/$host.log > /tmp/$host/sql/temp.log # exit # diff --git a/utils/scenarios/perf/source/pf/fm/getsql.sh b/utils/scenarios/perf/source/pf/fm/getsql.sh index bc0e38e87..033fd82cb 100755 --- a/utils/scenarios/perf/source/pf/fm/getsql.sh +++ b/utils/scenarios/perf/source/pf/fm/getsql.sh @@ -52,7 +52,7 @@ while [ $k -ge $st ] && [ $k -le $et ] && [ $foundstart == "no" ]; do k=`expr $k + 39` sm=`expr $sm - 61` elif [ $k -ge $st ] && [ $k -le $et ]; then - grep -q "$newdate $sh:$sm" /usr/local/MariaDB/Columnstore/mysql/db/$host.log + grep -q "$newdate $sh:$sm" /usr/local/mariadb/columnstore/mysql/db/$host.log if [ "$?" -eq "0" ] && [ $foundstart == "no" ]; then start="$newdate $sh:$sm" foundstart="yes" @@ -69,7 +69,7 @@ while [ $k -ge $st ] && [ $k -le $et ] && [ $foundend == "no" ]; do k=`expr $k + 39` em=`expr $em - 61` elif [ $k -ge $st ] && [ $k -le $et ]; then - grep -q "$newdate $eh:$em" /usr/local/MariaDB/Columnstore/mysql/db/$host.log + grep -q "$newdate $eh:$em" /usr/local/mariadb/columnstore/mysql/db/$host.log if [ "$?" -eq "0" ] && [ $foundend == "no" ]; then end="$newdate $eh:$em" foundend="yes" @@ -87,7 +87,7 @@ cmd="/$start/,/$end/ {print \$0} " echo $cmd >> /tmp/$host/sql/cmd.$$ # # execute the command -awk -f /tmp/$host/sql/cmd.$$ /usr/local/MariaDB/Columnstore/mysql/db/$host.log > /tmp/$host/sql/temp.log +awk -f /tmp/$host/sql/cmd.$$ /usr/local/mariadb/columnstore/mysql/db/$host.log > /tmp/$host/sql/temp.log # exit # diff --git a/utils/scenarios/perf/source/pf/scripts/1server_all.sh b/utils/scenarios/perf/source/pf/scripts/1server_all.sh index 6dd57520f..133eb0cd5 100755 --- a/utils/scenarios/perf/source/pf/scripts/1server_all.sh +++ b/utils/scenarios/perf/source/pf/scripts/1server_all.sh @@ -57,7 +57,7 @@ echo ------------------------------------------------------------------ echo executing setLowMem100 script to prep for following stream1_7 tests echo ------------------------------------------------------------------ echo -/usr/local/MariaDB/Columnstore/bin/setLowMem100.sh +/usr/local/mariadb/columnstore/bin/setLowMem100.sh # echo echo ------------------------------------------------------------------ diff --git a/utils/scenarios/perf/source/pf/scripts/1um_1a_100_s17.sh b/utils/scenarios/perf/source/pf/scripts/1um_1a_100_s17.sh index edf7fdcd0..f85109440 100755 --- a/utils/scenarios/perf/source/pf/scripts/1um_1a_100_s17.sh +++ b/utils/scenarios/perf/source/pf/scripts/1um_1a_100_s17.sh @@ -8,7 +8,7 @@ echo executing setLowMem100 script to prep for following stream1_7 tests echo ------------------------------------------------------------------ echo # -/usr/local/MariaDB/Columnstore/bin/setLowMem100.sh +/usr/local/mariadb/columnstore/bin/setLowMem100.sh # echo echo ------------------------------------------------------------------ diff --git a/utils/scenarios/perf/source/pf/scripts/1um_2a_100_s17.sh b/utils/scenarios/perf/source/pf/scripts/1um_2a_100_s17.sh index c327a015e..ba05c1793 100755 --- a/utils/scenarios/perf/source/pf/scripts/1um_2a_100_s17.sh +++ b/utils/scenarios/perf/source/pf/scripts/1um_2a_100_s17.sh @@ -8,7 +8,7 @@ echo executing setLowMem100 script to prep for following stream1_7 tests echo ------------------------------------------------------------------ echo # -/usr/local/MariaDB/Columnstore/bin/setLowMem100.sh +/usr/local/mariadb/columnstore/bin/setLowMem100.sh # echo echo ------------------------------------------------------------------ diff --git a/utils/scenarios/perf/source/pf/scripts/1um_allarrays_allPMs_s0_s17.sh b/utils/scenarios/perf/source/pf/scripts/1um_allarrays_allPMs_s0_s17.sh index 71d3deb94..3dc4ccff2 100755 --- a/utils/scenarios/perf/source/pf/scripts/1um_allarrays_allPMs_s0_s17.sh +++ b/utils/scenarios/perf/source/pf/scripts/1um_allarrays_allPMs_s0_s17.sh @@ -53,7 +53,7 @@ echo ------------------------------------------------------------------ echo executing setLowMem100 script to prep for following stream1_7 tests echo ------------------------------------------------------------------ echo -/usr/local/MariaDB/Columnstore/bin/setLowMem100.sh +/usr/local/mariadb/columnstore/bin/setLowMem100.sh # echo echo ------------------------------------------------------------------ diff --git a/utils/scenarios/perf/source/pf/scripts/2a_100g_1t_s0_s17.sh b/utils/scenarios/perf/source/pf/scripts/2a_100g_1t_s0_s17.sh index 6c27111b5..f988de10f 100755 --- a/utils/scenarios/perf/source/pf/scripts/2a_100g_1t_s0_s17.sh +++ b/utils/scenarios/perf/source/pf/scripts/2a_100g_1t_s0_s17.sh @@ -82,7 +82,7 @@ echo executing setLowMem100 script to prep for following stream1_7 tests echo ------------------------------------------------------------------ echo # -/usr/local/MariaDB/Columnstore/bin/setLowMem100.sh +/usr/local/mariadb/columnstore/bin/setLowMem100.sh # echo echo ------------------------------------------------------------------ diff --git a/utils/scenarios/perf/source/pf/scripts/2um_allconfigs_s17.sh b/utils/scenarios/perf/source/pf/scripts/2um_allconfigs_s17.sh index 186abf34b..ebda7d39e 100755 --- a/utils/scenarios/perf/source/pf/scripts/2um_allconfigs_s17.sh +++ b/utils/scenarios/perf/source/pf/scripts/2um_allconfigs_s17.sh @@ -12,7 +12,7 @@ echo ------------------------------------------------------------------ echo executing setLowMem100 script to prep for following stream1_7 tests echo ------------------------------------------------------------------ echo -/usr/local/MariaDB/Columnstore/bin/setLowMem100.sh +/usr/local/mariadb/columnstore/bin/setLowMem100.sh # echo echo ------------------------------------------------------------------ diff --git a/utils/scenarios/perf/source/pf/scripts/allconfigs_s17.sh b/utils/scenarios/perf/source/pf/scripts/allconfigs_s17.sh index b85d99eaf..ccd16cf66 100755 --- a/utils/scenarios/perf/source/pf/scripts/allconfigs_s17.sh +++ b/utils/scenarios/perf/source/pf/scripts/allconfigs_s17.sh @@ -12,7 +12,7 @@ echo ------------------------------------------------------------------ echo executing setLowMem100 script to prep for following stream1_7 tests echo ------------------------------------------------------------------ echo -/usr/local/MariaDB/Columnstore/bin/setLowMem100.sh +/usr/local/mariadb/columnstore/bin/setLowMem100.sh # echo echo ------------------------------------------------------------------ diff --git a/utils/scenarios/perf/test/pfSubmitBulkTest.sh b/utils/scenarios/perf/test/pfSubmitBulkTest.sh index e2436b22e..1a7d73eaa 100755 --- a/utils/scenarios/perf/test/pfSubmitBulkTest.sh +++ b/utils/scenarios/perf/test/pfSubmitBulkTest.sh @@ -19,19 +19,19 @@ # echo \#\!/bin/bash > $cpimportScriptName echo \# >> $cpimportScriptName - echo cd /usr/local/MariaDB/Columnstore/data/bulk/log >> $cpimportScriptName + echo cd /usr/local/mariadb/columnstore/data/bulk/log >> $cpimportScriptName echo rm -f Jobxml_9999.log >> $cpimportScriptName echo rm -f Job_9999.log >> $cpimportScriptName echo rm -f fileStats.txt >> $cpimportScriptName echo rm -f finished.txt >> $cpimportScriptName - echo "ls -alh /usr/local/MariaDB/Columnstore/data/bulk/data/import/*.tbl > fileStats.txt" >> $cpimportScriptName -# echo "wc -l /usr/local/MariaDB/Columnstore/data/bulk/data/import/*.tbl >> fileStats.txt" >> $cpimportScriptName + echo "ls -alh /usr/local/mariadb/columnstore/data/bulk/data/import/*.tbl > fileStats.txt" >> $cpimportScriptName +# echo "wc -l /usr/local/mariadb/columnstore/data/bulk/data/import/*.tbl >> fileStats.txt" >> $cpimportScriptName # - echo /usr/local/MariaDB/Columnstore/bin/colxml $testDB -r 2 -j 9999 >> $cpimportScriptName + echo /usr/local/mariadb/columnstore/bin/colxml $testDB -r 2 -j 9999 >> $cpimportScriptName echo sleep 5 >> $cpimportScriptName echo sync >> $cpimportScriptName # - echo \# /usr/local/MariaDB/Columnstore/bin/cpimport -j 9999 -i >> $cpimportScriptName + echo \# /usr/local/mariadb/columnstore/bin/cpimport -j 9999 -i >> $cpimportScriptName echo sleep 5 >> $cpimportScriptName echo touch finished.txt >> $cpimportScriptName echo sync >> $cpimportScriptName @@ -47,15 +47,15 @@ echo "/root/genii/utils/scenarios/common/sh/remote_command.sh $PM1 qalpont! \"/mnt/parentOAM$curDir/$cpimportScriptName\"" >> $bulkScriptName # echo sleep 5 >> $bulkScriptName - echo "while [ ! -f /mnt/pm1/usr/local/MariaDB/Columnstore/data/bulk/log/finished.txt ]; do" >> $bulkScriptName + echo "while [ ! -f /mnt/pm1/usr/local/mariadb/columnstore/data/bulk/log/finished.txt ]; do" >> $bulkScriptName echo sleep 5 >> $bulkScriptName echo echo waiting...... >> $bulkScriptName echo done >> $bulkScriptName # - echo cp /mnt/pm1/usr/local/MariaDB/Columnstore/data/bulk/job/Job_9999.xml . >> $bulkScriptName - echo cp /mnt/pm1/usr/local/MariaDB/Columnstore/data/bulk/log/Jobxml_9999.log . >> $bulkScriptName - echo cp /mnt/pm1/usr/local/MariaDB/Columnstore/data/bulk/log/Job_9999.log . >> $bulkScriptName - echo cp /mnt/pm1/usr/local/MariaDB/Columnstore/data/bulk/log/fileStats.txt . >> $bulkScriptName + echo cp /mnt/pm1/usr/local/mariadb/columnstore/data/bulk/job/Job_9999.xml . >> $bulkScriptName + echo cp /mnt/pm1/usr/local/mariadb/columnstore/data/bulk/log/Jobxml_9999.log . >> $bulkScriptName + echo cp /mnt/pm1/usr/local/mariadb/columnstore/data/bulk/log/Job_9999.log . >> $bulkScriptName + echo cp /mnt/pm1/usr/local/mariadb/columnstore/data/bulk/log/fileStats.txt . >> $bulkScriptName # chmod 777 $bulkScriptName # diff --git a/utils/startup/installdir.cpp b/utils/startup/installdir.cpp index ec842e8f1..f75fb11cb 100644 --- a/utils/startup/installdir.cpp +++ b/utils/startup/installdir.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -52,7 +52,7 @@ const string StartUp::installDir() if (!cfStr.empty()) *fInstallDirp = cfStr; #else - fInstallDirp = new string("/usr/local/MariaDB/Columnstore"); + fInstallDirp = new string("/usr/local/mariadb/columnstore"); //See if we can figure out the install dir in Linux... //1. env var INFINIDB_INSTALL_DIR const char* p=0; @@ -60,7 +60,7 @@ const string StartUp::installDir() if (p && *p) *fInstallDirp = p; //2. up one level from current binary location? - //3. fall back to /usr/local/MariaDB/Columnstore + //3. fall back to /usr/local/mariadb/columnstore #endif return *fInstallDirp; diff --git a/utils/testbc/stats.cpp b/utils/testbc/stats.cpp index a9b5802c9..03d6d6347 100644 --- a/utils/testbc/stats.cpp +++ b/utils/testbc/stats.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -92,7 +92,7 @@ public: else outName = name; ostringstream oss; - oss << "/var/log/Columnstore/trace/" << outName << '.' << sessionID; + oss << "/var/log/mariadb/columnstore/trace/" << outName << '.' << sessionID; oFile.reset(new ofstream()); oFile->open(oss.str().c_str(), ios_base::out | ios_base::ate | ios_base::app); } diff --git a/utils/udfsdk/README.txt b/utils/udfsdk/README.txt index 591db3154..3b72ec2f0 100644 --- a/utils/udfsdk/README.txt +++ b/utils/udfsdk/README.txt @@ -15,11 +15,11 @@ At this point you can use the idb_add() function template in udfinfinidb.cpp and files to create your own function or just try that function as is. Make the library Stop InfiniDB -Copy the libudf_mysql.so.1.0.0 and libudfsdk.so.1.0.0 file to /usr/local/MariaDB/Columnstore/lib on +Copy the libudf_mysql.so.1.0.0 and libudfsdk.so.1.0.0 file to /usr/local/mariadb/columnstore/lib on every InfiniDB node Start InfiniDB -In the directory /usr/local/MariaDB/Columnstore/mysql/lib64/mysql/plugin create a symbolic link called -libudf_msql.so to the file /usr/local/MariaDB/Columnstore/lib/libudf_msql.so.1.0.0 +In the directory /usr/local/mariadb/columnstore/mysql/lib64/mysql/plugin create a symbolic link called +libudf_msql.so to the file /usr/local/mariadb/columnstore/lib/libudf_msql.so.1.0.0 In the mysql client add the function (e.g. "create function idb_add returns integer soname 'libudf_msql.so';") You should now be able to use the idb_add() function in the select and/or where clauses diff --git a/utils/udfsdk/udfinfinidb.cpp b/utils/udfsdk/udfinfinidb.cpp index 037ea50e1..1fe85afd6 100644 --- a/utils/udfsdk/udfinfinidb.cpp +++ b/utils/udfsdk/udfinfinidb.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/utils/udfsdk/udfsdk.h b/utils/udfsdk/udfsdk.h index 09f6dc4b9..19243d0e2 100644 --- a/utils/udfsdk/udfsdk.h +++ b/utils/udfsdk/udfsdk.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* Copyright (C) 2016 MariaDB, Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -30,7 +30,7 @@ * 2. add the UDF function implementation in udfsdk.cpp * 3. add the connector stub for this UDF function in udfsdk.cpp * 4. build the dynamic library libudfsdk - * 5. put the library in /usr/local/MariaDB/Columnstore/lib of all modules + * 5. put the library in /usr/local/mariadb/columnstore/lib of all modules * 6. restart all the InfiniDB servers and MySQL server * 7. notify mysqld about the new functions with the commands like: * diff --git a/versioning/BRM/Calpont.xml b/versioning/BRM/Calpont.xml index 3fa8dbd62..1bee8d812 100644 --- a/versioning/BRM/Calpont.xml +++ b/versioning/BRM/Calpont.xml @@ -251,7 +251,7 @@ 5 3 60 - /usr/local/MariaDB/Columnstore/data + /usr/local/mariadb/columnstore/data /home/pleblanc/DBRMRoot_test 90 80 @@ -355,7 +355,7 @@ /tmp/oidbitmap 3000 @@ -364,7 +364,7 @@ Commit - /usr/local/MariaDB/Columnstore/data/bulk + /usr/local/mariadb/columnstore/data/bulk