From 973edf5a87935b548ada654c1c29a170190c9855 Mon Sep 17 00:00:00 2001 From: David Hall Date: Wed, 6 Mar 2019 13:29:50 -0600 Subject: [PATCH 1/9] MCOL-2100 Don't print the line "redistributeData must have one of START, STOP or STATUS" if it has one. --- oamapps/mcsadmin/mcsadmin.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp index dd7262d1e..d88944961 100644 --- a/oamapps/mcsadmin/mcsadmin.cpp +++ b/oamapps/mcsadmin/mcsadmin.cpp @@ -801,9 +801,9 @@ int processCommand(string* arguments) SendToWES(oam, bs); } #if _MSC_VER - if (_strnicmp(arguments[1].c_str(), "stop", 4) == 0)) + else if (_strnicmp(arguments[1].c_str(), "stop", 4) == 0)) #else - if (strncasecmp(arguments[1].c_str(), "stop", 4) == 0) + else if (strncasecmp(arguments[1].c_str(), "stop", 4) == 0) #endif { ByteStream bs; @@ -815,9 +815,9 @@ int processCommand(string* arguments) SendToWES(oam, bs); } #if _MSC_VER - if (_strnicmp(arguments[1].c_str(), "status", 6) == 0)) + else if (_strnicmp(arguments[1].c_str(), "status", 6) == 0)) #else - if (strncasecmp(arguments[1].c_str(), "status", 6) == 0) + else if (strncasecmp(arguments[1].c_str(), "status", 6) == 0) #endif { ByteStream bs; From bed4eae7213515fdba22ff7f2e08be313bb28ba5 Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Fri, 29 Mar 2019 15:02:16 +0000 Subject: [PATCH 2/9] Bump to version 1.1.8 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 04362fcf8..6d304eb90 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ COLUMNSTORE_VERSION_MAJOR=1 COLUMNSTORE_VERSION_MINOR=1 -COLUMNSTORE_VERSION_PATCH=7 +COLUMNSTORE_VERSION_PATCH=8 COLUMNSTORE_VERSION_RELEASE=1 From 4e72b1f2d924566daf95175744630926fc21bdc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=95=B0=E7=BB=84=E8=B6=8A=E7=95=8C?= Date: Tue, 16 Apr 2019 09:31:49 +0800 Subject: [PATCH 3/9] fix typo in postConfigure --- oamapps/postConfigure/postConfigure.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp index fe7a3b337..107674507 100644 --- a/oamapps/postConfigure/postConfigure.cpp +++ b/oamapps/postConfigure/postConfigure.cpp @@ -4666,7 +4666,7 @@ bool storageSetup(bool amazonInstall) if ( (glusterInstalled == "y" && singleServerInstall != "1") && hadoopInstalled == "y" ) { - cout << "There are 5 options when configuring the storage: internal, external, DataRedundancy, or hdfs" << endl << endl; + cout << "There are 4 options when configuring the storage: internal, external, DataRedundancy, or hdfs" << endl << endl; prompt = "Select the type of Data Storage [1=internal, 2=external, 3=DataRedundancy, 4=hdfs] (" + storageType + ") > "; } From 83aad0c7b10bb7e0423ae5c7e845c94bc368d0f9 Mon Sep 17 00:00:00 2001 From: Sergey Sedov Date: Fri, 26 Apr 2019 11:10:29 +0300 Subject: [PATCH 4/9] MCOL-2051: CS uses 'NULL' literal as NULL when UPDATEs varchar field: proxying NULL value. Note: empty strings are still considered NULLs later on. --- dbcon/dmlpackage/dmlcolumn.cpp | 4 ---- dbcon/dmlpackage/dmlpkg.h | 5 +++-- dbcon/dmlpackage/updatedmlpackage.cpp | 3 ++- dbcon/mysql/ha_calpont_impl.cpp | 3 ++- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dbcon/dmlpackage/dmlcolumn.cpp b/dbcon/dmlpackage/dmlcolumn.cpp index 9bd0f67a8..f2a98f7d6 100644 --- a/dbcon/dmlpackage/dmlcolumn.cpp +++ b/dbcon/dmlpackage/dmlcolumn.cpp @@ -40,10 +40,6 @@ DMLColumn::DMLColumn(std::string name, std::string value, bool isFromCol, uint32 { fName = name; fData = value; - if (( strcasecmp(value.c_str(), "NULL") == 0) || (value.length() == 0) ) - { - isNULL = true; - } fisNULL = isNULL; fIsFromCol = isFromCol; fFuncScale = funcScale; diff --git a/dbcon/dmlpackage/dmlpkg.h b/dbcon/dmlpackage/dmlpkg.h index 3bef09343..924d974fd 100644 --- a/dbcon/dmlpackage/dmlpkg.h +++ b/dbcon/dmlpackage/dmlpkg.h @@ -409,8 +409,9 @@ public: std::string fColumn; std::string fOperator; std::string fScalarExpression; - bool fFromCol; - uint32_t fFuncScale; + bool fFromCol; + uint32_t fFuncScale; + bool fIsNull = false; }; /** @brief Stores a value list or a query specification diff --git a/dbcon/dmlpackage/updatedmlpackage.cpp b/dbcon/dmlpackage/updatedmlpackage.cpp index 05ca4f117..aa3504010 100644 --- a/dbcon/dmlpackage/updatedmlpackage.cpp +++ b/dbcon/dmlpackage/updatedmlpackage.cpp @@ -245,7 +245,8 @@ void UpdateDMLPackage::buildUpdateFromMysqlBuffer(UpdateSqlStatement& updateStm while (iter != updateStmt.fColAssignmentListPtr->end()) { ColumnAssignment* colaPtr = *iter; - DMLColumn* colPtr = new DMLColumn(colaPtr->fColumn, colaPtr->fScalarExpression, colaPtr->fFromCol, colaPtr->fFuncScale); + DMLColumn* colPtr = new DMLColumn(colaPtr->fColumn, colaPtr->fScalarExpression, colaPtr->fFromCol, colaPtr->fFuncScale, + colaPtr->fIsNull); rowPtr->get_ColumnList().push_back(colPtr); ++iter; diff --git a/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp index c1f37c9ac..7bb6ad212 100755 --- a/dbcon/mysql/ha_calpont_impl.cpp +++ b/dbcon/mysql/ha_calpont_impl.cpp @@ -1044,8 +1044,9 @@ uint32_t doUpdateDelete(THD *thd) else if ( value->type() == Item::NULL_ITEM ) { // dmlStmt += "NULL"; - columnAssignmentPtr->fScalarExpression = "NULL"; + columnAssignmentPtr->fScalarExpression = ""; columnAssignmentPtr->fFromCol = false; + columnAssignmentPtr->fIsNull = true; } else if ( value->type() == Item::SUBSELECT_ITEM ) { From 12d9e2ec954d24ec48ff0d948d8a2c06fb26bf11 Mon Sep 17 00:00:00 2001 From: Sergey Sedov Date: Thu, 2 May 2019 09:58:57 +0300 Subject: [PATCH 5/9] fixup! MCOL-2051: CS uses 'NULL' literal as NULL when UPDATEs varchar field Fixed to retain compatibility with CentOS 6 (no C++11 support). Moved initialization to the ColumnAssignment constructor. --- dbcon/dmlpackage/dml.y | 10 ++-------- dbcon/dmlpackage/dmlpkg.h | 10 +++++++++- dbcon/mysql/ha_calpont_impl.cpp | 5 +---- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dbcon/dmlpackage/dml.y b/dbcon/dmlpackage/dml.y index b26319c0b..73dcf26ea 100644 --- a/dbcon/dmlpackage/dml.y +++ b/dbcon/dmlpackage/dml.y @@ -566,17 +566,11 @@ assignment_commalist: assignment: column COMPARISON scalar_exp { - $$ = new ColumnAssignment(); - $$->fColumn = $1; - $$->fOperator = $2; - $$->fScalarExpression = $3; + $$ = new ColumnAssignment($1, $2, $3); } | column COMPARISON NULLX { - $$ = new ColumnAssignment(); - $$->fColumn = $1; - $$->fOperator = $2; - $$->fScalarExpression = $3; + $$ = new ColumnAssignment($1, $2, $3); } ; diff --git a/dbcon/dmlpackage/dmlpkg.h b/dbcon/dmlpackage/dmlpkg.h index 924d974fd..82c561b8e 100644 --- a/dbcon/dmlpackage/dmlpkg.h +++ b/dbcon/dmlpackage/dmlpkg.h @@ -397,6 +397,14 @@ public: class ColumnAssignment { public: + explicit ColumnAssignment( + std::string const& column, + std::string const& op = "=", + std::string const& expr = "") : + fColumn(column), fOperator(op), fScalarExpression(expr), + fFromCol(false), fFuncScale(0), fIsNull(false) + {}; + /** @brief dump to stdout */ std::ostream& put(std::ostream &os) const; @@ -411,7 +419,7 @@ public: std::string fScalarExpression; bool fFromCol; uint32_t fFuncScale; - bool fIsNull = false; + bool fIsNull; }; /** @brief Stores a value list or a query specification diff --git a/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp index 7bb6ad212..a6cbea6a9 100755 --- a/dbcon/mysql/ha_calpont_impl.cpp +++ b/dbcon/mysql/ha_calpont_impl.cpp @@ -928,10 +928,7 @@ uint32_t doUpdateDelete(THD *thd) else schemaName = string(item->db_name); - columnAssignmentPtr = new ColumnAssignment(); - columnAssignmentPtr->fColumn = string(item->name); - columnAssignmentPtr->fOperator = "="; - columnAssignmentPtr->fFuncScale = 0; + columnAssignmentPtr = new ColumnAssignment(item->name, "=", ""); Item *value= value_it++; if (value->type() == Item::STRING_ITEM) { From be83194c316e38a2aff28623960fe0818c403a66 Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Thu, 2 May 2019 10:32:49 +0100 Subject: [PATCH 6/9] MCOL-2273 Improve disk usage reporting Use the amount of available space rather than the amount of free space. The two numbers are usually different because the free blocks may be unusable at the time. --- oamapps/serverMonitor/diskMonitor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oamapps/serverMonitor/diskMonitor.cpp b/oamapps/serverMonitor/diskMonitor.cpp index bef1df560..e6989e4f6 100644 --- a/oamapps/serverMonitor/diskMonitor.cpp +++ b/oamapps/serverMonitor/diskMonitor.cpp @@ -240,7 +240,7 @@ void diskMonitor() blksize = buf.f_bsize; blocks = buf.f_blocks; - freeblks = buf.f_bfree; + freeblks = buf.f_bavail; totalBlocks = blocks * blksize; free = freeblks * blksize; @@ -359,7 +359,7 @@ void diskMonitor() blksize = buf.f_bsize; blocks = buf.f_blocks; - freeblks = buf.f_bfree; + freeblks = buf.f_bavail; totalBlocks = blocks * blksize; free = freeblks * blksize; From 72b6e3ef54723d8f283e03d9cb3a2e5f1d0ab879 Mon Sep 17 00:00:00 2001 From: David Hall Date: Thu, 2 May 2019 13:49:21 -0500 Subject: [PATCH 7/9] MCOL-1984 add waitPeriod to config items saved during update --- tools/configMgt/autoConfigure.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp index e87401127..4c21fd6c7 100755 --- a/tools/configMgt/autoConfigure.cpp +++ b/tools/configMgt/autoConfigure.cpp @@ -66,6 +66,7 @@ typedef std::vector PerformanceModuleList; int main(int argc, char *argv[]) { setenv("CALPONT_HOME", "./", 1); + std::cout << "autoConfigure : main() *************" << std::endl; Oam oam; string systemParentOAMModuleName; @@ -326,7 +327,19 @@ int main(int argc, char *argv[]) exit(-1); } - //setup System Language + // WaitPeriod + try + { + string waitPeriod = sysConfigOld->getConfig(SystemSection, "WaitPeriod"); + if (waitPeriod.length() > 0) + { + sysConfigNew->setConfig(SystemSection, "WaitPeriod", waitPeriod); + } + } + catch (...) + { } + + //setup System Language string systemLang = "C"; try { systemLang = sysConfigOld->getConfig(SystemSection, "SystemLang"); From 767dd633c21b72cca4dc86c4b3daffa471d723a1 Mon Sep 17 00:00:00 2001 From: David Hall Date: Thu, 2 May 2019 13:52:01 -0500 Subject: [PATCH 8/9] MCOL-1984 remove debug line --- tools/configMgt/autoConfigure.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp index 4c21fd6c7..6cf665dad 100755 --- a/tools/configMgt/autoConfigure.cpp +++ b/tools/configMgt/autoConfigure.cpp @@ -66,7 +66,6 @@ typedef std::vector PerformanceModuleList; int main(int argc, char *argv[]) { setenv("CALPONT_HOME", "./", 1); - std::cout << "autoConfigure : main() *************" << std::endl; Oam oam; string systemParentOAMModuleName; From c444c36da7ce72f7d948c2cf7fe3827e5cfe956f Mon Sep 17 00:00:00 2001 From: Ben Thompson Date: Wed, 8 May 2019 12:00:12 -0500 Subject: [PATCH 9/9] Fix for newer version of CMake/CPack --- cpackEngineRPM.cmake | 230 +------------------------------------------ 1 file changed, 3 insertions(+), 227 deletions(-) diff --git a/cpackEngineRPM.cmake b/cpackEngineRPM.cmake index 866f39cff..b34b8207d 100644 --- a/cpackEngineRPM.cmake +++ b/cpackEngineRPM.cmake @@ -119,235 +119,11 @@ SET(ignored #%define _prefix ${CMAKE_INSTALL_PREFIX} #") -SET(CPACK_RPM_platform_USER_FILELIST -"/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/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/installer" -"/usr/local/mariadb/columnstore/bin/module_installer.sh" -"/usr/local/mariadb/columnstore/bin/package_installer.sh" -"/usr/local/mariadb/columnstore/bin/startupTests.sh" -"/usr/local/mariadb/columnstore/bin/os_check.sh" -"/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/remote_command_verify.sh" -"/usr/local/mariadb/columnstore/bin/disable-rep-columnstore.sh" -"/usr/local/mariadb/columnstore/bin/columnstore.service" -"/usr/local/mariadb/columnstore/etc/MessageFile.txt" -"/usr/local/mariadb/columnstore/etc/ErrorMessage.txt" -"/usr/local/mariadb/columnstore/local/module" -"/usr/local/mariadb/columnstore/releasenum" -"/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/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/MCSInstanceCmds.sh" -"/usr/local/mariadb/columnstore/bin/MCSVolumeCmds.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/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/bin/os_detect.sh" -"/usr/local/mariadb/columnstore/bin/columnstoreClusterTester.sh" -"/usr/local/mariadb/columnstore/bin/mariadb-command-line.sh" -"/usr/local/mariadb/columnstore/bin/quick_installer_single_server.sh" -"/usr/local/mariadb/columnstore/bin/quick_installer_multi_server.sh" -"/usr/local/mariadb/columnstore/bin/quick_installer_amazon.sh" -${ignored}) +SET(CPACK_RPM_platform_USER_FILELIST ${ignored}) -SET(CPACK_RPM_libs_USER_FILELIST -"/usr/local/mariadb/columnstore/lib/libconfigcpp.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libconfigcpp.so.1" -"/usr/local/mariadb/columnstore/lib/libconfigcpp.so" -"/usr/local/mariadb/columnstore/lib/libddlpackageproc.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libddlpackageproc.so.1" -"/usr/local/mariadb/columnstore/lib/libddlpackageproc.so" -"/usr/local/mariadb/columnstore/lib/libddlpackage.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libddlpackage.so.1" -"/usr/local/mariadb/columnstore/lib/libddlpackage.so" -"/usr/local/mariadb/columnstore/lib/libdmlpackageproc.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libdmlpackageproc.so.1" -"/usr/local/mariadb/columnstore/lib/libdmlpackageproc.so" -"/usr/local/mariadb/columnstore/lib/libdmlpackage.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libdmlpackage.so.1" -"/usr/local/mariadb/columnstore/lib/libdmlpackage.so" -"/usr/local/mariadb/columnstore/lib/libexecplan.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libexecplan.so.1" -"/usr/local/mariadb/columnstore/lib/libexecplan.so" -"/usr/local/mariadb/columnstore/lib/libfuncexp.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libfuncexp.so.1" -"/usr/local/mariadb/columnstore/lib/libfuncexp.so" -"/usr/local/mariadb/columnstore/lib/libudfsdk.so.1.1.0" -"/usr/local/mariadb/columnstore/lib/libudfsdk.so.1" -"/usr/local/mariadb/columnstore/lib/libudfsdk.so" -"/usr/local/mariadb/columnstore/lib/libjoblist.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libjoblist.so.1" -"/usr/local/mariadb/columnstore/lib/libjoblist.so" -"/usr/local/mariadb/columnstore/lib/libjoiner.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libjoiner.so.1" -"/usr/local/mariadb/columnstore/lib/libjoiner.so" -"/usr/local/mariadb/columnstore/lib/libloggingcpp.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libloggingcpp.so.1" -"/usr/local/mariadb/columnstore/lib/libloggingcpp.so" -"/usr/local/mariadb/columnstore/lib/libmessageqcpp.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libmessageqcpp.so.1" -"/usr/local/mariadb/columnstore/lib/libmessageqcpp.so" -"/usr/local/mariadb/columnstore/lib/liboamcpp.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/liboamcpp.so.1" -"/usr/local/mariadb/columnstore/lib/liboamcpp.so" -"/usr/local/mariadb/columnstore/lib/libalarmmanager.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libalarmmanager.so.1" -"/usr/local/mariadb/columnstore/lib/libalarmmanager.so" -"/usr/local/mariadb/columnstore/lib/libthreadpool.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libthreadpool.so.1" -"/usr/local/mariadb/columnstore/lib/libthreadpool.so" -"/usr/local/mariadb/columnstore/lib/libwindowfunction.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libwindowfunction.so.1" -"/usr/local/mariadb/columnstore/lib/libwindowfunction.so" -"/usr/local/mariadb/columnstore/lib/libwriteengine.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libwriteengine.so.1" -"/usr/local/mariadb/columnstore/lib/libwriteengine.so" -"/usr/local/mariadb/columnstore/lib/libwriteengineclient.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libwriteengineclient.so.1" -"/usr/local/mariadb/columnstore/lib/libwriteengineclient.so" -"/usr/local/mariadb/columnstore/lib/libbrm.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libbrm.so.1" -"/usr/local/mariadb/columnstore/lib/libbrm.so" -"/usr/local/mariadb/columnstore/lib/librwlock.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/librwlock.so.1" -"/usr/local/mariadb/columnstore/lib/librwlock.so" -"/usr/local/mariadb/columnstore/lib/libdataconvert.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libdataconvert.so.1" -"/usr/local/mariadb/columnstore/lib/libdataconvert.so" -"/usr/local/mariadb/columnstore/lib/librowgroup.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/librowgroup.so.1" -"/usr/local/mariadb/columnstore/lib/librowgroup.so" -"/usr/local/mariadb/columnstore/lib/libcacheutils.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libcacheutils.so.1" -"/usr/local/mariadb/columnstore/lib/libcacheutils.so" -"/usr/local/mariadb/columnstore/lib/libcommon.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libcommon.so.1" -"/usr/local/mariadb/columnstore/lib/libcommon.so" -"/usr/local/mariadb/columnstore/lib/libcompress.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libcompress.so.1" -"/usr/local/mariadb/columnstore/lib/libcompress.so" -"/usr/local/mariadb/columnstore/lib/libddlcleanuputil.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libddlcleanuputil.so.1" -"/usr/local/mariadb/columnstore/lib/libddlcleanuputil.so" -"/usr/local/mariadb/columnstore/lib/libbatchloader.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libbatchloader.so.1" -"/usr/local/mariadb/columnstore/lib/libbatchloader.so" -"/usr/local/mariadb/columnstore/lib/libquerystats.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libquerystats.so.1" -"/usr/local/mariadb/columnstore/lib/libquerystats.so" -"/usr/local/mariadb/columnstore/lib/libwriteengineredistribute.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libwriteengineredistribute.so.1" -"/usr/local/mariadb/columnstore/lib/libwriteengineredistribute.so" -"/usr/local/mariadb/columnstore/lib/libidbdatafile.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libidbdatafile.so.1" -"/usr/local/mariadb/columnstore/lib/libidbdatafile.so" -"/usr/local/mariadb/columnstore/lib/libthrift.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libthrift.so.1" -"/usr/local/mariadb/columnstore/lib/libthrift.so" -"/usr/local/mariadb/columnstore/lib/libquerytele.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libquerytele.so.1" -"/usr/local/mariadb/columnstore/lib/libquerytele.so" -${ignored}) +SET(CPACK_RPM_libs_USER_FILELIST ${ignored}) -SET(CPACK_RPM_storage-engine_USER_FILELIST -"/usr/local/mariadb/columnstore/lib/libcalmysql.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libcalmysql.so.1" -"/usr/local/mariadb/columnstore/lib/libcalmysql.so" -"/usr/local/mariadb/columnstore/lib/libudf_mysql.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/libudf_mysql.so.1" -"/usr/local/mariadb/columnstore/lib/libudf_mysql.so" -"/usr/local/mariadb/columnstore/lib/is_columnstore_columns.so" -"/usr/local/mariadb/columnstore/lib/is_columnstore_columns.so.1" -"/usr/local/mariadb/columnstore/lib/is_columnstore_columns.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/is_columnstore_extents.so" -"/usr/local/mariadb/columnstore/lib/is_columnstore_extents.so.1" -"/usr/local/mariadb/columnstore/lib/is_columnstore_extents.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/is_columnstore_tables.so" -"/usr/local/mariadb/columnstore/lib/is_columnstore_tables.so.1" -"/usr/local/mariadb/columnstore/lib/is_columnstore_tables.so.1.0.0" -"/usr/local/mariadb/columnstore/lib/is_columnstore_files.so" -"/usr/local/mariadb/columnstore/lib/is_columnstore_files.so.1" -"/usr/local/mariadb/columnstore/lib/is_columnstore_files.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/calsetuserpriority.sql" -"/usr/local/mariadb/columnstore/mysql/calremoveuserpriority.sql" -"/usr/local/mariadb/columnstore/mysql/calshowprocesslist.sql" -"/usr/local/mariadb/columnstore/mysql/columnstore_info.sql" -${ignored}) +SET(CPACK_RPM_storage-engine_USER_FILELIST ${ignored}) INCLUDE (CPack)