database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Merge branch 'develop' into MCOL-3536

Browse Source
This commit is contained in:
David Hall
2020-05-18 16:22:01 -05:00
parent 1f3d1e6fd6 91196607bd
commit 8479a87e46
110 changed files with 557 additions and 7879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@ -123,7 +123,7 @@ ENDIF ()
SET_PROPERTY(DIRECTORY PROPERTY EP_BASE ${CMAKE_CURRENT_BINARY_DIR}/external)
LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
FIND_PACKAGE(Boost 1.53.0 REQUIRED COMPONENTS system filesystem thread regex date_time chrono)
FIND_PACKAGE(Boost 1.53.0 REQUIRED COMPONENTS system filesystem thread regex date_time chrono atomic)
FIND_PACKAGE(BISON REQUIRED)
check_cxx_source_compiles("#include <filesystem>\n void main(){}" HAS_STD_FILESYSTEM)
@ -362,12 +362,12 @@ ENDIF ()
# releasenum is used by external scripts for various tasks. Leave it alone.
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/releasenum.in ${CMAKE_CURRENT_BINARY_DIR}/build/releasenum IMMEDIATE)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/build/releasenum DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-platform)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/build/releasenum DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-engine)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/columnstoreversion.h.in ${CMAKE_CURRENT_SOURCE_DIR}/columnstoreversion.h)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mcsconfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/mcsconfig.h)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/gitversionEngine.in ${CMAKE_CURRENT_BINARY_DIR}/gitversionEngine IMMEDIATE)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gitversionEngine DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-platform)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gitversionEngine DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-engine)
IF (INSTALL_LAYOUT)
# Do this or when MariaDB builds us we don't have GenError which is required for these
@ -375,8 +375,6 @@ IF (INSTALL_LAYOUT)
ADD_DEPENDENCIES(funcexp GenError)
ADD_DEPENDENCIES(oamcpp GenError)
ADD_DEPENDENCIES(regr_mysql GenError)
# Component columnstore-engine automatically added by mysql_add_plugin()
SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} columnstore-platform columnstore-libs)
# Don't know why, but this doesn't work if you make the above line PARENT_SCOPE
SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} PARENT_SCOPE)
IF (RPM)
@ -391,8 +389,6 @@ IF (INSTALL_LAYOUT)
"%ignore /var/lib"
"%ignore /var"
)
SET(CPACK_RPM_columnstore-platform_USER_FILELIST ${ignored} PARENT_SCOPE)
SET(CPACK_RPM_columnstore-libs_USER_FILELIST ${ignored} PARENT_SCOPE)
SET(CPACK_RPM_columnstore-engine_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*" PARENT_SCOPE)
SET(SUSE_VERSION_NUMBER OFF)
@ -401,16 +397,15 @@ IF (INSTALL_LAYOUT)
string(REGEX MATCH "VERSION = ([0-9]+)" SUSE "${SUSE_VERSION}")
set(SUSE_VERSION_NUMBER "${CMAKE_MATCH_1}")
ENDIF ()
if (${SUSE_VERSION_NUMBER} EQUAL 12)
SETA(CPACK_RPM_columnstore-platform_PACKAGE_REQUIRES "expect" "boost-devel >= 1.54.0" "MariaDB-columnstore-libs" "snappy" "jemalloc" "net-tools" PARENT_SCOPE)
SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "expect" "boost-devel >= 1.54.0" "snappy" "jemalloc" "net-tools" PARENT_SCOPE)
else ()
SETA(CPACK_RPM_columnstore-platform_PACKAGE_REQUIRES "expect" "boost >= 1.53.0" "MariaDB-columnstore-libs" "snappy" "jemalloc" "net-tools" PARENT_SCOPE)
SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "expect" "boost >= 1.53.0" "snappy" "jemalloc" "net-tools" PARENT_SCOPE)
endif()
SET(CPACK_RPM_columnstore-platform_PRE_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/build/preInstall_platform.sh PARENT_SCOPE)
SET(CPACK_RPM_columnstore-platform_POST_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/build/postInstall_platform.sh PARENT_SCOPE)
SET(CPACK_RPM_columnstore-platform_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/build/preUn_platform.sh PARENT_SCOPE)
SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/build/preInstall_storage_engine.sh PARENT_SCOPE)
SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/build/postInstall_storage_engine.sh PARENT_SCOPE)
SET(CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/build/preUn_storage_engine.sh PARENT_SCOPE)
ENDIF ()
ELSE ()

7
build/debian/libs/postinst
View File

@ -1,7 +0,0 @@
#!/bin/bash -e
rpmmode=install
echo "MariaDB ColumnStore install completed"
exit 0

4
build/debian/libs/prerm
View File

@ -1,4 +0,0 @@
#!/bin/bash -e
exit 0

9
build/debian/platform/postinst
View File

@ -1,9 +0,0 @@
#!/bin/bash -e
rpmmode=install
columnstore-post-install --rpmmode=$rpmmode
echo "MariaDB ColumnStore install completed"
exit 0

6
build/debian/platform/prerm
View File

@ -1,6 +0,0 @@
#!/bin/bash -e
columnstore-pre-uninstall
exit 0

2
build/debian/storageEngine/postinst Normal file → Executable file
View File

@ -2,6 +2,8 @@
rpmmode=install
columnstore-post-install --rpmmode=$rpmmode
echo "MariaDB ColumnStore install completed"
exit 0

2
build/debian/storageEngine/prerm Normal file → Executable file
View File

@ -1,4 +1,6 @@
#!/bin/bash -e
columnstore-pre-uninstall
exit 0

8
build/postInstall_libs.sh
View File

@ -1,8 +0,0 @@
rpmmode=install
if [ "$1" -eq "$1" 2> /dev/null ]; then
if [ $1 -ne 1 ]; then
rpmmode=upgrade
fi
fi

10
build/postInstall_platform.sh
View File

@ -1,10 +0,0 @@
rpmmode=install
if [ "$1" -eq "$1" 2> /dev/null ]; then
if [ $1 -ne 1 ]; then
rpmmode=upgrade
fi
fi
mkdir -p /var/lib/columnstore/local
columnstore-post-install --rpmmode=$rpmmode

4
build/postInstall_storage_engine.sh
View File

@ -4,3 +4,7 @@ if [ "$1" -eq "$1" 2> /dev/null ]; then
rpmmode=upgrade
fi
fi
mkdir -p /var/lib/columnstore/local
columnstore-post-install --rpmmode=$rpmmode

2
build/preInstall_platform.sh → build/preInstall_storage_engine.sh
View File

@ -1,7 +1,5 @@
if [ "$1" == "2" ]; then
#Perform tasks to prepare for the upgrade installation
mcsadmin shutdown y > /dev/null 2>&1
/bin/cp -f /etc/columnstore/storagemanager.cnf /etc/columnstore/storagemanager.cnf.rpmsave > /dev/null 2>&1
columnstore-pre-uninstall
fi

11
build/preUn_libs.sh
View File

@ -1,11 +0,0 @@
rpmmode=upgrade
if [ "$1" -eq "$1" 2> /dev/null ]; then
if [ $1 -ne 1 ]; then
rpmmode=erase
fi
else
rpmmode=erase
fi
exit 0

17
build/preUn_platform.sh
View File

@ -1,17 +0,0 @@
mcsadmin shutdown y
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
columnstore-pre-uninstall
fi
exit 0

5
build/preUn_storage_engine.sh
View File

@ -1,3 +1,4 @@
rpmmode=upgrade
if [ "$1" -eq "$1" 2> /dev/null ]; then
if [ $1 -ne 1 ]; then
@ -7,5 +8,9 @@ else
rpmmode=erase
fi
if [ $rpmmode = erase ]; then
columnstore-pre-uninstall
fi
exit 0

24
cmake/cpackEngineDEB.cmake
View File

@ -11,7 +11,7 @@ SET(CPACK_PACKAGING_INSTALL_PREFIX ${INSTALL_ENGINE})
# Note that this variable is DEB not DEBIAN! http://public.kitware.com/pipermail/cmake/2014-July/058030.html
SET(CPACK_DEB_COMPONENT_INSTALL ON)
SET(CPACK_COMPONENTS_ALL columnstore-platform columnstore-libs columnstore-engine)
SET(CPACK_COMPONENTS_ALL columnstore-engine)
SET(CPACK_PACKAGE_NAME "MariaDB")
SET(ENGINE_ARCH "amd64")
@ -44,18 +44,9 @@ SET(CPACK_DEBIAN_PACKAGE_LICENSE ${CPACK_PACKAGE_LICENSE})
SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DESCRIPTION "MariaDB-Columnstore binary files")
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_SUMMARY "MariaDB ColumnStore: A Scale out Columnar storage engine for MariaDB")
SET(CPACK_DEBIAN_LIBS_PACKAGE_DESCRIPTION "MariaDB-Columnstore libraries")
SET(CPACK_DEBIAN_LIBS_PACKAGE_SUMMARY "MariaDB ColumnStore: A Scale out Columnar storage engine for MariaDB")
SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_DESCRIPTION "MariaDB Columnstore connector binary files")
SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_SUMMARY "MariaDB ColumnStore: A Scale out Columnar storage engine for MariaDB")
SET(CPACK_DEBIAN_LIBS_PACKAGE_PROVIDES "MariaDB-columnstore-libs")
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_PROVIDES "MariaDB-columnstore-platform")
SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_PROVIDES "MariaDB-columnstore-engine")
set(DEBIAN_VERSION_NUMBER OFF)
@ -65,19 +56,14 @@ if (EXISTS "/etc/debian_version")
set(DEBIAN_VERSION_NUMBER "${CMAKE_MATCH_1}")
endif ()
if ("${DEBIAN_VERSION_NUMBER}" EQUAL "8")
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, MariaDB-columnstore-libs, libsnappy1, libjemalloc1")
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, libsnappy1, libjemalloc1")
elseif ("${DEBIAN_VERSION_NUMBER}" EQUAL "9")
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, MariaDB-columnstore-libs, libsnappy1v5, libreadline5, libjemalloc1")
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, libsnappy1v5, libreadline5, libjemalloc1")
else()
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libboost-all-dev, libreadline-dev, rsync, libsnappy1v5, net-tools, libjemalloc1")
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "openssl, file, libdbi-perl, libboost-all-dev, libreadline-dev, rsync, libsnappy1v5, net-tools, libjemalloc1")
endif ()
SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_DEPENDS "MariaDB-columnstore-libs")
set( CPACK_DEBIAN_LIBS_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/build/debian/libs/postinst;${CMAKE_CURRENT_SOURCE_DIR}/build/debian/libs/prerm;" )
set( CPACK_DEBIAN_PLATFORM_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/build/debian/platform/postinst;${CMAKE_CURRENT_SOURCE_DIR}/build/debian/platform/prerm;" )
set( CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/build/debian/storageEngine/postinst;${CMAKE_CURRENT_SOURCE_DIR}/build/debian/storageEngine/prerm;" )
set(CPACK_DEBIAN_COLUMNSTORE-ENGINE_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/build/debian/storageEngine/postinst;${CMAKE_CURRENT_SOURCE_DIR}/build/debian/storageEngine/prerm;")
INCLUDE (CPack)

37
cmake/cpackEngineRPM.cmake
View File

@ -8,7 +8,7 @@ SET(CPACK_PACKAGING_INSTALL_PREFIX ${INSTALL_ENGINE})
SET(CPACK_RPM_COMPONENT_INSTALL ON)
SET(CPACK_COMPONENTS_ALL columnstore-platform columnstore-libs columnstore-engine)
SET(CPACK_COMPONENTS_ALL columnstore-engine)
SET(CPACK_PACKAGE_NAME "MariaDB")
SET(ENGINE_ARCH "x86_64")
@ -23,10 +23,10 @@ ENDIF()
SET(CPACK_RPM_PACKAGE_NAME ${CPACK_PACKAGE_NAME})
SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}-${ENGINE_ARCH}-${RPM}")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MariaDB ColumnStore: A Scale out Columnar storage engine for MariaDB")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MariaDB ColumnStore: a scale out columnar storage engine for MariaDB")
SET(CPACK_PACKAGE_URL "http://mariadb.org")
SET(CPACK_PACKAGE_SUMMARY "MariaDB ColumnStore: A Scale out Columnar storage engine for MariaDB")
SET(CPACK_PACKAGE_SUMMARY "MariaDB ColumnStore: a scale out columnar storage engine for MariaDB")
SET(CPACK_PACKAGE_VENDOR "MariaDB Corporation Ab")
SET(CPACK_PACKAGE_LICENSE "Copyright (c) 2016 MariaDB Corporation Ab., all rights reserved; redistributable under the terms of the GPL, see the file COPYING for details.")
@ -50,15 +50,8 @@ MariaDB bug reports should be submitted through https://jira.mariadb.org
")
SET(CPACK_RPM_columnstore-platform_PACKAGE_DESCRIPTION "MariaDB-Columnstore binary files")
SET(CPACK_RPM_columnstore-platform_PACKAGE_SUMMARY "MariaDB ColumnStore: A Scale out Columnar storage engine for MariaDB")
SET(CPACK_RPM_columnstore-platform_PACKAGE_GROUP "Applications")
SET(CPACK_RPM_columnstore-libs_PACKAGE_DESCRIPTION "MariaDB-Columnstore libraries")
SET(CPACK_RPM_columnstore-libs_PACKAGE_SUMMARY "MariaDB ColumnStore: A Scale out Columnar storage engine for MariaDB")
SET(CPACK_RPM_columnstore-engine_PACKAGE_DESCRIPTION "MariaDB Columnstore connector binary files")
SET(CPACK_RPM_columnstore-engine_PACKAGE_SUMMARY "MariaDB ColumnStore: A Scale out Columnar storage engine for MariaDB")
SET(CPACK_RPM_columnstore-engine_PACKAGE_SUMMARY "MariaDB ColumnStore: a scale out columnar storage engine for MariaDB")
SET(CPACK_RPM_columnstore-engine_PACKAGE_GROUP "Applications")
# "set/append array" - append a set of strings, separated by a space
@ -68,11 +61,8 @@ MACRO(SETA var)
ENDFOREACH()
ENDMACRO(SETA)
SETA(CPACK_RPM_columnstore-libs_PACKAGE_PROVIDES "MariaDB-columnstore-libs")
SETA(CPACK_RPM_columnstore-platform_PACKAGE_PROVIDES "MariaDB-columnstore-platform")
SETA(CPACK_RPM_columnstore--engine_PACKAGE_PROVIDES "MariaDB-columnstore-engine")
#boost is a source build in CentOS 6 so don't require it as a package
SET(REDHAT_VERSION_NUMBER OFF)
SET(SUSE_VERSION_NUMBER OFF)
@ -87,24 +77,17 @@ IF (EXISTS "/etc/SuSE-release")
set(SUSE_VERSION_NUMBER "${CMAKE_MATCH_1}")
ENDIF ()
if (${REDHAT_VERSION_NUMBER} EQUAL 6)
SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "MariaDB-columnstore-libs" "MariaDB-columnstore-shared" "snappy" "net-tools")
SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "MariaDB-columnstore-shared" "snappy" "net-tools")
# Disable auto require as this will also try to pull Boost via RPM
SET(CPACK_RPM_PACKAGE_AUTOREQPROV " no")
elseif (${SUSE_VERSION_NUMBER} EQUAL 12)
SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "boost-devel >= 1.54.0" "MariaDB-columnstore-libs" "libsnappy1" "jemalloc" "net-tools")
SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "boost-devel >= 1.54.0" "libsnappy1" "jemalloc" "net-tools")
else ()
SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "boost >= 1.53.0" "MariaDB-columnstore-libs" "snappy" "jemalloc" "net-tools")
SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "boost >= 1.53.0" "snappy" "jemalloc" "net-tools")
endif()
SETA(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "MariaDB-columnstore-libs")
SET(CPACK_RPM_columnstore-platform_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preInstall_platform.sh)
SET(CPACK_RPM_columnstore-platform_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postInstall_platform.sh)
SET(CPACK_RPM_columnstore-libs_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postInstall_libs.sh)
SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preInstall_storeage_engine.sh)
SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postInstall_storage_engine.sh)
SET(CPACK_RPM_columnstore-platform_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preUn_platform.sh)
SET(CPACK_RPM_columnstore-libs_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preUn_libs.sh)
SET(CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/preUn_storage_engine.sh)
SET(CPACK_RPM_SPEC_MORE_DEFINE "${CPACK_RPM_SPEC_MORE_DEFINE}
@ -128,10 +111,6 @@ SET(ignored
#%define _prefix ${CMAKE_INSTALL_PREFIX}
#")
SET(CPACK_RPM_columnstore-platform_USER_FILELIST ${ignored})
SET(CPACK_RPM_columnstore-libs_USER_FILELIST ${ignored})
SET(CPACK_RPM_columnstore-engine_USER_FILELIST ${ignored})
INCLUDE (CPack)

2
dbcon/ddlpackage/CMakeLists.txt
View File

@ -36,5 +36,5 @@ ADD_LIBRARY(ddlpackage SHARED
${FLEX_ddl_scan_OUTPUTS}
)
INSTALL(TARGETS ddlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
INSTALL(TARGETS ddlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
dbcon/ddlpackageproc/CMakeLists.txt
View File

@ -16,5 +16,5 @@ add_library(ddlpackageproc SHARED ${ddlpackageproc_LIB_SRCS})
target_link_libraries(ddlpackageproc ${NETSNMP_LIBRARIES})
install(TARGETS ddlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS ddlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
dbcon/dmlpackage/CMakeLists.txt
View File

@ -38,5 +38,5 @@ ADD_LIBRARY(dmlpackage SHARED
)
INSTALL(TARGETS dmlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
INSTALL(TARGETS dmlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
dbcon/dmlpackageproc/CMakeLists.txt
View File

@ -17,6 +17,6 @@ add_library(dmlpackageproc SHARED ${dmlpackageproc_LIB_SRCS})
target_link_libraries(dmlpackageproc ${NETSNMP_LIBRARIES})
install(TARGETS dmlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS dmlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
dbcon/execplan/CMakeLists.txt
View File

@ -48,5 +48,5 @@ add_library(execplan SHARED ${execplan_LIB_SRCS})
target_link_libraries(execplan ${NETSNMP_LIBRARIES} ${MARIADB_STRING_LIBS})
install(TARGETS execplan DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS execplan DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

4
dbcon/joblist/CMakeLists.txt
View File

@ -59,11 +59,11 @@ set(joblist_LIB_SRCS
add_library(joblist SHARED ${joblist_LIB_SRCS})
install(TARGETS joblist DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS joblist DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
if (WITH_ORDERBY_UT)
add_executable(job_orderby_tests orderby-tests.cpp)
target_link_libraries(job_orderby_tests ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${CPPUNIT_LIBRARIES} cppunit)
install(TARGETS job_orderby_tests DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS job_orderby_tests DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
endif()

26
dbcon/mysql/ha_mcs_impl.cpp
View File

@ -3043,7 +3043,13 @@ int ha_mcs_impl_write_row(const uchar* buf, TABLE* table, uint64_t rows_changed)
ha_rows rowsInserted = 0;
int rc = 0;
if ( (ci->useCpimport > 0) && (!(thd->variables.option_bits & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) && (!ci->singleInsert) && ((ci->isLoaddataInfile) ||
// ci->useCpimport = 2 means ALWAYS use cpimport, whether it's in a
// transaction or not. User should use this option very carefully since
// cpimport currently does not support rollbacks
if (((ci->useCpimport == 2) ||
((ci->useCpimport == 1) && (!(thd->variables.option_bits & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))))) &&
(!ci->singleInsert) &&
((ci->isLoaddataInfile) ||
((thd->lex)->sql_command == SQLCOM_INSERT) || ((thd->lex)->sql_command == SQLCOM_LOAD) ||
((thd->lex)->sql_command == SQLCOM_INSERT_SELECT)) )
{
@ -3173,7 +3179,11 @@ void ha_mcs_impl_start_bulk_insert(ha_rows rows, TABLE* table)
if (((thd->lex)->sql_command == SQLCOM_INSERT) && (rows > 0))
ci->useCpimport = 0;
if ((ci->useCpimport > 0) && (!(thd->variables.option_bits & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))) //If autocommit on batch insert will use cpimport to load data
// ci->useCpimport = 2 means ALWAYS use cpimport, whether it's in a
// transaction or not. User should use this option very carefully since
// cpimport currently does not support rollbacks
if ((ci->useCpimport == 2) ||
((ci->useCpimport == 1) && (!(thd->variables.option_bits & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))))) //If autocommit on batch insert will use cpimport to load data
{
//store table info to connection info
CalpontSystemCatalog::TableName tableName;
@ -3635,7 +3645,10 @@ int ha_mcs_impl_end_bulk_insert(bool abort, TABLE* table)
// @bug 2515. Check command intead of vtable state
if ( ( ((thd->lex)->sql_command == SQLCOM_INSERT) || ((thd->lex)->sql_command == SQLCOM_LOAD) || (thd->lex)->sql_command == SQLCOM_INSERT_SELECT) && !ci->singleInsert )
{
if ((ci->useCpimport > 0) && (!(thd->variables.option_bits & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) && (!ci->singleInsert) && ((ci->isLoaddataInfile) ||
if (((ci->useCpimport == 2) ||
((ci->useCpimport == 1) && (!(thd->variables.option_bits & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))))) &&
(!ci->singleInsert) &&
((ci->isLoaddataInfile) ||
((thd->lex)->sql_command == SQLCOM_INSERT) || ((thd->lex)->sql_command == SQLCOM_LOAD) ||
((thd->lex)->sql_command == SQLCOM_INSERT_SELECT)) )
{
@ -3832,14 +3845,15 @@ int ha_mcs_impl_end_bulk_insert(bool abort, TABLE* table)
}
}
if (!(thd->variables.option_bits & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))
{
// MCOL-4002 We earlier had these re-initializations set only for
// non-transactions, i.e.:
// !(thd->variables.option_bits & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))
// However, we should be resetting these members anyways.
ci->singleInsert = true; // reset the flag
ci->isLoaddataInfile = false;
ci->tableOid = 0;
ci->rowsHaveInserted = 0;
ci->useCpimport = 1;
}
return rc;
}

28
dbcon/mysql/ha_mcs_sysvars.cpp
View File

@ -270,13 +270,28 @@ static MYSQL_THDVAR_ULONG(
1 // block size
);
static MYSQL_THDVAR_BOOL(
const char* mcs_use_import_for_batchinsert_values[] = {
"OFF",
"ON",
"ALWAYS",
NullS
};
static TYPELIB mcs_use_import_for_batchinsert_values_lib = {
array_elements(mcs_use_import_for_batchinsert_values) - 1,
"mcs_use_import_for_batchinsert_values",
mcs_use_import_for_batchinsert_values,
NULL
};
static MYSQL_THDVAR_ENUM(
use_import_for_batchinsert,
PLUGIN_VAR_NOCMDARG,
PLUGIN_VAR_RQCMDARG,
"LOAD DATA INFILE and INSERT..SELECT will use cpimport internally",
NULL, // check
NULL, // update
1 // default
1, // default
&mcs_use_import_for_batchinsert_values_lib // values lib
);
static MYSQL_THDVAR_BOOL(
@ -508,11 +523,12 @@ void set_local_query(THD* thd, ulong value)
THDVAR(thd, local_query) = value;
}
bool get_use_import_for_batchinsert(THD* thd)
mcs_use_import_for_batchinsert_t get_use_import_for_batchinsert(THD* thd)
{
return ( thd == NULL ) ? false : THDVAR(thd, use_import_for_batchinsert);
return ( thd == NULL ) ? mcs_use_import_for_batchinsert_t::ON :
(mcs_use_import_for_batchinsert_t) THDVAR(thd, use_import_for_batchinsert);
}
void set_use_import_for_batchinsert(THD* thd, bool value)
void set_use_import_for_batchinsert(THD* thd, ulong value)
{
THDVAR(thd, use_import_for_batchinsert) = value;
}

11
dbcon/mysql/ha_mcs_sysvars.h
View File

@ -33,6 +33,13 @@ enum mcs_compression_type_t {
SNAPPY = 2
};
// use_import_for_batchinsert
enum mcs_use_import_for_batchinsert_t {
OFF = 0,
ON = 1,
ALWAYS = 2
};
// simple setters/getters
const char* get_original_query(THD* thd);
void set_original_query(THD* thd, char* query);
@ -94,8 +101,8 @@ void set_double_for_decimal_math(THD* thd, bool value);
ulong get_local_query(THD* thd);
void set_local_query(THD* thd, ulong value);
bool get_use_import_for_batchinsert(THD* thd);
void set_use_import_for_batchinsert(THD* thd, bool value);
mcs_use_import_for_batchinsert_t get_use_import_for_batchinsert(THD* thd);
void set_use_import_for_batchinsert(THD* thd, ulong value);
ulong get_import_for_batchinsert_delimiter(THD* thd);
void set_import_for_batchinsert_delimiter(THD* thd, ulong value);

2
ddlproc/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(DDLProc ${DDLProc_SRCS})
target_link_libraries(DDLProc ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool)
install(TARGETS DDLProc DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS DDLProc DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
dmlproc/CMakeLists.txt
View File

@ -15,7 +15,7 @@ add_executable(DMLProc ${DMLProc_SRCS})
target_link_libraries(DMLProc ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool ddlcleanuputil batchloader)
install(TARGETS DMLProc DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS DMLProc DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
exemgr/CMakeLists.txt
View File

@ -12,7 +12,7 @@ target_link_libraries(ExeMgr ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIB
target_include_directories(ExeMgr PRIVATE ${Boost_INCLUDE_DIRS})
install(TARGETS ExeMgr DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS ExeMgr DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
########### install files ###############

2
oam/cloud/CMakeLists.txt
View File

@ -1,4 +1,4 @@
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/MCSVolumeCmds.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/MCSVolumeCmds.sh" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/MCSInstanceCmds.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/MCSInstanceCmds.sh" @ONLY)
install(PROGRAMS MCSInstanceCmds.sh MCSVolumeCmds.sh MCSgetCredentials.sh DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(PROGRAMS MCSInstanceCmds.sh MCSVolumeCmds.sh MCSgetCredentials.sh DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
oam/etc/CMakeLists.txt
View File

@ -4,4 +4,4 @@ install(FILES AlarmConfig.xml
Columnstore.xml
ProcessConfig.xml
ConsoleCmds.xml
DESTINATION ${ENGINE_SYSCONFDIR}/columnstore COMPONENT columnstore-platform)
DESTINATION ${ENGINE_SYSCONFDIR}/columnstore COMPONENT columnstore-engine)

139
oam/etc/Columnstore.xml
View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id: Columnstore.xml 3713 2013-08-16 20:04:47Z wweeks $ -->
<Columnstore Version="V1.0.0">
<!--
WARNING: Do not make changes to this file unless directed to do so by
MariaDB service engineers. Incorrect settings can render your system
unusable and will require a service call to correct.
-->
<Columnstore Version="V1.0.0">
<ClusterManager>0.0.0.0</ClusterManager>
<ConfigRevision>1</ConfigRevision>
<ExeMgr1>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8601</Port>
<Module>unassigned</Module>
</ExeMgr1>
@ -16,7 +16,7 @@
<Port>8602</Port>
</JobProc>
<ProcMgr>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8603</Port>
</ProcMgr>
<ProcMgr_Alarm>
@ -24,7 +24,7 @@
<Port>8606</Port>
</ProcMgr_Alarm>
<ProcStatusControl>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8604</Port>
</ProcStatusControl>
<ProcStatusControlStandby>
@ -51,7 +51,7 @@
<Port>8800</Port>
</um1_ProcessMonitor>
<pm1_ProcessMonitor>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8800</Port>
</pm1_ProcessMonitor>
<dm1_ServerMonitor>
@ -63,19 +63,19 @@
<Port>8622</Port>
</um1_ServerMonitor>
<pm1_ServerMonitor>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8622</Port>
</pm1_ServerMonitor>
<pm1_WriteEngineServer>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8630</Port>
</pm1_WriteEngineServer>
<DDLProc>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8612</Port>
</DDLProc>
<DMLProc>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8614</Port>
</DMLProc>
<BatchInsert>
@ -83,7 +83,7 @@
</BatchInsert>
<PrimitiveServers>
<Count>1</Count>
<ConnectionsPerPrimProc>8</ConnectionsPerPrimProc>
<ConnectionsPerPrimProc>2</ConnectionsPerPrimProc>
<ProcessorThreshold>128</ProcessorThreshold>
<ProcessorQueueSize>10K</ProcessorQueueSize> <!-- minimum of extent size 8192 -->
<DebugLevel>0</DebugLevel>
@ -93,145 +93,148 @@
<!-- <BPPCount>16</BPPCount> --> <!-- Default num cores * 2. A cap on the number of simultaneous primitives per jobstep -->
<PrefetchThreshold>1</PrefetchThreshold>
<PTTrace>0</PTTrace>
<RotatingDestination>y</RotatingDestination> <!-- Iterate thru UM ports; set to 'n' if UM/PM on same server -->
<RotatingDestination>n</RotatingDestination> <!-- Iterate thru UM ports; set to 'n' if UM/PM on same server -->
<!-- <HighPriorityPercentage>60</HighPriorityPercentage> -->
<!-- <MediumPriorityPercentage>30</MediumPriorityPercentage> -->
<!-- <LowPriorityPercentage>10</LowPriorityPercentage> -->
<DirectIO>y</DirectIO>
<HighPriorityPercentage/>
<MediumPriorityPercentage/>
<LowPriorityPercentage/>
</PrimitiveServers>
<PMS1>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS1>
<PMS2>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS2>
<PMS3>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS3>
<PMS4>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS4>
<PMS5>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS5>
<PMS6>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS6>
<PMS7>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS7>
<PMS8>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS8>
<PMS9>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS9>
<PMS10>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS10>
<PMS11>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS11>
<PMS12>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS12>
<PMS13>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS13>
<PMS14>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS14>
<PMS15>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS15>
<PMS16>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS16>
<PMS17>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS17>
<PMS18>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS18>
<PMS19>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS19>
<PMS20>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS20>
<PMS21>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS21>
<PMS22>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS22>
<PMS23>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS23>
<PMS24>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS24>
<PMS25>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS25>
<PMS26>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS26>
<PMS27>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS27>
<PMS28>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS28>
<PMS29>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS29>
<PMS30>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS30>
<PMS31>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS31>
<PMS32>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS32>
<SystemConfig>
<SystemName>columnstore-1</SystemName>
<ParentOAMModuleName>pm1</ParentOAMModuleName>
<StandbyOAMModuleName>unassigned</StandbyOAMModuleName>
<PrimaryUMModuleName>unassigned</PrimaryUMModuleName>
<PrimaryUMModuleName>pm1</PrimaryUMModuleName>
<ModuleHeartbeatPeriod>1</ModuleHeartbeatPeriod>
<ModuleHeartbeatCount>3</ModuleHeartbeatCount>
<ModuleProcMonWaitCount>12</ModuleProcMonWaitCount> // 2.5 minutes
@ -296,7 +299,7 @@
<ModuleType2>um</ModuleType2>
<ModuleDesc2>User Module</ModuleDesc2>
<RunType2>SIMPLEX</RunType2>
<ModuleCount2>1</ModuleCount2>
<ModuleCount2>0</ModuleCount2>
<ModuleIPAddr1-1-2>0.0.0.0</ModuleIPAddr1-1-2>
<ModuleHostName1-1-2>unassigned</ModuleHostName1-1-2>
<ModuleDisableState1-2>ENABLED</ModuleDisableState1-2>
@ -320,8 +323,8 @@
<ModuleDesc3>Performance Module</ModuleDesc3>
<RunType3>SIMPLEX</RunType3>
<ModuleCount3>1</ModuleCount3>
<ModuleIPAddr1-1-3>0.0.0.0</ModuleIPAddr1-1-3>
<ModuleHostName1-1-3>unassigned</ModuleHostName1-1-3>
<ModuleIPAddr1-1-3>127.0.0.1</ModuleIPAddr1-1-3>
<ModuleHostName1-1-3>localhost</ModuleHostName1-1-3>
<ModuleDisableState1-3>ENABLED</ModuleDisableState1-3>
<ModuleCPUCriticalThreshold3>0</ModuleCPUCriticalThreshold3>
<ModuleCPUMajorThreshold3>0</ModuleCPUMajorThreshold3>
@ -369,14 +372,14 @@
</WriteEngine>
<DBRM_Controller>
<NumWorkers>1</NumWorkers>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8616</Port>
</DBRM_Controller>
<!-- Worker Port: 8700 - 8720 is reserved to support External Modules-->
<DBRM_Worker1>
<IPAddr>0.0.0.0</IPAddr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8700</Port>
<Module>unassigned</Module>
<Module>pm1</Module>
</DBRM_Worker1>
<DBRM_Worker2>
<IPAddr>0.0.0.0</IPAddr>
@ -427,7 +430,7 @@
<!-- The percentage of RAM to use for the disk block cache. Defaults to 70% -->
<!-- Alternatively, this can be specified in absolute terms using
the suffixes 'm' or 'g' to denote size in megabytes or gigabytes.-->
<!-- <NumBlocksPct>70</NumBlocksPct> -->
<!-- <NumBlocksPct>95</NumBlocksPct> -->
<!-- <NumThreads>16</NumThreads> --> <!-- 1-256. Default is 16. -->
<NumCaches>1</NumCaches><!-- # of parallel caches to instantiate -->
<IOMTracing>0</IOMTracing>
@ -436,18 +439,19 @@
<MaxOpenFiles>2K</MaxOpenFiles>
<DecreaseOpenFilesCount>200</DecreaseOpenFilesCount>
<FDCacheTrace>0</FDCacheTrace>
<NumBlocksPct>50</NumBlocksPct>
</DBBC>
<Installation>
<SystemStartupOffline>n</SystemStartupOffline>
<InitialInstallFlag>n</InitialInstallFlag>
<SingleServerInstall>n</SingleServerInstall>
<ServerTypeInstall>1</ServerTypeInstall>
<InitialInstallFlag>y</InitialInstallFlag>
<SingleServerInstall>y</SingleServerInstall>
<ServerTypeInstall>2</ServerTypeInstall>
<PMwithUM>n</PMwithUM>
<MySQLRep>n</MySQLRep>
<DBRootStorageType>internal</DBRootStorageType>
<UMStorageType>internal</UMStorageType>
<EEPackageType>rpm</EEPackageType>
<SystemLogConfigFile>unassigned</SystemLogConfigFile>
<EEPackageType>binary</EEPackageType>
<SystemLogConfigFile>/etc/rsyslog.d/49-columnstore.conf</SystemLogConfigFile>
<Cloud>unassigned</Cloud>
<AmazonVPCNextPrivateIP>autoassign</AmazonVPCNextPrivateIP>
<UMInstanceType>unassigned</UMInstanceType>
@ -471,7 +475,8 @@
<MySQLPort>3306</MySQLPort>
<AmazonDeviceName>/dev/xvd</AmazonDeviceName>
<LockFileDirectory>/var/lock/subsys</LockFileDirectory>
<ProfileFile>unassigned</ProfileFile>
<ProfileFile>/etc/profile.d/columnstoreAlias.sh</ProfileFile>
<DataRedundancyNetworkType/>
</Installation>
<ExtentMap>
<!--
@ -487,8 +492,8 @@
<MaxElems>128K</MaxElems> <!-- 128 buckets * 128K * 16 = 256 MB -->
<FifoSizeLargeSide>64</FifoSizeLargeSide>
<PmMaxMemorySmallSide>1G</PmMaxMemorySmallSide>
<TotalUmMemory>50%</TotalUmMemory>
<TotalPmUmMemory>10%</TotalPmUmMemory>
<TotalUmMemory>100%</TotalUmMemory>
<TotalPmUmMemory>100%</TotalPmUmMemory>
<CPUniqueLimit>100</CPUniqueLimit>
<AllowDiskBasedJoin>N</AllowDiskBasedJoin>
<!-- Be careful modifying TempFilePath! On start, ExeMgr deletes
@ -529,10 +534,10 @@
<Host>127.0.0.1</Host>
<Port>3306</Port>
<User>root</User>
<Password></Password>
<TLSCA></TLSCA>
<TLSClientCert></TLSClientCert>
<TLSClientKey></TLSClientKey>
<Password/>
<TLSCA/>
<TLSClientCert/>
<TLSClientKey/>
</CrossEngineSupport>
<QueryStats>
<Enabled>N</Enabled>
@ -551,5 +556,7 @@
<MaxSockets>30</MaxSockets>
<Enabled>N</Enabled>
</StorageManager>
<DataRedundancyConfig>
<DBRoot1PMs/>
</DataRedundancyConfig>
</Columnstore>

26
oam/install_scripts/CMakeLists.txt
View File

@ -5,13 +5,21 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/columnstore-pre-uninstall.in" "${CMA
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/columnstoreLogRotate.in" "${CMAKE_CURRENT_SOURCE_DIR}/columnstoreLogRotate" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/postInstall.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/postInstall.sh" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/startupTests.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/startupTests.sh" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/columnstore.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/columnstore.service" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mariadb-columnstore.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mariadb-columnstore.service" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/columnstore_module_installer.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/columnstore_module_installer.sh" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/master-rep-columnstore.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/master-rep-columnstore.sh" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/disable-rep-columnstore.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/disable-rep-columnstore.sh" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mariadb-command-line.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/mariadb-command-line.sh" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/slave-rep-columnstore.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/slave-rep-columnstore.sh" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs_module_installer.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs_module_installer.sh" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-workernode.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-workernode.service" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-controllernode.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-controllernode.service" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-primproc.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-primproc.service" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-exemgr.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-exemgr.service" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-writeengineserver.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-writeengineserver.service" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-dmlproc.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-dmlproc.service" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-ddlproc.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-ddlproc.service" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcs-loadbrm.service.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcs-loadbrm.service" @ONLY)
install(PROGRAMS columnstore-post-install
columnstore-pre-uninstall
@ -34,9 +42,9 @@ install(PROGRAMS columnstore-post-install
disable-rep-columnstore.sh
mariadb-command-line.sh
mcs_module_installer.sh
DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
install(FILES columnstore.service
install(FILES mariadb-columnstore.service
columnstoreAlias
columnstoreSyslog
columnstoreSyslog7
@ -44,7 +52,15 @@ install(FILES columnstore.service
columnstoreLogRotate
myCnf-include-args.text
myCnf-exclude-args.text
DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-platform)
mcs-workernode.service
mcs-controllernode.service
mcs-primproc.service
mcs-exemgr.service
mcs-writeengineserver.service
mcs-dmlproc.service
mcs-ddlproc.service
mcs-loadbrm.service
DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-engine)
install(FILES module DESTINATION ${ENGINE_DATADIR}/local COMPONENT columnstore-platform)
install(FILES module DESTINATION ${ENGINE_DATADIR}/local COMPONENT columnstore-engine)

102
oam/install_scripts/columnstore-post-install.in
View File

@ -9,28 +9,6 @@ user=`whoami 2>/dev/null`
quiet=0
for arg in "$@"; do
if [ `expr -- "$arg" : '--rpmmode='` -eq 10 ]; then
rpmmode="`echo $arg | awk -F= '{print $2}'`"
elif [ `expr -- "$arg" : '--user='` -eq 7 ]; then
user="`echo $arg | awk -F= '{print $2}'`"
elif [ `expr -- "$arg" : '--quiet'` -eq 7 ]; then
quiet=1
elif [ `expr -- "$arg" : '--plugin='` -eq 9 ]; then
plugin="`echo $arg | awk -F= '{print $2}'`"
else
echo "post-install: invalid unknown argument: $arg" 1>&2
echo "exiting..."
exit 1
fi
done
if [ ! -f @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml ]; then
echo "@ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml not found, exiting"
exit 1
fi
if [ -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.rpmsave ]; then
/bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.new
/bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.rpmsave @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf
@ -42,13 +20,11 @@ if [ $? -ne 0 ] ; then
exit 1
fi
profileFile="/etc/profile.d/columnstoreAlias.sh"
/bin/cp -f @ENGINE_SUPPORTDIR@/columnstoreAlias /etc/profile.d/columnstoreAlias.sh
chmod 644 /etc/profile.d/columnstoreAlias.sh >/dev/null 2>&1
# set Profile File in config file
mcsSetConfig -d Installation ProfileFile $profileFile
test -d /var/log/mariadb/columnstore || mkdir -p /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
@ -74,42 +50,14 @@ mkdir -p /var/lib/columnstore/data/bulk/rollback >/dev/null 2>&1
mkdir -p /var/lib/columnstore/data/bulk/tmpjob >/dev/null 2>&1
rm -f /var/lib/columnstore/data/bulk/tmpjob/* >/dev/null 2>&1
#get temp base directory
tmpDir="/tmp"
if [ $user != "root" ]; then
tmpDir=$HOME"/.tmp"
mkdir $tmpDir >/dev/null 2>&1
else
#get columnstore temp file directory name
TempFileDir=`mcsGetConfig SystemConfig TempFileDir`
tmpDir=${tmpDir}${TempFileDir}
tmpDir=/tmp/columnstore_tmp_files
mkdir $tmpDir >/dev/null 2>&1
chmod 777 $tmpDir
fi
#set base columnstore temp file directory
mcsSetConfig -d SystemConfig SystemTempFileDir $tmpDir
chmod 664 $tmpDir
#create mount directories
mkdir /mnt/tmp > /dev/null 2>&1
# delete Columnstore shared memory segments
clearShm > /dev/null 2>&1
#check and create rc.local file if missing
if [ -f /etc/rc.d ]; then
RCFILE=/etc/rc.d/rc.local
else
RCFILE=/etc/rc.local
fi
if [ $user = "root" ]; then
touch $RCFILE
chmod +x $RCFILE
else
printf '%s\n' '#!/bin/bash' "#" | tee -a $RCFILE > /dev/null 2>&1
fi
if [ $user = "root" ]; then
#setup the columnstore service script
rm -f /etc/init.d/columnstore >/dev/null 2>&1
@ -117,10 +65,34 @@ if [ $user = "root" ]; then
systemctl=`which systemctl 2>/dev/null`
if [ -n "$systemctl" ]; then
cp @ENGINE_SUPPORTDIR@/mariadb-columnstore.service /usr/lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mariadb-columnstore.service /lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-controllernode.service /usr/lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-controllernode.service /lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-ddlproc.service /usr/lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-ddlproc.service /lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-dmlproc.service /usr/lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-dmlproc.service /lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-exemgr.service /usr/lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-exemgr.service /lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-primproc.service /usr/lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-primproc.service /lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-workernode.service /usr/lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-workernode.service /lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-writeengineserver.service /usr/lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-writeengineserver.service /lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-loadbrm.service /usr/lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/mcs-loadbrm.service /lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/columnstore.service /usr/lib/systemd/system/. >/dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/columnstore.service /lib/systemd/system/. >/dev/null 2>&1
systemctl enable columnstore >/dev/null 2>&1
systemctl enable mariadb-columnstore >/dev/null 2>&1
systemctl enable mcs-controllernode > /dev/null 2>&1
systemctl enable mcs-ddlproc > /dev/null 2>&1
systemctl enable mcs-dmlproc > /dev/null 2>&1
systemctl enable mcs-exemgr > /dev/null 2>&1
systemctl enable mcs-primproc > /dev/null 2>&1
systemctl enable mcs-workernode > /dev/null 2>&1
systemctl enable mcs-writeengineserver > /dev/null 2>&1
systemctl enable mcs-loadbrm > /dev/null 2>&1
else
chkconfig=`which chkconfig 2>/dev/null`
if [ -n "$chkconfig" ]; then
@ -176,22 +148,20 @@ mkdir $lockdir >/dev/null 2>&1
rm -f $lockdir/columnstore
#backup copy of Alarm Config File
/bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/AlarmConfig.xml @ENGINE_SYSCONFDIR@/columnstore/AlarmConfig.xml.installSave > /dev/null 2>&1
#check and get amazon env variables
aws=`which aws 2>/dev/null`
if [ -z "aws" ]; then
MCSgetCredentials.sh >/dev/null 2>&1
fi
cat <<EOD
The next step on the node that will become PM1:
postConfigure
systemctl start mariadb-columnstore
while [ -z $(pgrep -x controllernode) ];
do
sleep 2
done
EOD
dbbuilder 7 > $tmpDir/dbbuilder.log
exit 0

77
oam/install_scripts/columnstore-pre-uninstall.in
View File

@ -13,41 +13,15 @@ running_systemd() {
}
rpmmode=install
user=`whoami 2>/dev/null`
quiet=0
for arg in "$@"; do
if [ `expr -- "$arg" : '--rpmmode='` -eq 10 ]; then
rpmmode="`echo $arg | awk -F= '{print $2}'`"
elif [ `expr -- "$arg" : '--user='` -eq 7 ]; then
user="`echo $arg | awk -F= '{print $2}'`"
elif [ `expr -- "$arg" : '--quiet'` -eq 7 ]; then
quiet=1
else
echo "pre-install: invalid unknown argument: $arg" 1>&2
echo "exiting..."
exit 1
fi
done
#stop services
columnstore stop > /dev/null 2>&1
# Test we are using systemd
systemctl cat mariadb.service > /dev/null 2>&1
systemctl cat mariadb-columnstore.service > /dev/null 2>&1
if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
systemctl stop mariadb.service > /dev/null 2>&1
systemctl stop mariadb-columnstore >/dev/null 2>&1
else
pkill mysqld
fi
cloud=`mcsGetConfig Installation Cloud`
if [ $cloud = "amazon-ec2" ] || [ $cloud = "amazon-vpc" ]; then
if test -f /etc/fstab ; then
sed -i '/Columnstore\/data/d' /etc/fstab > /dev/null 2>&1
fi
PROGS='load_brm workernode controllernode PrimProc ExeMgr DMLProc DDLProc WriteEngineServer'
kill $(pidof $PROGS) > /dev/null
sleep 3
kill -9 $(pidof $PROGS) > /dev/null
fi
rm -f /etc/profile.d/columnstoreAlias.sh
@ -68,6 +42,9 @@ rm -f /var/lib/columnstore/local/*.columnstore
rm -rf /var/lib/columnstore/local/etc/
rm -f /var/lib/columnstore/data/bulk/tmp/job/* >/dev/null 2>&1
rm -f /var/lib/columnstore/local/moveDbrootTransactionLog
rm -rf /var/log/mariadb/columnstore/
rm -rf /tmp/columnstore_tmp_files
rm -rf /usr/share/columnstore
lockdir=`mcsGetConfig Installation LockFileDirectory`
rm -f $lockdir/columnstore
@ -80,11 +57,37 @@ columnstoreSyslogSetup.sh uninstall >/dev/null 2>&1
#remove the start service command
systemctl=`which systemctl 2>/dev/null`
if [ -n "$systemctl" ]; then
if [ -n "$systemctl" ] && [ $(running_systemd) -eq 0 ]; then
systemctl disable columnstore >/dev/null 2>&1
rm -f /usr/lib/systemd/system/columnstore.service
rm -f /lib/systemd/system/columnstore.service
systemctl disable mariadb-columnstore >/dev/null 2>&1
systemctl disable mcs-controllernode > /dev/null 2>&1
systemctl disable mcs-ddlproc > /dev/null 2>&1
systemctl disable mcs-dmlproc > /dev/null 2>&1
systemctl disable mcs-exemgr > /dev/null 2>&1
systemctl disable mcs-primproc > /dev/null 2>&1
systemctl disable mcs-workernode > /dev/null 2>&1
systemctl disable mcs-writeengineserver > /dev/null 2>&1
systemctl disable mcs-loadbrm > /dev/null 2>&1
rm -f /usr/lib/systemd/system/mariadb-columnstore.service
rm -f /lib/systemd/system/mariadb-columnstore.service
rm -f /usr/lib/systemd/system/mcs-controllernode.service
rm -f /lib/systemd/system/mcs-controllernode.service
rm -f /usr/lib/systemd/system/mcs-ddlproc.service
rm -f /lib/systemd/system/mcs-ddlproc.service
rm -f /usr/lib/systemd/system/mcs-dmlproc.service
rm -f /lib/systemd/system/mcs-dmlproc.service
rm -f /usr/lib/systemd/system/mcs-exemgr.service
rm -f /lib/systemd/system/mcs-exemgr.service
rm -f /usr/lib/systemd/system/mcs-primproc.service
rm -f /lib/systemd/system/mcs-primproc.service
rm -f /usr/lib/systemd/system/mcs-workernode.service
rm -f /lib/systemd/system/mcs-workernode.service
rm -f /usr/lib/systemd/system/mcs-writeengineserver.service
rm -f /lib/systemd/system/mcs-writeengineserver.service
rm -f /usr/lib/systemd/system/mcs-loadbrm.service
rm -f /lib/systemd/system/mcs-loadbrm.service
systemctl daemon-reload
else
chkconfig=`which chkconfig 2>/dev/null`
if [ -n "$chkconfig" ]; then
@ -100,14 +103,12 @@ else
fi
fi
if [ $quiet != 1 ]; then
#make copy of Columnstore.xml
/bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml.rpmsave > /dev/null 2>&1
/bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.rpmsave > /dev/null 2>&1
/bin/cp -f @MARIADB_MYCNFDIR@/columnstore.cnf @MARIADB_MYCNFDIR@/columnstore.cnf.rpmsave > /dev/null 2>&1
cp @ENGINE_SUPPORTDIR@/myCnf-include-args.text @ENGINE_SUPPORTDIR@/myCnf-include-args.text.rpmsave >& /dev/null
rm -f @ENGINE_SYSCONFDIR@/columnstore/AlarmConfig.xml.installSave
fi
#remove OAMdbrootCheck file
rm -f /var/lib/columnstore/data*/OAMdbrootCheck > /dev/null 2>&1

13
oam/install_scripts/columnstore.service.in
View File

@ -1,13 +0,0 @@
[Unit]
Description=MariaDB Columnstore
After=network.target
[Service]
Type=forking
#Restart=on-abnormal
GuessMainPID=yes
ExecStart=@ENGINE_BINDIR@/columnstore start
ExecStopPost=@ENGINE_BINDIR@/columnstore stop
TimeoutStopSec=5
LimitNOFILE=65535
[Install]
WantedBy=multi-user.target

14
oam/install_scripts/mariadb-columnstore.service.in Normal file
View File

@ -0,0 +1,14 @@
[Unit]
Description=mariadb-columnstore
[Service]
Type=oneshot
# Execute a dummy program
ExecStart=/bin/true
# This service shall be considered active after start
RemainAfterExit=yes
[Install]
WantedBy=multi-user.target

14
oam/install_scripts/mcs-controllernode.service.in Normal file
View File

@ -0,0 +1,14 @@
[Unit]
Description=mcs-controllernode
PartOf=mcs-workernode.service
After=mcs-workernode.service
[Service]
Type=forking
Environment="SKIP_OAM_INIT=1"
ExecStart=@ENGINE_BINDIR@/controllernode
Restart=on-failure
ExecStop=/usr/bin/env bash -c "/bin/kill -15 $MAINPID && sleep 2 && /bin/kill -9 $(pidof controllernode) || /bin/true"
[Install]
WantedBy=mariadb-columnstore.service

14
oam/install_scripts/mcs-ddlproc.service.in Normal file
View File

@ -0,0 +1,14 @@
[Unit]
Description=mcs-ddlproc
PartOf=mcs-writeengineserver.service
After=mcs-dmlproc.service
[Service]
Type=simple
Environment="SKIP_OAM_INIT=1"
ExecStart=@ENGINE_BINDIR@/DDLProc
Restart=on-failure
ExecStop=/usr/bin/env bash -c "/bin/kill -15 $(pidof DDLProc) && sleep 2 && /bin/kill -9 $(pidof DDLProc) || /bin/true"
[Install]
WantedBy=mariadb-columnstore.service

14
oam/install_scripts/mcs-dmlproc.service.in Normal file
View File

@ -0,0 +1,14 @@
[Unit]
Description=mcs-dmlproc
PartOf=mcs-writeengineserver.service
After=mcs-writeengineserver.service
[Service]
Type=simple
Environment="SKIP_OAM_INIT=1"
ExecStart=@ENGINE_BINDIR@/DMLProc
Restart=on-failure
ExecStop=/usr/bin/env bash -c "/bin/kill -15 $(pidof DMLProc) && sleep 2 && /bin/kill -9 $(pidof DMLProc) || /bin/true"
[Install]
WantedBy=mariadb-columnstore.service

14
oam/install_scripts/mcs-exemgr.service.in Normal file
View File

@ -0,0 +1,14 @@
[Unit]
Description=mcs-exemgr
PartOf=mcs-controllernode.service
After=mcs-controllernode.service
[Service]
Type=simple
Environment="SKIP_OAM_INIT=1"
ExecStart=@ENGINE_BINDIR@/ExeMgr
Restart=on-failure
ExecStop=/usr/bin/env bash -c "/bin/kill -15 $(pidof ExeMgr) && sleep 2 && /bin/kill -9 $(pidof ExeMgr) || /bin/true"
[Install]
WantedBy=mariadb-columnstore.service

14
oam/install_scripts/mcs-loadbrm.service.in Normal file
View File

@ -0,0 +1,14 @@
[Unit]
Description=loadbrm
PartOf=mcs-workernode.service
Before=mcs-workernode.service
ConditionPathExists=/var/lib/columnstore/data1/systemFiles/dbrm/BRM_saves_current
[Service]
Type=simple
Environment="SKIP_OAM_INIT=1"
ExecStart=/usr/bin/env bash -c "/usr/bin/load_brm /var/lib/columnstore/data1/systemFiles/dbrm/$(cat /var/lib/columnstore/data1/systemFiles/dbrm/BRM_saves_current)"
[Install]
WantedBy=mariadb-columnstore.service
WantedBy=mcs-workernode.service

14
oam/install_scripts/mcs-primproc.service.in Normal file
View File

@ -0,0 +1,14 @@
[Unit]
Description=mcs-primproc
PartOf=mcs-exemgr.service
After=mcs-exemgr.service
[Service]
Type=simple
Environment="SKIP_OAM_INIT=1"
ExecStart=@ENGINE_BINDIR@/PrimProc
Restart=on-failure
ExecStop=/usr/bin/env bash -c "/bin/kill -15 $(pidof PrimProc) && sleep 2 && /bin/kill -9 $(pidof PrimProc) || /bin/true"
[Install]
WantedBy=mariadb-columnstore.service

16
oam/install_scripts/mcs-workernode.service.in Normal file
View File

@ -0,0 +1,16 @@
[Unit]
Description=mcs-workernode
PartOf=mariadb-columnstore.service
After=mcs-loadbrm.service
[Service]
Type=forking
Environment="SKIP_OAM_INIT=1"
ExecStart=@ENGINE_BINDIR@/workernode DBRM_Worker1
Restart=on-failure
ExecStop=-@ENGINE_BINDIR@/save_brm
ExecStop=/usr/bin/env bash -c "/bin/kill -15 $MAINPID && sleep 2 && /bin/kill -9 $(pidof workernode) || /bin/true"
ExecStopPost=/usr/bin/env bash -c "clearShm > /dev/null 2>&1"
[Install]
WantedBy=mariadb-columnstore.service

14
oam/install_scripts/mcs-writeengineserver.service.in Normal file
View File

@ -0,0 +1,14 @@
[Unit]
Description=WriteEngineServer
PartOf=mcs-exemgr.service
After=mcs-exemgr.service
[Service]
Type=simple
Environment="SKIP_OAM_INIT=1"
ExecStart=@ENGINE_BINDIR@/WriteEngineServer
Restart=on-failure
ExecStop=/usr/bin/env bash -c "/bin/kill -15 $(pidof WriteEngineServer) && sleep 2 && /bin/kill -9 $(pidof WriteEngineServer) || /bin/true"
[Install]
WantedBy=mariadb-columnstore.service

61
oam/install_scripts/post-mysql-install
View File

@ -20,14 +20,6 @@ checkForError() {
if [ `cat ${tmpdir}/error.check | wc -c` -ne 0 ]; then
echo "MySQL Password file missing or incorrect, check .my.cnf file"
rm -f ${tmpdir}/error.check
# Test we are using systemd
systemctl cat mariadb.service > /dev/null 2>&1
if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
systemctl stop mariadb.service > /dev/null 2>&1
else
pkill mysqld
fi
sleep 2
exit 2;
fi
@ -68,51 +60,28 @@ for arg in "$@"; do
fi
done
# Restart in the same way that mysqld will be started normally.
# Test we are using systemd
systemctl cat mariadb.service > /dev/null 2>&1
if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
systemctl stop mariadb.service > /dev/null 2>&1
else
pkill mysqld
fi
sleep 2
export MYSQL_OPTS="--skip-grant-tables"
# Test we are using systemd
systemctl cat mariadb.service > /dev/null 2>&1
if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
systemctl start mariadb.service
else
/usr/bin/mysqld_safe --skip-grant-tables &
fi
unset MYSQL_OPTS
sleep 5
# Install various Calpont stuff...
install_mcs_mysql.sh --tmpdir=$tmpdir
# Restart MariDB, otherwise engine does not show up.
# Test we are using systemd
systemctl cat mariadb.service > /dev/null 2>&1
if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
systemctl restart mariadb.service > /dev/null 2>&1
else
pkill mysqld
sleep 2
export MYSQL_OPTS="--skip-grant-tables"
/usr/bin/mysqld_safe --skip-grant-tables &
unset MYSQL_OPTS
fi
sleep 5
checkForError
if [ $? -ne 0 ]; then
echo "ERROR: Invalid password in .my.cnf, or Columnstore plugin install missing"
# Test we are using systemd
systemctl cat mariadb.service > /dev/null 2>&1
if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
systemctl stop mariadb.service > /dev/null 2>&1
else
pkill mysqld
fi
sleep 2
exit 2;
fi
# Test we are using systemd
systemctl cat mariadb.service > /dev/null 2>&1
if [ $? -eq 0 ] && [ $(running_systemd) -eq 0 ]; then
systemctl stop mariadb.service > /dev/null 2>&1
else
pkill mysqld
fi
exit 0

2
oam/oamcpp/CMakeLists.txt
View File

@ -12,5 +12,5 @@ target_link_libraries(oamcpp )
target_compile_options(oamcpp PRIVATE -Wno-unused-result)
install(TARGETS oamcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS oamcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
oam/post/CMakeLists.txt
View File

@ -3,5 +3,5 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcstest-002.sh.in" "${CMAKE_CURRENT_
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcstest-003.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcstest-003.sh" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mcstest-004.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/mcstest-004.sh" @ONLY)
install(PROGRAMS columnstore_functions mcstest-001.sh mcstest-002.sh mcstest-003.sh mcstest-004.sh DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-platform)
install(PROGRAMS columnstore_functions mcstest-001.sh mcstest-002.sh mcstest-003.sh mcstest-004.sh DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-engine)

1
oamapps/CMakeLists.txt
View File

@ -1,6 +1,5 @@
add_subdirectory(alarmmanager)
add_subdirectory(mcsadmin)
add_subdirectory(columnstoreDB)
add_subdirectory(postConfigure)
add_subdirectory(serverMonitor)

2
oamapps/alarmmanager/CMakeLists.txt
View File

@ -10,6 +10,6 @@ add_library(alarmmanager SHARED ${alarmmanager_LIB_SRCS})
target_compile_options(alarmmanager PRIVATE -Wno-unused-result)
install(TARGETS alarmmanager DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS alarmmanager DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
oamapps/columnstoreDB/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(columnstoreDBWrite ${columnstoreDBWrite_SRCS})
target_link_libraries(columnstoreDBWrite ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS columnstoreDBWrite DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS columnstoreDBWrite DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

4
oamapps/columnstoreSupport/CMakeLists.txt
View File

@ -12,9 +12,9 @@ target_compile_options(columnstoreSupport PRIVATE -Wno-unused-result)
target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS columnstoreSupport DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS columnstoreSupport DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
install(PROGRAMS alarmReport.sh bulklogReport.sh configReport.sh
hardwareReport.sh logReport.sh resourceReport.sh softwareReport.sh
DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
oamapps/mcsadmin/CMakeLists.txt
View File

@ -12,5 +12,5 @@ target_compile_options(mcsadmin PRIVATE -Wno-unused-result)
target_link_libraries(mcsadmin ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS} ${ENGINE_WRITE_LIBS})
install(TARGETS mcsadmin DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS mcsadmin DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

275
oamapps/mcsadmin/Doxyfile
View File

@ -1,275 +0,0 @@
# Doxyfile 1.4.1-KDevelop
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
PROJECT_NAME = mcsadmin.kdevelop
PROJECT_NUMBER = $VERSION$
OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
USE_WINDOWS_ENCODING = NO
BRIEF_MEMBER_DESC = YES
REPEAT_BRIEF = YES
ABBREVIATE_BRIEF = "The $name class" \
"The $name widget" \
"The $name file" \
is \
provides \
specifies \
contains \
represents \
a \
an \
the
ALWAYS_DETAILED_SEC = NO
INLINE_INHERITED_MEMB = NO
FULL_PATH_NAMES = YES
STRIP_FROM_PATH = /home/dhill/
STRIP_FROM_INC_PATH =
SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = NO
DETAILS_AT_TOP = NO
INHERIT_DOCS = YES
DISTRIBUTE_GROUP_DOC = NO
TAB_SIZE = 8
ALIASES =
OPTIMIZE_OUTPUT_FOR_C = NO
OPTIMIZE_OUTPUT_JAVA = NO
SUBGROUPING = YES
#---------------------------------------------------------------------------
# Build related configuration options
#---------------------------------------------------------------------------
EXTRACT_ALL = NO
EXTRACT_PRIVATE = NO
EXTRACT_STATIC = NO
EXTRACT_LOCAL_CLASSES = YES
EXTRACT_LOCAL_METHODS = NO
HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
HIDE_FRIEND_COMPOUNDS = NO
HIDE_IN_BODY_DOCS = NO
INTERNAL_DOCS = NO
CASE_SENSE_NAMES = YES
HIDE_SCOPE_NAMES = NO
SHOW_INCLUDE_FILES = YES
INLINE_INFO = YES
SORT_MEMBER_DOCS = YES
SORT_BRIEF_DOCS = NO
SORT_BY_SCOPE_NAME = NO
GENERATE_TODOLIST = YES
GENERATE_TESTLIST = YES
GENERATE_BUGLIST = YES
GENERATE_DEPRECATEDLIST= YES
ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = YES
SHOW_DIRECTORIES = YES
FILE_VERSION_FILTER =
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
QUIET = NO
WARNINGS = YES
WARN_IF_UNDOCUMENTED = YES
WARN_IF_DOC_ERROR = YES
WARN_NO_PARAMDOC = NO
WARN_FORMAT = "$file:$line: $text"
WARN_LOGFILE =
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
INPUT = /home/dhill/InfiniDB_MariaDB/oamapps/mcsadmin
FILE_PATTERNS = *.c \
*.cc \
*.cxx \
*.cpp \
*.c++ \
*.java \
*.ii \
*.ixx \
*.ipp \
*.i++ \
*.inl \
*.h \
*.hh \
*.hxx \
*.hpp \
*.h++ \
*.idl \
*.odl \
*.cs \
*.php \
*.php3 \
*.inc \
*.m \
*.mm \
*.dox \
*.C \
*.CC \
*.C++ \
*.II \
*.I++ \
*.H \
*.HH \
*.H++ \
*.CS \
*.PHP \
*.PHP3 \
*.M \
*.MM \
*.C \
*.H \
*.tlh \
*.diff \
*.patch \
*.moc \
*.xpm \
*.dox
RECURSIVE = yes
EXCLUDE =
EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS =
EXAMPLE_PATH =
EXAMPLE_PATTERNS = *
EXAMPLE_RECURSIVE = NO
IMAGE_PATH =
INPUT_FILTER =
FILTER_PATTERNS =
FILTER_SOURCE_FILES = NO
#---------------------------------------------------------------------------
# configuration options related to source browsing
#---------------------------------------------------------------------------
SOURCE_BROWSER = NO
INLINE_SOURCES = NO
STRIP_CODE_COMMENTS = YES
REFERENCED_BY_RELATION = YES
REFERENCES_RELATION = YES
VERBATIM_HEADERS = YES
#---------------------------------------------------------------------------
# configuration options related to the alphabetical class index
#---------------------------------------------------------------------------
ALPHABETICAL_INDEX = NO
COLS_IN_ALPHA_INDEX = 5
IGNORE_PREFIX =
#---------------------------------------------------------------------------
# configuration options related to the HTML output
#---------------------------------------------------------------------------
GENERATE_HTML = YES
HTML_OUTPUT = html
HTML_FILE_EXTENSION = .html
HTML_HEADER =
HTML_FOOTER =
HTML_STYLESHEET =
HTML_ALIGN_MEMBERS = YES
GENERATE_HTMLHELP = NO
CHM_FILE =
HHC_LOCATION =
GENERATE_CHI = NO
BINARY_TOC = NO
TOC_EXPAND = NO
DISABLE_INDEX = NO
ENUM_VALUES_PER_LINE = 4
GENERATE_TREEVIEW = NO
TREEVIEW_WIDTH = 250
#---------------------------------------------------------------------------
# configuration options related to the LaTeX output
#---------------------------------------------------------------------------
GENERATE_LATEX = YES
LATEX_OUTPUT = latex
LATEX_CMD_NAME = latex
MAKEINDEX_CMD_NAME = makeindex
COMPACT_LATEX = NO
PAPER_TYPE = a4wide
EXTRA_PACKAGES =
LATEX_HEADER =
PDF_HYPERLINKS = NO
USE_PDFLATEX = NO
LATEX_BATCHMODE = NO
LATEX_HIDE_INDICES = NO
#---------------------------------------------------------------------------
# configuration options related to the RTF output
#---------------------------------------------------------------------------
GENERATE_RTF = NO
RTF_OUTPUT = rtf
COMPACT_RTF = NO
RTF_HYPERLINKS = NO
RTF_STYLESHEET_FILE =
RTF_EXTENSIONS_FILE =
#---------------------------------------------------------------------------
# configuration options related to the man page output
#---------------------------------------------------------------------------
GENERATE_MAN = NO
MAN_OUTPUT = man
MAN_EXTENSION = .3
MAN_LINKS = NO
#---------------------------------------------------------------------------
# configuration options related to the XML output
#---------------------------------------------------------------------------
GENERATE_XML = yes
XML_OUTPUT = xml
XML_SCHEMA =
XML_DTD =
XML_PROGRAMLISTING = YES
#---------------------------------------------------------------------------
# configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------
GENERATE_AUTOGEN_DEF = NO
#---------------------------------------------------------------------------
# configuration options related to the Perl module output
#---------------------------------------------------------------------------
GENERATE_PERLMOD = NO
PERLMOD_LATEX = NO
PERLMOD_PRETTY = YES
PERLMOD_MAKEVAR_PREFIX =
#---------------------------------------------------------------------------
# Configuration options related to the preprocessor
#---------------------------------------------------------------------------
ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = NO
EXPAND_ONLY_PREDEF = NO
SEARCH_INCLUDES = YES
INCLUDE_PATH =
INCLUDE_FILE_PATTERNS =
PREDEFINED =
EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
# Configuration::additions related to external references
#---------------------------------------------------------------------------
TAGFILES =
GENERATE_TAGFILE = mcsadmin.tag
ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
# Configuration options related to the dot tool
#---------------------------------------------------------------------------
CLASS_DIAGRAMS = YES
HIDE_UNDOC_RELATIONS = YES
HAVE_DOT = NO
CLASS_GRAPH = YES
COLLABORATION_GRAPH = YES
GROUP_GRAPHS = YES
UML_LOOK = NO
TEMPLATE_RELATIONS = NO
INCLUDE_GRAPH = YES
INCLUDED_BY_GRAPH = YES
CALL_GRAPH = NO
GRAPHICAL_HIERARCHY = YES
DIRECTORY_GRAPH = YES
DOT_IMAGE_FORMAT = png
DOT_PATH =
DOTFILE_DIRS =
MAX_DOT_GRAPH_WIDTH = 1024
MAX_DOT_GRAPH_HEIGHT = 1024
MAX_DOT_GRAPH_DEPTH = 1000
DOT_TRANSPARENT = NO
DOT_MULTI_TARGETS = NO
GENERATE_LEGEND = YES
DOT_CLEANUP = YES
#---------------------------------------------------------------------------
# Configuration::additions related to the search engine
#---------------------------------------------------------------------------
SEARCHENGINE = NO

1
oamapps/mcsadmin/mcsadmin.h
View File

@ -39,7 +39,6 @@
#include <ctype.h>
#include <sys/signal.h>
#include <sys/types.h>
#include <readline.h>
#include <readline/history.h>
#include <time.h>
#include <pthread.h>

10
oamapps/postConfigure/CMakeLists.txt
View File

@ -12,7 +12,7 @@ target_compile_options(postConfigure PRIVATE -Wno-unused-result)
target_link_libraries(postConfigure ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS postConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS postConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
########### next target ###############
@ -25,7 +25,7 @@ target_compile_options(columnstore_installer PRIVATE -Wno-unused-result)
target_link_libraries(columnstore_installer ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS columnstore_installer DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS columnstore_installer DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
########### next target ###############
@ -36,7 +36,7 @@ add_executable(getMySQLpw ${getMySQLpw_SRCS})
target_link_libraries(getMySQLpw ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS getMySQLpw DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS getMySQLpw DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
########### next target ###############
@ -60,10 +60,10 @@ target_compile_options(mycnfUpgrade PRIVATE -Wno-unused-result)
target_link_libraries(mycnfUpgrade ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
########### next target ###############
install(PROGRAMS quick_installer_single_server.sh quick_installer_multi_server.sh
DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

59
oamapps/postConfigure/helpers.cpp
View File

@ -48,7 +48,7 @@ string prompt;
const char* pcommand = 0;
extern bool noPrompting;
bool noPrompting = false;
namespace installer
{
@ -644,10 +644,8 @@ void checkFilesPerPartion(int DBRootCount, Config* sysConfig)
return;
}
void checkMysqlPort( std::string& mysqlPort, Config* sysConfig )
void checkMysqlPort(std::string& mysqlPort)
{
Oam oam;
string tmpDir = startup::StartUp::tmpDir();
while (true)
@ -664,69 +662,18 @@ void checkMysqlPort( std::string& mysqlPort, Config* sysConfig )
int size = oldFile.tellg();
if (size != 0)
{
if ( noPrompting )
{
cout << endl << "The MariaDB ColumnStore port of '" + mysqlPort + "' is already in-use" << endl;
cout << "Either use the command line argument of 'port' to enter a different number" << endl;
cout << "or stop the process that is using port '" + mysqlPort + "'" << endl;
cout << "For No-prompt install, exiting" << endl;
cout << "Please stop the process that is using port '" + mysqlPort + "'" << endl;
exit(1);
}
cout << "The MariaDB ColumnStore port of '" + mysqlPort + "' is already in-use on local server" << endl;
cout << "Either enter a different port to use" << endl;
cout << "or stop the process that is using port '" + mysqlPort + "' and enter '" + mysqlPort + "' to continue" << endl;
while (true)
{
prompt = "Enter port number > ";
pcommand = callReadline(prompt.c_str());
if (pcommand)
{
if (strlen(pcommand) > 0) mysqlPort = pcommand;
callFree(pcommand);
pcommand = 0;
}
if ( atoi(mysqlPort.c_str()) < 1000 || atoi(mysqlPort.c_str()) > 9999)
{
cout << " ERROR: Invalid MariaDB ColumnStore Port ID supplied, must be between 1000-9999" << endl;
}
else
break;
}
}
else
{
cout << endl;
try
{
sysConfig->setConfig("Installation", "MySQLPort", mysqlPort);
}
catch (const std::exception& exc)
{
std::cerr << exc.what() << std::endl;
}
if ( !writeConfig(sysConfig) )
{
cout << "ERROR: Failed trying to update MariaDB Columnstore System Configuration file" << endl;
exit(1);
}
break;
}
}
else
break;
}
// set mysql password
oam.changeMyCnf( "port", mysqlPort );
}
void checkSystemMySQLPort(std::string& mysqlPort, Config* sysConfig, std::string USER, std::string password, ChildModuleList childmodulelist, int IserverTypeInstall, bool pmwithum)

2
oamapps/postConfigure/helpers.h
View File

@ -40,7 +40,7 @@ extern void mysqlSetup();
extern int sendMsgProcMon( std::string module, messageqcpp::ByteStream msg, int requestID, int timeout );
extern int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pmwithum);
extern void checkFilesPerPartion(int DBRootCount, Config* sysConfig);
extern void checkMysqlPort( string& mysqlPort, Config* sysConfig);
extern void checkMysqlPort(string& mysqlPort);
extern bool writeConfig(Config* sysConfig);
extern void checkSystemMySQLPort(std::string& mysqlPort, Config* sysConfig, std::string USER, std::string password, ChildModuleList childmodulelist, int IserverTypeInstall, bool pmwithum);
extern const char* callReadline(string prompt);

408
oamapps/postConfigure/installer.cpp
View File

@ -78,7 +78,6 @@ bool uncommentCalpontXml( string entry);
extern string pwprompt;
bool noPrompting;
string mysqlpw = " ";
bool rootUser = true;
@ -96,8 +95,6 @@ int main(int argc, char* argv[])
ModuleList performancemodulelist;
Module childmodule;
struct sysinfo myinfo;
string prompt;
string nodeps = "-h";
string installer_debug = "0";
@ -216,291 +213,6 @@ int main(int argc, char* argv[])
IserverTypeInstall = atoi(serverTypeInstall.c_str());
if ( installType != "uninstall" )
{
//setup ProcessConfig.xml
switch ( IserverTypeInstall )
{
case (oam::INSTALL_COMBINE_DM_UM_PM): // combined #1 dm/um/pm on a single server
case (oam::INSTALL_COMBINE_DM_UM): // combined #2 dm/um on a same server
case (oam::INSTALL_COMBINE_PM_UM): // combined #3 um/pm on a same server
{
//module ProcessConfig.xml to setup all apps on the dm
if ( !updateProcessConfig(IserverTypeInstall) )
cout << "Update ProcessConfig.xml error" << endl;
break;
}
}
//set Resource Settings
switch ( IserverTypeInstall )
{
case (oam::INSTALL_COMBINE_DM_UM_PM): // combined #1 - dm/um/pm on a single server
{
if ( !writeConfig(sysConfig) )
{
cout << "ERROR: Failed trying to update MariaDB ColumnStore System Configuration file" << endl;
exit(1);
}
try
{
sysConfig->setConfig("PrimitiveServers", "RotatingDestination", "n");
}
catch (...)
{
cout << "ERROR: Problem setting RotatingDestination in the MariaDB ColumnStore System Configuration file" << endl;
exit(1);
}
// are we using settings from previous config file?
if ( reuseConfig == "n" )
{
try
{
DBRootStorageType = sysConfig->getConfig(InstallSection, "DBRootStorageType");
}
catch (...)
{
cout << "ERROR: Problem getting DB Storage Data from the MariaDB ColumnStore System Configuration file" << endl;
return false;
}
string numBlocksPct;
if (numBlocksPctParam.empty()) {
numBlocksPct = "50";
if (DBRootStorageType == "hdfs")
numBlocksPct = "25";
}
else {
numBlocksPct = numBlocksPctParam;
}
try
{
sysConfig->setConfig("DBBC", "NumBlocksPct", numBlocksPct);
if (*numBlocksPct.rbegin() == 'M' || *numBlocksPct.rbegin() == 'G') {
cout << endl << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPct << endl;
}
else {
cout << endl << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPct << "%" << endl;
}
}
catch (...)
{
cout << "ERROR: Problem setting NumBlocksPct in the MariaDB ColumnStore System Configuration file" << endl;
exit(1);
}
try
{
sysinfo(&myinfo);
}
catch (...) {}
//get memory stats
// long long total = myinfo.totalram / 1024 / 1000;
// adjust max memory, 25% of total memory
string percent;
if (totalUmMemoryParam.empty()) {
percent = "25%";
if (DBRootStorageType == "hdfs")
{
percent = "12%";
}
cout << " Setting 'TotalUmMemory' to " << percent << " of total memory. " << endl;
}
else {
percent = totalUmMemoryParam;
cout << " Setting 'TotalUmMemory' to " << percent << endl;
}
try
{
sysConfig->setConfig("HashJoin", "TotalUmMemory", percent);
}
catch (...)
{
cout << "ERROR: Problem setting TotalUmMemory in the MariaDB ColumnStore System Configuration file" << endl;
exit(1);
}
}
else
{
try
{
string numBlocksPct;
string totalUmMemory;
if (!numBlocksPctParam.empty()) {
numBlocksPct = numBlocksPctParam;
}
else {
numBlocksPct = sysConfig->getConfig("DBBC", "NumBlocksPct");
}
if (!totalUmMemoryParam.empty()) {
totalUmMemory = totalUmMemoryParam;
}
else {
totalUmMemory = sysConfig->getConfig("HashJoin", "TotalUmMemory");
}
if (numBlocksPct.empty() || numBlocksPct == "")
{
numBlocksPct = "50";
}
if (totalUmMemory.empty() || totalUmMemory == "") {
totalUmMemory = "25%";
}
try
{
sysConfig->setConfig("DBBC", "NumBlocksPct", numBlocksPct);
sysConfig->setConfig("HashJoin", "TotalUmMemory", totalUmMemory);
if (*numBlocksPct.rbegin() == 'M' || *numBlocksPct.rbegin() == 'G') {
cout << endl << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPct << endl;
}
else {
cout << endl << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPct << "%" << endl;
}
cout << " Setting 'TotalUmMemory' to " << totalUmMemory << endl;
}
catch (...)
{
cout << "ERROR: Problem setting NumBlocksPct/TotalUmMemory in the MariaDB ColumnStore System Configuration file" << endl;
exit(1);
}
}
catch (...)
{
cout << "ERROR: Problem reading NumBlocksPct/TotalUmMemory in the MariaDB ColumnStore System Configuration file" << endl;
exit(1);
}
}
if ( !writeConfig(sysConfig) )
{
cout << "ERROR: Failed trying to update MariaDB ColumnStore System Configuration file" << endl;
exit(1);
}
break;
}
default: // normal, seperate UM and PM
{
// are we using settings from previous config file?
if ( reuseConfig == "n" )
{
string numBlocksPct = "70";
string totalUmMemory = "50%";
if (!numBlocksPctParam.empty()) {
numBlocksPct = numBlocksPctParam;
cout << endl << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPct << endl;
}
else {
cout << endl << "NOTE: Using the default setting for 'NumBlocksPct' at " << numBlocksPct << "%" << endl;
}
if (!totalUmMemoryParam.empty()) {
totalUmMemory = totalUmMemoryParam;
cout << endl << "Setting 'TotalUmMemory' to " << totalUmMemory << endl;
}
else {
cout << endl << "Setting 'TotalUmMemory' to " << totalUmMemory << " of total memory." << endl;
}
try
{
sysinfo(&myinfo);
}
catch (...) {}
try
{
sysConfig->setConfig("DBBC", "NumBlocksPct", numBlocksPct);
sysConfig->setConfig("HashJoin", "TotalUmMemory", totalUmMemory);
}
catch (...)
{
cout << "ERROR: Problem setting TotalUmMemory/NumBlocksPct in the MariaDB ColumnStore System Configuration file" << endl;
exit(1);
}
}
else
{
try
{
string numBlocksPct;
string totalUmMemory;
if (!numBlocksPctParam.empty()) {
numBlocksPct = numBlocksPctParam;
}
else {
numBlocksPct = sysConfig->getConfig("DBBC", "NumBlocksPct");
}
if (!totalUmMemoryParam.empty()) {
totalUmMemory = totalUmMemoryParam;
}
else {
totalUmMemory = sysConfig->getConfig("HashJoin", "TotalUmMemory");
}
if (numBlocksPct.empty() || numBlocksPct == "")
{
numBlocksPct = "70";
}
if (totalUmMemory.empty() || totalUmMemory == "") {
totalUmMemory = "50%";
}
try
{
sysConfig->setConfig("DBBC", "NumBlocksPct", numBlocksPct);
sysConfig->setConfig("HashJoin", "TotalUmMemory", totalUmMemory);
if (*numBlocksPct.rbegin() == 'M' || *numBlocksPct.rbegin() == 'G') {
cout << endl << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPct << endl;
}
else {
cout << endl << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPct << "%" << endl;
}
cout << " Setting 'TotalUmMemory' to " << totalUmMemory << endl;
}
catch (...)
{
cout << "ERROR: Problem setting NumBlocksPct/TotalUmMemory in the MariaDB ColumnStore System Configuration file" << endl;
exit(1);
}
}
catch (...)
{
cout << "ERROR: Problem reading NumBlocksPct/TotalUmMemory in the MariaDB ColumnStore System Configuration file" << endl;
exit(1);
}
}
if ( !writeConfig(sysConfig) )
{
cout << "ERROR: Failed trying to update MariaDB ColumnStore System Configuration file" << endl;
exit(1);
}
break;
}
}
}
if ( !writeConfig(sysConfig) )
{
cout << "ERROR: Failed trying to update MariaDB ColumnStore System Configuration file" << endl;
exit(1);
}
//get PPackage Type
try
{
@ -695,40 +407,6 @@ int main(int argc, char* argv[])
system(cmd.c_str());
}
string idbstartcmd = "columnstore start";
{
//
// perform single-server install from auto-installer
//
if ( calpont_rpm1 != "dummy.rpm" )
{
//run the mysql / mysqld setup scripts
cout << endl << "Running the MariaDB ColumnStore setup scripts" << endl << endl;
// call the mysql setup scripts
mysqlSetup();
sleep(5);
if (getenv("SKIP_OAM_INIT"))
{
cout << "(2) SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl;
sysConfig->setConfig("Installation", "MySQLRep", "n");
sysConfig->write();
exit(0);
}
//start on local module
int rtnCode = system(idbstartcmd.c_str());
if (WEXITSTATUS(rtnCode) != 0)
cout << "Error starting MariaDB ColumnStore local module" << endl;
else
cout << "Start MariaDB ColumnStore request successful" << endl;
}
else
{
//
// perform single-server install from postConfigure
//
@ -739,92 +417,6 @@ int main(int argc, char* argv[])
// call the mysql setup scripts
mysqlSetup();
sleep(5);
if (getenv("SKIP_OAM_INIT"))
{
cout << "(3) SKIP_OAM_INIT is set, so will not start ColumnStore or init the system catalog" << endl;
sysConfig->setConfig("Installation", "MySQLRep", "n");
sysConfig->write();
exit(0);
}
//startup mysqld and infinidb processes
cout << endl;
cmd = "clearShm > /dev/null 2>&1";
system(cmd.c_str());
system(idbstartcmd.c_str());
}
}
// check for system going ACTIVE
sleep(5);
cout << endl << "Starting MariaDB ColumnStore Database Platform Starting, please wait .";
cout.flush();
string ProfileFile;
try
{
ProfileFile = sysConfig->getConfig(InstallSection, "ProfileFile");
}
catch (...)
{}
if ( waitForActive() )
{
cout << " DONE" << endl;
string logFile = tmpDir + "/dbbuilder.log";
cmd = "dbbuilder 7 > " + logFile;
system(cmd.c_str());
if (oam.checkLogStatus(logFile, "System Catalog created") )
cout << endl << "System Catalog Successfully Created" << endl;
else
{
if ( oam.checkLogStatus(logFile, "System catalog appears to exist") )
{
cout.flush();
}
else
{
cout << endl << "System Catalog Create Failure" << endl;
cout << "Check latest log file in " << logFile << endl;
cout << " IMPORTANT: Once issue has been resolved, rerun postConfigure" << endl << endl;
exit (1);
}
}
cout << endl << "MariaDB ColumnStore Install Successfully Completed, System is Active" << endl << endl;
cout << "Enter the following command to define MariaDB ColumnStore Alias Commands" << endl << endl;
cout << ". " << ProfileFile << endl << endl;
cout << "Enter 'mariadb' to access the MariaDB ColumnStore SQL console" << endl;
cout << "Enter 'mcsadmin' to access the MariaDB ColumnStore Admin console" << endl << endl;
cout << "NOTE: The MariaDB ColumnStore Alias Commands are in /etc/profile.d/columnstoreAlias.sh" << endl << endl;
}
else
{
cout << " FAILED" << endl;
cout << " IMPORTANT: There was a system startup failed, once issue has been resolved, rerun postConfigure" << endl << endl;
cout << endl << "ERROR: MariaDB ColumnStore Process failed to start, check log files in /var/log/mariadb/columnstore" << endl;
cout << "Enter the following command to define MariaDB ColumnStore Alias Commands" << endl << endl;
cout << ". " << ProfileFile << endl << endl;
cout << "Enter 'mariadb' to access the MariaDB ColumnStore SQL console" << endl;
cout << "Enter 'mcsadmin' to access the MariaDB ColumnStore Admin console" << endl << endl;
cout << "NOTE: The MariaDB ColumnStore Alias Commands are in /etc/profile.d/columnstoreAlias" << endl << endl;
exit (1);
}
exit(0);
}

6623
oamapps/postConfigure/postConfigure.cpp
View File

File diff suppressed because it is too large Load Diff

2
oamapps/serverMonitor/CMakeLists.txt
View File

@ -22,5 +22,5 @@ target_compile_options(ServerMonitor PRIVATE -Wno-unused-result)
target_link_libraries(ServerMonitor ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS ServerMonitor DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS ServerMonitor DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
primitives/primproc/CMakeLists.txt
View File

@ -27,6 +27,6 @@ add_executable(PrimProc ${PrimProc_SRCS})
target_link_libraries(PrimProc ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} threadpool cacheutils dbbc processor)
install(TARGETS PrimProc DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS PrimProc DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
procmgr/CMakeLists.txt
View File

@ -12,5 +12,5 @@ target_compile_options(ProcMgr PRIVATE -Wno-unused-result)
target_link_libraries(ProcMgr ${ENGINE_LDFLAGS} cacheutils ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS ProcMgr DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS ProcMgr DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
procmon/CMakeLists.txt
View File

@ -12,5 +12,5 @@ target_compile_options(ProcMon PRIVATE -Wno-unused-result)
target_link_libraries(ProcMon ${ENGINE_LDFLAGS} cacheutils ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS ProcMon DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS ProcMon DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

9
storage-manager/CMakeLists.txt
View File

@ -131,22 +131,21 @@ target_link_libraries(smrm storagemanager cloudio
install(TARGETS storagemanager
LIBRARY DESTINATION ${ENGINE_LIBDIR}
COMPONENT columnstore-platform
COMPONENT columnstore-engine
)
install(TARGETS StorageManager smcat smput smls smrm testS3Connection
RUNTIME DESTINATION ${ENGINE_BINDIR}
COMPONENT columnstore-platform
COMPONENT columnstore-engine
)
install(FILES storagemanager.cnf
DESTINATION ${ENGINE_SYSCONFDIR}/columnstore
COMPONENT columnstore-platform
COMPONENT columnstore-engine
)
install(FILES storagemanager.cnf
RENAME storagemanager.cnf.example
DESTINATION ${ENGINE_SYSCONFDIR}/columnstore
COMPONENT columnstore-platform
COMPONENT columnstore-engine
)

2
tools/clearShm/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(clearShm ${clearShm_SRCS})
target_link_libraries(clearShm ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS clearShm DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS clearShm DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
tools/cleartablelock/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(cleartablelock ${cleartablelock_SRCS})
target_link_libraries(cleartablelock ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS})
install(TARGETS cleartablelock DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS cleartablelock DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
tools/configMgt/CMakeLists.txt
View File

@ -10,4 +10,4 @@ add_executable(autoConfigure ${autoConfigure_SRCS})
target_link_libraries(autoConfigure ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS autoConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS autoConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
tools/cplogger/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(cplogger ${cplogger_SRCS})
target_link_libraries(cplogger ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS cplogger DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS cplogger DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
tools/dbbuilder/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(dbbuilder ${dbbuilder_SRCS})
target_link_libraries(dbbuilder ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS})
install(TARGETS dbbuilder DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS dbbuilder DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
tools/dbloadxml/CMakeLists.txt
View File

@ -15,5 +15,5 @@ add_executable(colxml ${colxml_SRCS})
target_link_libraries(colxml ${ENGINE_LDFLAGS} dbload ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS})
install(TARGETS colxml DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS colxml DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
tools/ddlcleanup/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(ddlcleanup ${ddlcleanup_SRCS})
target_link_libraries(ddlcleanup ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ddlcleanuputil)
install(TARGETS ddlcleanup DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS ddlcleanup DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
tools/editem/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(editem ${editem_SRCS})
target_link_libraries(editem ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS editem DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS editem DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
tools/getConfig/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(mcsGetConfig ${getConfig_SRCS})
target_link_libraries(mcsGetConfig ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS mcsGetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS mcsGetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
tools/idbmeminfo/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(idbmeminfo ${idbmeminfo_SRCS})
target_link_libraries(idbmeminfo ${ENGINE_LDFLAGS})
install(TARGETS idbmeminfo DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS idbmeminfo DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

4
tools/setConfig/CMakeLists.txt
View File

@ -11,7 +11,7 @@ add_executable(mcsSetConfig ${setConfig_SRCS})
target_link_libraries(mcsSetConfig ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS mcsSetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS mcsSetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)
install(PROGRAMS configxml.sh DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(PROGRAMS configxml.sh DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
tools/viewtablelock/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(viewtablelock ${viewtablelock_SRCS})
target_link_libraries(viewtablelock ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS viewtablelock DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(TARGETS viewtablelock DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
utils/batchloader/CMakeLists.txt
View File

@ -10,6 +10,6 @@ add_library(batchloader SHARED ${batchloader_LIB_SRCS})
target_link_libraries(batchloader ${NETSNMP_LIBRARIES})
install(TARGETS batchloader DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS batchloader DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
utils/cacheutils/CMakeLists.txt
View File

@ -8,5 +8,5 @@ set(cacheutils_LIB_SRCS cacheutils.cpp)
add_library(cacheutils SHARED ${cacheutils_LIB_SRCS})
install(TARGETS cacheutils DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS cacheutils DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
utils/cloudio/CMakeLists.txt
View File

@ -9,7 +9,7 @@ add_library(cloudio SHARED ${cloudio_LIB_SRCS})
# we should be able to reverse the dependency like so:
target_link_libraries(cloudio idbdatafile messageqcpp loggingcpp)
install(TARGETS cloudio DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS cloudio DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
add_executable(cloudio_component_test component_test.cpp)

2
utils/clusterTester/CMakeLists.txt
View File

@ -1,5 +1,5 @@
install(PROGRAMS columnstoreClusterTester.sh
os_detect.sh
DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

2
utils/common/CMakeLists.txt
View File

@ -16,5 +16,5 @@ add_library(common SHARED ${common_LIB_SRCS})
add_dependencies(common loggingcpp)
install(TARGETS common DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS common DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
utils/compress/CMakeLists.txt
View File

@ -12,5 +12,5 @@ add_library(compress SHARED ${compress_LIB_SRCS})
target_link_libraries(compress ${SNAPPY_LIBRARIES})
install(TARGETS compress DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS compress DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
utils/configcpp/CMakeLists.txt
View File

@ -9,5 +9,5 @@ add_library(configcpp SHARED ${configcpp_LIB_SRCS})
target_compile_definitions(configcpp PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS)
install(TARGETS configcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS configcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
utils/dataconvert/CMakeLists.txt
View File

@ -8,4 +8,4 @@ set(dataconvert_LIB_SRCS dataconvert.cpp)
add_library(dataconvert SHARED ${dataconvert_LIB_SRCS})
install(TARGETS dataconvert DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS dataconvert DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
utils/ddlcleanup/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_library(ddlcleanuputil SHARED ${ddlcleanuputil_LIB_SRCS})
target_link_libraries(ddlcleanuputil ${NETSNMP_LIBRARIES})
install(TARGETS ddlcleanuputil DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS ddlcleanuputil DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
utils/funcexp/CMakeLists.txt
View File

@ -112,5 +112,5 @@ add_library(funcexp SHARED ${funcexp_LIB_SRCS})
target_link_libraries(funcexp ${NETSNMP_LIBRARIES})
install(TARGETS funcexp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS funcexp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
utils/idbdatafile/CMakeLists.txt
View File

@ -19,4 +19,4 @@ target_link_libraries(idbdatafile ${NETSNMP_LIBRARIES} ${ENGINE_OAM_LIBS})
target_compile_definitions(idbdatafile PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS)
install(TARGETS idbdatafile DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS idbdatafile DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
utils/joiner/CMakeLists.txt
View File

@ -8,6 +8,6 @@ set(joiner_LIB_SRCS joiner.cpp tuplejoiner.cpp joinpartition.cpp)
add_library(joiner SHARED ${joiner_LIB_SRCS})
install(TARGETS joiner DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS joiner DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
utils/libmarias3/CMakeLists.txt
View File

@ -35,5 +35,5 @@ set(S3API_DEPS marias3 curl CACHE INTERNAL "S3API_DEPS")
install(TARGETS marias3
DESTINATION ${ENGINE_LIBDIR}
COMPONENT columnstore-platform
COMPONENT columnstore-engine
)

2
utils/libmysql_client/CMakeLists.txt
View File

@ -7,5 +7,5 @@ set(libmysql_client_LIB_SRCS libmysql_client.cpp)
add_library(libmysql_client SHARED ${libmysql_client_LIB_SRCS})
install(TARGETS libmysql_client DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS libmysql_client DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

4
utils/loggingcpp/CMakeLists.txt
View File

@ -29,7 +29,7 @@ add_library(loggingcpp SHARED
${CMAKE_CURRENT_BINARY_DIR}/errorids.h
)
install(TARGETS loggingcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS loggingcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)
install(FILES MessageFile.txt ErrorMessage.txt DESTINATION ${ENGINE_SYSCONFDIR}/columnstore COMPONENT columnstore-platform)
install(FILES MessageFile.txt ErrorMessage.txt DESTINATION ${ENGINE_SYSCONFDIR}/columnstore COMPONENT columnstore-engine)

2
utils/messageqcpp/CMakeLists.txt
View File

@ -16,4 +16,4 @@ set(messageqcpp_LIB_SRCS
add_library(messageqcpp SHARED ${messageqcpp_LIB_SRCS})
install(TARGETS messageqcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS messageqcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
utils/querystats/CMakeLists.txt
View File

@ -7,5 +7,5 @@ set(querystats_LIB_SRCS querystats.cpp)
add_library(querystats SHARED ${querystats_LIB_SRCS})
install(TARGETS querystats DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS querystats DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
utils/querytele/CMakeLists.txt
View File

@ -14,5 +14,5 @@ set(querytele_LIB_SRCS
add_library(querytele SHARED ${querytele_LIB_SRCS})
install(TARGETS querytele DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS querytele DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
utils/regr/CMakeLists.txt
View File

@ -10,7 +10,7 @@ add_definitions(-DMYSQL_DYNAMIC_PLUGIN)
add_library(regr SHARED ${regr_LIB_SRCS} )
install(TARGETS regr DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS regr DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
utils/rowgroup/CMakeLists.txt
View File

@ -12,5 +12,5 @@ add_library(rowgroup SHARED ${rowgroup_LIB_SRCS})
target_link_libraries(rowgroup ${NETSNMP_LIBRARIES} funcexp)
install(TARGETS rowgroup DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS rowgroup DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
utils/rwlock/CMakeLists.txt
View File

@ -9,5 +9,5 @@ set(rwlock_LIB_SRCS rwlock.cpp rwlock_local.cpp)
add_library(rwlock SHARED ${rwlock_LIB_SRCS})
install(TARGETS rwlock DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS rwlock DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

2
utils/threadpool/CMakeLists.txt
View File

@ -8,4 +8,4 @@ set(threadpool_LIB_SRCS weightedthreadpool.cpp threadpool.cpp prioritythreadpool
add_library(threadpool SHARED ${threadpool_LIB_SRCS})
install(TARGETS threadpool DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS threadpool DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

4
utils/threadpool/threadpool.cpp
View File

@ -298,9 +298,9 @@ uint64_t ThreadPool::invoke(const Functor_T& threadfunc)
logging::Message::Args args;
logging::Message message(5);
args.add("invoke: Blocked waiting for thread. Count ");
args.add(fThreadCount);
args.add(static_cast<uint64_t>(fThreadCount));
args.add("max ");
args.add(fMaxThreads);
args.add(static_cast<uint64_t>(fMaxThreads));
message.format(args);
logging::LoggingID lid(22);
logging::MessageLog ml(lid);

2
utils/thrift/CMakeLists.txt
View File

@ -16,5 +16,5 @@ add_definitions(-DTHRIFT_SQUELCH_CONSOLE_OUTPUT)
add_library(thrift SHARED ${thrift_LIB_SRCS})
install(TARGETS thrift DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
install(TARGETS thrift DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-engine)

Some files were not shown because too many files have changed in this diff Show More