diff --git a/CMakeLists.txt b/CMakeLists.txt index ef0bb09ea..531e7842b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,17 +35,14 @@ else() set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) endif(CCACHE_FOUND) endif() -# Distinguish between community and non-community builds, with the -# default being a community build. This does not impact the feature -# set that will be compiled in; it's merely provided as a hint to -# custom packaging steps. -OPTION(COMMUNITY_BUILD "Set to true if this is a community build" ON) -IF(NOT CMAKE_BUILD_TYPE) - SET(CMAKE_BUILD_TYPE RELWITHDEBINFO CACHE STRING - "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel" FORCE) -ENDIF(NOT CMAKE_BUILD_TYPE) -SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") +IF(NOT INSTALL_LAYOUT) + IF(NOT CMAKE_BUILD_TYPE) + SET(CMAKE_BUILD_TYPE RELWITHDEBINFO CACHE STRING + "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel" FORCE) + ENDIF(NOT CMAKE_BUILD_TYPE) + SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") +ENDIF() if(SERVER_BUILD_DIR) if (NOT IS_ABSOLUTE ${SERVER_BUILD_DIR}) @@ -77,46 +74,59 @@ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib) SET (ENGINE_SYSCONFDIR "/etc") SET (ENGINE_DATADIR "/var/lib/columnstore") -# TODO: This will all be replaced by variables from server install_layout.cmake once we are a submodule -IF (RPM) - SET(MARIADB_PLUGINDIR "/usr/lib64/mysql/plugin") - SET(MARIADB_MYCNFDIR "/etc/my.cnf.d") - SET (ENGINE_LIBDIR "/usr/lib64") - SET (ENGINE_BINDIR "/usr/bin") - SET (ENGINE_INCDIR "/usr/include") - SET (ENGINE_MANDIR "/usr/share/man") - SET (ENGINE_SBINDIR "/usr/sbin") - SET (ENGINE_SUPPORTDIR "/usr/share/columnstore") -ELSEIF (DEB) - SET(MARIADB_PLUGINDIR "/usr/lib/mysql/plugin") - SET(MARIADB_MYCNFDIR "/etc/mysql/conf.d") - SET (ENGINE_LIBDIR "/usr/lib") - SET (ENGINE_BINDIR "/usr/bin") - SET (ENGINE_INCDIR "/usr/include") - SET (ENGINE_MANDIR "/usr/share/man") - SET (ENGINE_SBINDIR "/usr/sbin") - SET (ENGINE_SUPPORTDIR "/usr/share/columnstore") -ELSE() - # TODO: prefix should probably apply here - SET(MARIADB_PLUGINDIR "/usr/local/lib/mysql/plugin") - SET(MARIADB_MYCNFDIR "/etc/mysql") - SET (ENGINE_LIBDIR "/usr/local/lib") - SET (ENGINE_BINDIR "/usr/local/bin") - SET (ENGINE_INCDIR "/usr/local/include") - SET (ENGINE_MANDIR "/usr/local/man") - SET (ENGINE_SBINDIR "/usr/local/sbin") - SET (ENGINE_SUPPORTDIR "/usr/local/share/columnstore") -ENDIF() +IF (INSTALL_LAYOUT) + # We are building from MariaDB server submodule if this is set + SET(MARIADB_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}") + SET(MARIADB_MYCNFDIR "${INSTALL_SYSCONF2DIR}") + SET(ENGINE_LIBDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBDIR}") + SET(ENGINE_BINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}") + SET(ENGINE_INCDIR "${CMAKE_INSTALL_PREFIX}/include") + SET(ENGINE_MANDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_MANDIR}") + SET(ENGINE_SBINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_SBINDIR}") + SET(ENGINE_SUPPORTDIR "${CMAKE_INSTALL_PREFIX}/share/columnstore") +ELSE () + IF (RPM) + SET(MARIADB_PLUGINDIR "/usr/lib64/mysql/plugin") + SET(MARIADB_MYCNFDIR "/etc/my.cnf.d") + SET (ENGINE_LIBDIR "/usr/lib64") + SET (ENGINE_BINDIR "/usr/bin") + SET (ENGINE_INCDIR "/usr/include") + SET (ENGINE_MANDIR "/usr/share/man") + SET (ENGINE_SBINDIR "/usr/sbin") + SET (ENGINE_SUPPORTDIR "/usr/share/columnstore") + ELSEIF (DEB) + SET(MARIADB_PLUGINDIR "/usr/lib/mysql/plugin") + SET(MARIADB_MYCNFDIR "/etc/mysql/conf.d") + SET (ENGINE_LIBDIR "/usr/lib") + SET (ENGINE_BINDIR "/usr/bin") + SET (ENGINE_INCDIR "/usr/include") + SET (ENGINE_MANDIR "/usr/share/man") + SET (ENGINE_SBINDIR "/usr/sbin") + SET (ENGINE_SUPPORTDIR "/usr/share/columnstore") + ELSE () + # TODO: prefix should probably apply here + SET(MARIADB_PLUGINDIR "/usr/local/lib/mysql/plugin") + SET(MARIADB_MYCNFDIR "/etc/mysql") + SET (ENGINE_LIBDIR "/usr/local/lib") + SET (ENGINE_BINDIR "/usr/local/bin") + SET (ENGINE_INCDIR "/usr/local/include") + SET (ENGINE_MANDIR "/usr/local/man") + SET (ENGINE_SBINDIR "/usr/local/sbin") + SET (ENGINE_SUPPORTDIR "/usr/local/share/columnstore") + ENDIF () +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) +FIND_PACKAGE(Boost 1.53.0 REQUIRED COMPONENTS system filesystem thread regex date_time chrono) FIND_PACKAGE(BISON REQUIRED) check_cxx_source_compiles("#include \n void main(){}" HAS_STD_FILESYSTEM) check_cxx_source_compiles("#include \n void main(){}" HAS_STD_EXPERIMENTAL_FILESYSTEM) +SET (ENGINE_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + INCLUDE(columnstore_version) SET (PACKAGE columnstore) @@ -127,9 +137,6 @@ SET (PACKAGE_URL "") SET (PACKAGE_STRING columnstore-${PACKAGE_VERSION}) - -SET (ENGINE_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - INCLUDE (configureEngine) @@ -153,53 +160,46 @@ if (NOT SNAPPY_FOUND) MESSAGE(FATAL_ERROR "Snappy not found please install snappy-devel for CentOS/RedHat or libsnappy-dev for Ubuntu/Debian") endif() -# Jemalloc has issues with SLES 12, so disable for now -IF (EXISTS "/etc/SuSE-release") - SET(JEMALLOC_LIBRARIES "") -ELSE () - INCLUDE (FindJeMalloc) - if (NOT JEMALLOC_FOUND) - message(FATAL_ERROR "jemalloc not found!") - SET(JEMALLOC_LIBRARIES "") - endif() -ENDIF () - FIND_PROGRAM(AWK_EXECUTABLE awk DOC "path to the awk executable") if(NOT AWK_EXECUTABLE) message(FATAL_ERROR "awk not found!") endif() -INCLUDE(check_compiler_flag) +IF (NOT INSTALL_LAYOUT) + INCLUDE(check_compiler_flag) -MY_CHECK_AND_SET_COMPILER_FLAG("-g -O3 -std=c++11 -fno-omit-frame-pointer -fno-strict-aliasing -Wall -fno-tree-vectorize -D_GLIBCXX_ASSERTIONS -DDBUG_OFF -DHAVE_CONFIG_H" RELEASE RELWITHDEBINFO MINSIZEREL) -MY_CHECK_AND_SET_COMPILER_FLAG("-ggdb3 -std=c++11 -fno-omit-frame-pointer -fno-tree-vectorize -D_GLIBCXX_ASSERTIONS -DSAFE_MUTEX -DSAFEMALLOC -DENABLED_DEBUG_SYNC -O0 -Wall -D_DEBUG -DHAVE_CONFIG_H" DEBUG) + MY_CHECK_AND_SET_COMPILER_FLAG("-g -O3 -std=c++11 -fno-omit-frame-pointer -fno-strict-aliasing -Wall -fno-tree-vectorize -D_GLIBCXX_ASSERTIONS -DDBUG_OFF -DHAVE_CONFIG_H" RELEASE RELWITHDEBINFO MINSIZEREL) + MY_CHECK_AND_SET_COMPILER_FLAG("-ggdb3 -std=c++11 -fno-omit-frame-pointer -fno-tree-vectorize -D_GLIBCXX_ASSERTIONS -DSAFE_MUTEX -DSAFEMALLOC -DENABLED_DEBUG_SYNC -O0 -Wall -D_DEBUG -DHAVE_CONFIG_H" DEBUG) -# enable security hardening features, like most distributions do -# in our benchmarks that costs about ~1% of performance, depending on the load -IF(CMAKE_C_COMPILER_VERSION VERSION_LESS "4.6") - SET(security_default OFF) -ELSE() - SET(security_default ON) + # enable security hardening features, like most distributions do + # in our benchmarks that costs about ~1% of performance, depending on the load + IF(CMAKE_C_COMPILER_VERSION VERSION_LESS "4.6") + SET(security_default OFF) + ELSE() + SET(security_default ON) + ENDIF() + OPTION(SECURITY_HARDENED "Use security-enhancing compiler features (stack protector, relro, etc)" ${security_default}) + OPTION(SECURITY_HARDENED_NEW "Use new security-enhancing compilier features" OFF) + IF(SECURITY_HARDENED) + # security-enhancing flags + MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC") + MY_CHECK_AND_SET_COMPILER_FLAG("-Wl,-z,relro,-z,now") + MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector --param=ssp-buffer-size=4") + MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO) + MY_CHECK_AND_SET_COMPILER_FLAG("-fexceptions") + IF(SECURITY_HARDENED_NEW) + MY_CHECK_AND_SET_COMPILER_FLAG("-mcet -fcf-protection") + MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector-strong") + MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-clash-protection") + ENDIF() + ENDIF() +ELSE () + # Remove visibility flag for now as it breaks Ubuntu 18.05 and we need to + # fix our libraries anyway + STRING(REPLACE "-fvisibility=hidden" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) ENDIF() -OPTION(SECURITY_HARDENED "Use security-enhancing compiler features (stack protector, relro, etc)" ${security_default}) -OPTION(SECURITY_HARDENED_NEW "Use new security-enhancing compilier features" OFF) -IF(SECURITY_HARDENED) - # security-enhancing flags - MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC") - MY_CHECK_AND_SET_COMPILER_FLAG("-Wl,-z,relro,-z,now") - MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector --param=ssp-buffer-size=4") - MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO) - MY_CHECK_AND_SET_COMPILER_FLAG("-fexceptions") - IF(SECURITY_HARDENED_NEW) - MY_CHECK_AND_SET_COMPILER_FLAG("-mcet -fcf-protection") - MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector-strong") - MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-clash-protection") - ENDIF() -ENDIF() - SET (ENGINE_LDFLAGS "-Wl,--no-as-needed -Wl,--add-needed") - -SET (ENGINE_COMMON_LIBS messageqcpp loggingcpp configcpp idbboot ${Boost_LIBRARIES} xml2 pthread rt libmysql_client ${JEMALLOC_LIBRARIES}) +SET (ENGINE_COMMON_LIBS messageqcpp loggingcpp configcpp idbboot ${Boost_LIBRARIES} xml2 pthread rt libmysql_client) SET (ENGINE_OAM_LIBS oamcpp alarmmanager) SET (ENGINE_BRM_LIBS brm idbdatafile cacheutils rwlock ${ENGINE_OAM_LIBS} ${ENGINE_COMMON_LIBS}) SET (ENGINE_EXEC_LIBS joblist execplan windowfunction joiner rowgroup funcexp udfsdk regr dataconvert common compress querystats querytele thrift threadpool ${ENGINE_BRM_LIBS}) @@ -211,6 +211,8 @@ IF (SERVER_BUILD_INCLUDE_DIR) IF (NOT IS_ABSOLUTE ${SERVER_BUILD_INCLUDE_DIR}) SET (SERVER_BUILD_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${SERVER_BUILD_INCLUDE_DIR}) ENDIF() +ELSEIF (INSTALL_LAYOUT) + SET (SERVER_BUILD_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include) ELSE() SET (SERVER_BUILD_INCLUDE_DIR ${CMAKE_BINARY_DIR}/../include) ENDIF() @@ -219,6 +221,8 @@ IF (SERVER_SOURCE_ROOT_DIR) IF (NOT IS_ABSOLUTE ${SERVER_SOURCE_ROOT_DIR}) SET (SERVER_SOURCE_ROOT_DIR ${CMAKE_BINARY_DIR}/${SERVER_SOURCE_ROOT_DIR}) ENDIF() +ELSEIF (INSTALL_LAYOUT) + SET (SERVER_SOURCE_ROOT_DIR ${CMAKE_SOURCE_DIR}) ELSE() SET (SERVER_SOURCE_ROOT_DIR ${CMAKE_BINARY_DIR}/..) ENDIF() @@ -230,7 +234,11 @@ ENDIF() MESSAGE("SERVER_BUILD_INCLUDE_DIR = ${SERVER_BUILD_INCLUDE_DIR}") MESSAGE("SERVER_SOURCE_ROOT_DIR = ${SERVER_SOURCE_ROOT_DIR}") -SET (MARIADB_CLIENT_LIBS -L${SERVER_BUILD_INCLUDE_DIR}/../libmariadb/libmariadb/ libmariadb.so) +IF (INSTALL_LAYOUT) + SET (MARIADB_CLIENT_LIBS libmariadb) +ELSE() + SET (MARIADB_CLIENT_LIBS -L${SERVER_BUILD_INCLUDE_DIR}/../libmariadb/libmariadb/ libmariadb.so) +ENDIF() #SET (ENGINE_UTILS_BOOSTIDB_INCLUDE "{CMAKE_CURRENT_SOURCE_DIR}/utils/boost_idb") SET (ENGINE_UTILS_MESSAGEQCPP_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/utils/messageqcpp") @@ -271,12 +279,24 @@ SET (ENGINE_UTILS_LIBMYSQL_CL_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/utils/libmysq SET (ENGINE_WE_CONFIGCPP_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/writeengine/xml") SET (ENGINE_SERVER_SQL_INCLUDE "${SERVER_SOURCE_ROOT_DIR}/sql") SET (ENGINE_SERVER_INCLUDE_INCLUDE "${SERVER_SOURCE_ROOT_DIR}/include") -SET (ENGINE_SERVER_PCRE_INCLUDE "${SERVER_BUILD_INCLUDE_DIR}/../pcre") +IF (PCRE_INCLUDES) + SET (ENGINE_SERVER_PCRE_INCLUDE "${PCRE_INCLUDES}") +ELSE () + SET (ENGINE_SERVER_PCRE_INCLUDE "${SERVER_BUILD_INCLUDE_DIR}/../pcre") +ENDIF () SET (ENGINE_SERVER_WSREP_INCLUDE "${SERVER_SOURCE_ROOT_DIR}/wsrep-lib/include") SET (ENGINE_SERVER_WSREP_API_INCLUDE "${SERVER_SOURCE_ROOT_DIR}/wsrep-lib/wsrep-API/v26/") SET (ENGINE_UTILS_UDFSDK_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/utils/udfsdk") -SET (ENGINE_DEFAULT_INCLUDES ${CMAKE_BINARY_DIR} "." "../" "../../" ${SERVER_BUILD_INCLUDE_DIR}) +SET (ENGINE_DEFAULT_INCLUDES ${CMAKE_CURRENT_BINARY_DIR} "." "../" "../../" ${SERVER_BUILD_INCLUDE_DIR}) + +IF (MY_READLINE_INCLUDE_DIR) + SET (ENGINE_DEFAULT_INCLUDES ${ENGINE_DEFAULT_INCLUDES} ${MY_READLINE_INCLUDE_DIR}) + SET (ENGINE_READLINE_LIBRARY ${MY_READLINE_LIBRARY}) +ELSE () + SET (ENGINE_DEFAULT_INCLUDES ${ENGINE_DEFAULT_INCLUDES} "/usr/include/readline/") + SET (ENGINE_READLINE_LIBRARY "readline") +ENDIF () SET (ENGINE_COMMON_INCLUDES ${ENGINE_DEFAULT_INCLUDES} ${Boost_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} ${ENGINE_UTILS_MESSAGEQCPP_INCLUDE} ${ENGINE_WE_SHARED_INCLUDE} ${ENGINE_UTILS_IDBDATAFILE_INCLUDE} ${ENGINE_UTILS_LOGGINGCPP_INCLUDE} ${ENGINE_UTILS_CONFIGCPP_INCLUDE} ${ENGINE_UTILS_COMPRESS_INCLUDE} ${ENGINE_VERSIONING_BRM_INCLUDE} ${ENGINE_UTILS_ROWGROUP_INCLUDE} ${ENGINE_UTILS_COMMON_INCLUDE} ${ENGINE_UTILS_DATACONVERT_INCLUDE} ${ENGINE_UTILS_RWLOCK_INCLUDE} ${ENGINE_UTILS_FUNCEXP_INCLUDE} ${ENGINE_OAMAPPS_ALARMMANAGER_INCLUDE} ${ENGINE_UTILS_INCLUDE} ${ENGINE_OAM_OAMCPP_INCLUDE} ${ENGINE_DBCON_DDLPKGPROC_INCLUDE} ${ENGINE_DBCON_DDLPKG_INCLUDE} ${ENGINE_DBCON_EXECPLAN_INCLUDE} ${ENGINE_UTILS_STARTUP_INCLUDE} ${ENGINE_DBCON_JOBLIST_INCLUDE} ${ENGINE_WE_WRAPPER_INCLUDE} ${ENGINE_WE_SERVER_INCLUDE} ${ENGINE_DBCON_DMLPKG_INCLUDE} ${ENGINE_WE_CLIENT_INCLUDE} ${ENGINE_DBCON_DMLPKGPROC_INCLUDE} ${ENGINE_UTILS_CACHEUTILS_INCLUDE} ${ENGINE_UTILS_MYSQLCL_INCLUDE} ${ENGINE_UTILS_QUERYTELE_INCLUDE} ${ENGINE_UTILS_THRIFT_INCLUDE} ${ENGINE_UTILS_JOINER_INCLUDE} ${ENGINE_UTILS_THREADPOOL_INCLUDE} ${ENGINE_UTILS_BATCHLDR_INCLUDE} ${ENGINE_UTILS_DDLCLEANUP_INCLUDE} ${ENGINE_UTILS_QUERYSTATS_INCLUDE} ${ENGINE_WE_CONFIGCPP_INCLUDE} ${ENGINE_SERVER_SQL_INCLUDE} ${ENGINE_SERVER_INCLUDE_INCLUDE} ${ENGINE_SERVER_PCRE_INCLUDE} ${ENGINE_SERVER_WSREP_API_INCLUDE} ${ENGINE_SERVER_WSREP_INCLUDE} ${ENGINE_UTILS_UDFSDK_INCLUDE} ${ENGINE_UTILS_LIBMYSQL_CL_INCLUDE}) @@ -319,19 +339,67 @@ IF( WITH_SHARED_COMP_TESTS ) ADD_SUBDIRECTORY(writeengine/shared) ENDIF( WITH_SHARED_COMP_TESTS ) -exec_program("git" - ${CMAKE_CURRENT_SOURCE_DIR} - ARGS "describe --match=NeVeRmAtCh --always --dirty" - OUTPUT_VARIABLE GIT_VERSION) +find_package(Git QUIET) + +IF (GIT_FOUND AND EXISTS ${ENGINE_SRC_DIR}/.git) + exec_program("git" + ${CMAKE_CURRENT_SOURCE_DIR} + ARGS "describe --match=NeVeRmAtCh --always --dirty" + OUTPUT_VARIABLE GIT_VERSION) +ELSE () + SET(GIT_VERSION "source") +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 platform) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/build/releasenum DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-platform) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/columnstoreversion.h.in ${CMAKE_CURRENT_SOURCE_DIR}/columnstoreversion.h) -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.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 platform) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gitversionEngine DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-platform) -INCLUDE(cpackEngineRPM) -INCLUDE(cpackEngineDEB) +IF (INSTALL_LAYOUT) + # Do this or when MariaDB builds us we don't have GenError which is required for these + ADD_DEPENDENCIES(udf_mysql GenError) + 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) + SET(ignored + "%ignore ${CMAKE_INSTALL_PREFIX}" + "%ignore ${CMAKE_INSTALL_PREFIX}/local" + "%ignore ${CMAKE_INSTALL_PREFIX}/bin" + "%ignore ${CMAKE_INSTALL_PREFIX}/lib" + "%ignore ${CMAKE_INSTALL_PREFIX}/sbin" + "%ignore ${CMAKE_INSTALL_PREFIX}/lib64/mysql" + "%ignore ${CMAKE_INSTALL_PREFIX}/lib64/mysql/plugin" + "%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) + IF (EXISTS "/etc/SuSE-release") + file (READ "/etc/SuSE-release" SUSE_VERSION) + 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) + else () + SETA(CPACK_RPM_columnstore-platform_PACKAGE_REQUIRES "expect" "boost >= 1.53.0" "MariaDB-columnstore-libs" "snappy" "jemalloc" "net-tools" PARENT_SCOPE) + endif() + ENDIF () +ELSE () + # MariaDB has its own packaging routines + INCLUDE(cpackEngineRPM) + INCLUDE(cpackEngineDEB) +ENDIF () diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt deleted file mode 100644 index b28fab8b8..000000000 --- a/build/CMakeLists.txt +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright (C) 2006 MySQL AB -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -INCLUDE("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake") - -SET(CMAKE_CXX_FLAGS_DEBUG - "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi") -SET(CMAKE_C_FLAGS_DEBUG - "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi") -SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /MAP /MAPINFO:EXPORTS") - -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/extra/yassl/include - ${CMAKE_SOURCE_DIR}/sql - ${CMAKE_SOURCE_DIR}/regex - ${CMAKE_SOURCE_DIR}/zlib -) - -SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/sql_yacc.h - ${CMAKE_SOURCE_DIR}/sql/sql_yacc.cc - ${CMAKE_SOURCE_DIR}/include/mysql_version.h - ${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc - ${CMAKE_SOURCE_DIR}/sql/lex_hash.h - ${PROJECT_SOURCE_DIR}/include/mysqld_error.h - ${PROJECT_SOURCE_DIR}/include/mysqld_ername.h - ${PROJECT_SOURCE_DIR}/include/sql_state.h - PROPERTIES GENERATED 1) - -ADD_DEFINITIONS(-DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN -DHAVE_EVENT_SCHEDULER) - - -SET (SQL_SOURCE - ../sql-common/client.c derror.cc des_key_file.cc - discover.cc ../libmysql/errmsg.c field.cc field_conv.cc - filesort.cc gstream.cc - ha_partition.cc - handler.cc hash_filo.cc hash_filo.h - hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc - item_create.cc item_func.cc item_geofunc.cc item_row.cc - item_strfunc.cc item_subselect.cc item_sum.cc item_timefunc.cc - item_window_function.cc item_create_window_function.cc - key.cc log.cc lock.cc message.rc - log_event.cc rpl_record.cc rpl_reporting.cc - log_event_old.cc rpl_record_old.cc - message.h mf_iocache.cc my_decimal.cc ../sql-common/my_time.c - mysqld.cc net_serv.cc - nt_servc.cc nt_servc.h opt_range.cc opt_range.h opt_sum.cc - ../sql-common/pack.c parse_file.cc password.c procedure.cc - protocol.cc records.cc repl_failsafe.cc rpl_filter.cc set_var.cc - slave.cc sp.cc sp_cache.cc sp_head.cc sp_pcontext.cc - sp_rcontext.cc spatial.cc sql_acl.cc sql_analyse.cc sql_base.cc - sql_cache.cc sql_class.cc sql_client.cc sql_crypt.cc sql_crypt.h - sql_cursor.cc sql_db.cc sql_delete.cc sql_derived.cc sql_do.cc - sql_error.cc sql_handler.cc sql_help.cc sql_insert.cc sql_lex.cc - sql_list.cc sql_load.cc sql_manager.cc sql_map.cc sql_parse.cc - sql_partition.cc sql_plugin.cc sql_prepare.cc sql_rename.cc - sql_repl.cc sql_select.cc sql_show.cc sql_state.c sql_string.cc - sql_table.cc sql_test.cc sql_trigger.cc sql_udf.cc sql_union.cc - sql_update.cc sql_view.cc strfunc.cc table.cc thr_malloc.cc - time.cc tztime.cc uniques.cc unireg.cc item_xmlfunc.cc - rpl_tblmap.cc sql_binlog.cc event_scheduler.cc event_data_objects.cc - event_queue.cc event_db_repository.cc - sql_tablespace.cc events.cc ../sql-common/my_user.c - partition_info.cc rpl_utility.cc rpl_injector.cc sql_locale.cc - rpl_rli.cc rpl_mi.cc sql_servers.cc - sql_connect.cc scheduler.cc - sql_profile.cc event_parse_data.cc - ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc - ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h - ${PROJECT_SOURCE_DIR}/include/mysqld_error.h - ${PROJECT_SOURCE_DIR}/include/mysqld_ername.h - ${PROJECT_SOURCE_DIR}/include/sql_state.h - ${PROJECT_SOURCE_DIR}/include/mysql_version.h - ${PROJECT_SOURCE_DIR}/sql/sql_builtin.cc - ${PROJECT_SOURCE_DIR}/sql/lex_hash.h) -ADD_LIBRARY(sql ${SQL_SOURCE}) - -IF (NOT EXISTS cmake_dummy.cc) - FILE (WRITE cmake_dummy.cc "") -ENDIF (NOT EXISTS cmake_dummy.cc) -ADD_EXECUTABLE(mysqld cmake_dummy.cc) - -SET_TARGET_PROPERTIES(mysqld PROPERTIES OUTPUT_NAME mysqld${MYSQLD_EXE_SUFFIX}) -SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) - -SET (MYSQLD_CORE_LIBS mysys zlib dbug strings yassl taocrypt vio regex sql) -TARGET_LINK_LIBRARIES(mysqld ${MYSQLD_CORE_LIBS} ${MYSQLD_STATIC_ENGINE_LIBS}) -TARGET_LINK_LIBRARIES(mysqld ws2_32.lib) - - -IF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS) - # Set module definition file. Also use non-incremental linker, - # incremental appears to crash from time to time,if used with /DEF option - SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS "/DEF:mysqld.def /INCREMENTAL:NO") - - FOREACH (CORELIB ${MYSQLD_CORE_LIBS}) - GET_TARGET_PROPERTY(LOC ${CORELIB} LOCATION) - FILE(TO_NATIVE_PATH ${LOC} LOC) - SET (LIB_LOCATIONS ${LIB_LOCATIONS} ${LOC}) - ENDFOREACH (CORELIB ${MYSQLD_CORE_LIBS}) - - ADD_CUSTOM_COMMAND(TARGET mysqld PRE_LINK - COMMAND cscript ARGS //nologo ${PROJECT_SOURCE_DIR}/win/create_def_file.js - ${PLATFORM} ${LIB_LOCATIONS} > mysqld.def - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/sql) -ENDIF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS) - -ADD_DEPENDENCIES(sql GenError) - -# Sql Parser custom command -ADD_CUSTOM_COMMAND( - OUTPUT ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h - ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc - COMMAND bison ARGS -y -p MYSQL --defines=sql_yacc.h - --output=sql_yacc.cc sql_yacc.yy - DEPENDS ${PROJECT_SOURCE_DIR}/sql/sql_yacc.yy) - - -# Gen_lex_hash -ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) -TARGET_LINK_LIBRARIES(gen_lex_hash debug dbug mysqlclient wsock32) -GET_TARGET_PROPERTY(GEN_LEX_HASH_EXE gen_lex_hash LOCATION) -ADD_CUSTOM_COMMAND( - OUTPUT ${PROJECT_SOURCE_DIR}/sql/lex_hash.h - COMMAND ${GEN_LEX_HASH_EXE} ARGS > lex_hash.h - DEPENDS ${GEN_LEX_HASH_EXE}) - -ADD_CUSTOM_TARGET( - GenServerSource ALL - DEPENDS ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h - ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc - ${PROJECT_SOURCE_DIR}/sql/message.h - ${PROJECT_SOURCE_DIR}/sql/message.rc - ${PROJECT_SOURCE_DIR}/sql/lex_hash.h) - -ADD_DEPENDENCIES(mysqld GenServerSource) - -# Remove the auto-generated files as part of 'Clean Solution' -SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES - "lex_hash.h;sql_yacc.h;sql_yacc.cc;mysqld.def") - -ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def) -ADD_DEPENDENCIES(udf_example strings GenError) -TARGET_LINK_LIBRARIES(udf_example strings wsock32) diff --git a/cmake/FindJeMalloc.cmake b/cmake/FindJeMalloc.cmake deleted file mode 100644 index c97bb1b9f..000000000 --- a/cmake/FindJeMalloc.cmake +++ /dev/null @@ -1,44 +0,0 @@ -# - Try to find jemalloc headers and libraries. -# -# Usage of this module as follows: -# -# find_package(JeMalloc) -# -# Variables used by this module, they can change the default behaviour and need -# to be set before calling find_package: -# -# JEMALLOC_ROOT_DIR Set this variable to the root installation of -# jemalloc if the module has problems finding -# the proper installation path. -# -# Variables defined by this module: -# -# JEMALLOC_FOUND System has jemalloc libs/headers -# JEMALLOC_LIBRARIES The jemalloc library/libraries -# JEMALLOC_INCLUDE_DIR The location of jemalloc headers - -find_path(JEMALLOC_ROOT_DIR - NAMES include/jemalloc/jemalloc.h -) - -find_library(JEMALLOC_LIBRARIES - NAMES jemalloc - HINTS ${JEMALLOC_ROOT_DIR}/lib -) - -find_path(JEMALLOC_INCLUDE_DIR - NAMES jemalloc/jemalloc.h - HINTS ${JEMALLOC_ROOT_DIR}/include -) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(JeMalloc DEFAULT_MSG - JEMALLOC_LIBRARIES - JEMALLOC_INCLUDE_DIR -) - -mark_as_advanced( - JEMALLOC_ROOT_DIR - JEMALLOC_LIBRARIES - JEMALLOC_INCLUDE_DIR -) diff --git a/cmake/FindSnappy.cmake b/cmake/FindSnappy.cmake index 7ac14a271..6aaf92229 100644 --- a/cmake/FindSnappy.cmake +++ b/cmake/FindSnappy.cmake @@ -8,7 +8,7 @@ # to be set before calling find_package: # # SNAPPY_ROOT_DIR Set this variable to the root installation of -# jemalloc if the module has problems finding +# snappy if the module has problems finding # the proper installation path. # # Variables defined by this module: @@ -28,7 +28,7 @@ find_library(SNAPPY_LIBRARIES find_path(SNAPPY_INCLUDE_DIR NAMES snappy.h - HINTS ${JEMALLOC_ROOT_DIR}/include + HINTS ${SNAPPY_ROOT_DIR}/include ) include(FindPackageHandleStandardArgs) diff --git a/cmake/columnstore_version.cmake b/cmake/columnstore_version.cmake index e8d0c7c2d..571fba591 100644 --- a/cmake/columnstore_version.cmake +++ b/cmake/columnstore_version.cmake @@ -2,7 +2,7 @@ # Generate "something" to trigger cmake rerun when VERSION changes CONFIGURE_FILE( - ${CMAKE_SOURCE_DIR}/VERSION + ${ENGINE_SRC_DIR}/VERSION ${CMAKE_BINARY_DIR}/VERSION.dep ) @@ -10,7 +10,7 @@ CONFIGURE_FILE( MACRO(COLUMNSTORE_GET_CONFIG_VALUE keyword var) IF(NOT ${var}) - FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=") + FILE (STRINGS ${ENGINE_SRC_DIR}/VERSION str REGEX "^[ ]*${keyword}=") IF(str) STRING(REPLACE "${keyword}=" "" str ${str}) STRING(REGEX REPLACE "[ ].*" "" str "${str}") @@ -20,27 +20,29 @@ MACRO(COLUMNSTORE_GET_CONFIG_VALUE keyword var) ENDMACRO() MACRO(GET_COLUMNSTORE_VERSION) - COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_MAJOR" MAJOR_VERSION) - COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_MINOR" MINOR_VERSION) - COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_PATCH" PATCH_VERSION) - COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_EXTRA" EXTRA_VERSION) - COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_RELEASE" RELEASE_VERSION) + COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_MAJOR" CS_MAJOR_VERSION) + COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_MINOR" CS_MINOR_VERSION) + COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_PATCH" CS_PATCH_VERSION) + COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_EXTRA" CS_EXTRA_VERSION) + COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_RELEASE" CS_RELEASE_VERSION) -IF(NOT "${MAJOR_VERSION}" MATCHES "[0-9]+" OR - NOT "${MINOR_VERSION}" MATCHES "[0-9]+" OR - NOT "${PATCH_VERSION}" MATCHES "[0-9]+") +IF(NOT "${CS_MAJOR_VERSION}" MATCHES "[0-9]+" OR + NOT "${CS_MINOR_VERSION}" MATCHES "[0-9]+" OR + NOT "${CS_PATCH_VERSION}" MATCHES "[0-9]+") MESSAGE(FATAL_ERROR "VERSION file cannot be parsed.") ENDIF() - SET(VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}") + SET(VERSION "${CS_MAJOR_VERSION}.${CS_MINOR_VERSION}.${CS_PATCH_VERSION}${CS_EXTRA_VERSION}") MESSAGE(STATUS "MariaDB-Columnstore ${VERSION}") - SET(CPACK_PACKAGE_VERSION_MAJOR ${MAJOR_VERSION}) - SET(CPACK_PACKAGE_VERSION_MINOR ${MINOR_VERSION}) - SET(CPACK_PACKAGE_VERSION_PATCH ${PATCH_VERSION}${EXTRA_VERSION}) - SET(PACKAGE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}") - SET(PACKAGE_RELEASE "${RELEASE_VERSION}") + IF (NOT INSTALL_LAYOUT) + SET(CPACK_PACKAGE_VERSION_MAJOR ${CS_MAJOR_VERSION}) + SET(CPACK_PACKAGE_VERSION_MINOR ${CS_MINOR_VERSION}) + SET(CPACK_PACKAGE_VERSION_PATCH ${CS_PATCH_VERSION}${CS_EXTRA_VERSION}) + ENDIF () + SET(PACKAGE_VERSION "${CS_MAJOR_VERSION}.${CS_MINOR_VERSION}.${CS_PATCH_VERSION}${CS_EXTRA_VERSION}") + SET(PACKAGE_RELEASE "${CS_RELEASE_VERSION}") ENDMACRO() # Get columnstore version -GET_COLUMNSTORE_VERSION() \ No newline at end of file +GET_COLUMNSTORE_VERSION() diff --git a/cmake/cpackEngineDEB.cmake b/cmake/cpackEngineDEB.cmake index 4cae76f6a..9b59b4b4b 100644 --- a/cmake/cpackEngineDEB.cmake +++ b/cmake/cpackEngineDEB.cmake @@ -11,9 +11,9 @@ 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 platform libs storage-engine) +SET(CPACK_COMPONENTS_ALL columnstore-platform columnstore-libs columnstore-engine) -SET(CPACK_PACKAGE_NAME "mariadb-columnstore") +SET(CPACK_PACKAGE_NAME "MariaDB") SET(ENGINE_ARCH "amd64") IF (NOT CPACK_DEBIAN_PACKAGE_VERSION) @@ -54,9 +54,9 @@ SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_DESCRIPTION "MariaDB Columnstore connect 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-storage-engine") +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) if (EXISTS "/etc/debian_version") @@ -65,14 +65,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, mariadb-columnstore-server, libsnappy1, libjemalloc1") + 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") 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, mariadb-columnstore-server, libsnappy1v5, libreadline5, libjemalloc1") + 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") else() SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, 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_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;" ) diff --git a/cmake/cpackEngineRPM.cmake b/cmake/cpackEngineRPM.cmake index 5f95cb8c6..ac1a88569 100644 --- a/cmake/cpackEngineRPM.cmake +++ b/cmake/cpackEngineRPM.cmake @@ -8,9 +8,9 @@ SET(CPACK_PACKAGING_INSTALL_PREFIX ${INSTALL_ENGINE}) SET(CPACK_RPM_COMPONENT_INSTALL ON) -SET(CPACK_COMPONENTS_ALL platform libs storage-engine) +SET(CPACK_COMPONENTS_ALL columnstore-platform columnstore-libs columnstore-engine) -SET(CPACK_PACKAGE_NAME "mariadb-columnstore") +SET(CPACK_PACKAGE_NAME "MariaDB") SET(ENGINE_ARCH "x86_64") IF (NOT CPACK_RPM_PACKAGE_VERSION) @@ -68,9 +68,9 @@ MACRO(SETA var) ENDFOREACH() ENDMACRO(SETA) -SETA(CPACK_RPM_libs_PACKAGE_PROVIDES "mariadb-columnstore-libs") -SETA(CPACK_RPM_platform_PACKAGE_PROVIDES "mariadb-columnstore-platform") -SETA(CPACK_RPM_storage-engine_PACKAGE_PROVIDES "mariadb-columnstore-storage-engine") +SETA(CPACK_RPM_libs_PACKAGE_PROVIDES "MariaDB-columnstore-libs") +SETA(CPACK_RPM_platform_PACKAGE_PROVIDES "MariaDB-columnstore-platform") +SETA(CPACK_RPM_storage-engine_PACKAGE_PROVIDES "MariaDB-columnstore-engine") #boost is a source build in CentOS 6 so don't require it as a package @@ -87,16 +87,16 @@ 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") + SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "MariaDB-columnstore-libs" "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") + SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "boost-devel >= 1.54.0" "MariaDB-columnstore-libs" "libsnappy1" "jemalloc" "net-tools") else () - SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "boost >= 1.53.0" "mariadb-columnstore-libs" "snappy" "jemalloc") + SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "boost >= 1.53.0" "MariaDB-columnstore-libs" "snappy" "jemalloc" "net-tools") endif() -SETA(CPACK_RPM_storage-engine_PACKAGE_REQUIRES "mariadb-columnstore-libs") +SETA(CPACK_RPM_storage-engine_PACKAGE_REQUIRES "MariaDB-columnstore-libs") SET(CPACK_RPM_platform_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postInstall_platform.sh) SET(CPACK_RPM_libs_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postInstall_libs.sh) diff --git a/columnstoreversion.h.in b/columnstoreversion.h.in index 2746bd60c..c0b557ff2 100644 --- a/columnstoreversion.h.in +++ b/columnstoreversion.h.in @@ -1,7 +1,7 @@ #ifndef VERSIONNUMBER_H_ #define VERSIONNUMBER_H_ #include -const std::string columnstore_version("${VERSION}"); +const std::string columnstore_version("${PACKAGE_VERSION}"); const std::string columnstore_release("${PACKAGE_RELEASE}"); const std::string columnstore_commit_hash("${GIT_VERSION}"); #endif diff --git a/dbcon/ddlpackage/CMakeLists.txt b/dbcon/ddlpackage/CMakeLists.txt index 8bdc68b1e..4e95ff073 100644 --- a/dbcon/ddlpackage/CMakeLists.txt +++ b/dbcon/ddlpackage/CMakeLists.txt @@ -35,7 +35,5 @@ ADD_LIBRARY(ddlpackage SHARED ${CMAKE_CURRENT_SOURCE_DIR}/ddl-scan.cpp ) -SET_TARGET_PROPERTIES(ddlpackage PROPERTIES VERSION 1.0.0 SOVERSION 1) - -INSTALL(TARGETS ddlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +INSTALL(TARGETS ddlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/dbcon/ddlpackageproc/CMakeLists.txt b/dbcon/ddlpackageproc/CMakeLists.txt index 31e6af0a8..e23091615 100644 --- a/dbcon/ddlpackageproc/CMakeLists.txt +++ b/dbcon/ddlpackageproc/CMakeLists.txt @@ -16,7 +16,5 @@ add_library(ddlpackageproc SHARED ${ddlpackageproc_LIB_SRCS}) target_link_libraries(ddlpackageproc ${NETSNMP_LIBRARIES}) -set_target_properties(ddlpackageproc PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS ddlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS ddlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/dbcon/dmlpackage/CMakeLists.txt b/dbcon/dmlpackage/CMakeLists.txt index 4e711c967..b54bbc822 100644 --- a/dbcon/dmlpackage/CMakeLists.txt +++ b/dbcon/dmlpackage/CMakeLists.txt @@ -37,7 +37,5 @@ ADD_LIBRARY(dmlpackage SHARED ) -SET_TARGET_PROPERTIES(dmlpackage PROPERTIES VERSION 1.0.0 SOVERSION 1) - -INSTALL(TARGETS dmlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +INSTALL(TARGETS dmlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/dbcon/dmlpackageproc/CMakeLists.txt b/dbcon/dmlpackageproc/CMakeLists.txt index 3bede4ee9..f63db5522 100644 --- a/dbcon/dmlpackageproc/CMakeLists.txt +++ b/dbcon/dmlpackageproc/CMakeLists.txt @@ -17,8 +17,6 @@ add_library(dmlpackageproc SHARED ${dmlpackageproc_LIB_SRCS}) target_link_libraries(dmlpackageproc ${NETSNMP_LIBRARIES}) -set_target_properties(dmlpackageproc PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS dmlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS dmlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/dbcon/execplan/CMakeLists.txt b/dbcon/execplan/CMakeLists.txt index eb354691b..a038384cc 100755 --- a/dbcon/execplan/CMakeLists.txt +++ b/dbcon/execplan/CMakeLists.txt @@ -48,7 +48,5 @@ add_library(execplan SHARED ${execplan_LIB_SRCS}) target_link_libraries(execplan ${NETSNMP_LIBRARIES}) -set_target_properties(execplan PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS execplan DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS execplan DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/dbcon/joblist/CMakeLists.txt b/dbcon/joblist/CMakeLists.txt index c450b61af..072194795 100644 --- a/dbcon/joblist/CMakeLists.txt +++ b/dbcon/joblist/CMakeLists.txt @@ -59,13 +59,11 @@ set(joblist_LIB_SRCS add_library(joblist SHARED ${joblist_LIB_SRCS}) -set_target_properties(joblist PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS joblist DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS joblist DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) 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 platform) + install(TARGETS job_orderby_tests DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) endif() diff --git a/dbcon/joblist/expressionstep.cpp b/dbcon/joblist/expressionstep.cpp index f8020a6c9..e5d656936 100644 --- a/dbcon/joblist/expressionstep.cpp +++ b/dbcon/joblist/expressionstep.cpp @@ -509,7 +509,7 @@ void ExpressionStep::updateInputIndex(map& indexMap, const J CalpontSystemCatalog::OID oid = sc->oid(); CalpontSystemCatalog::OID dictOid = 0; CalpontSystemCatalog::ColType ct; - uint32_t key = fColumnKeys[distance(fColumns.begin(), it)]; + uint32_t key = fColumnKeys[std::distance(fColumns.begin(), it)]; if (sc->schemaName().empty()) { diff --git a/dbcon/joblist/groupconcat.cpp b/dbcon/joblist/groupconcat.cpp index 283a73090..7f832946e 100644 --- a/dbcon/joblist/groupconcat.cpp +++ b/dbcon/joblist/groupconcat.cpp @@ -263,7 +263,7 @@ void GroupConcatInfo::mapColumns(const RowGroup& projRG) } else { - idx = distance(keys.begin(), i3); + idx = std::distance(keys.begin(), i3); } (*k)->fOrderCond.push_back(make_pair(idx, i2->second)); diff --git a/dbcon/joblist/jlf_tuplejoblist.cpp b/dbcon/joblist/jlf_tuplejoblist.cpp index 713703ae8..dbcba47ea 100644 --- a/dbcon/joblist/jlf_tuplejoblist.cpp +++ b/dbcon/joblist/jlf_tuplejoblist.cpp @@ -1007,12 +1007,12 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo) unsigned itInc = 1; // iterator increase number unsigned numOfStepsAddToBps = 0; // # steps to be added into TBPS - if ((distance(it, end) > 2 && + if ((std::distance(it, end) > 2 && dynamic_cast(it->get()) != NULL && (dynamic_cast((it + 1)->get()) != NULL || dynamic_cast((it + 1)->get()) != NULL) && dynamic_cast((it + 2)->get()) != NULL) || - (distance(it, end) > 1 && + (std::distance(it, end) > 1 && dynamic_cast(it->get()) != NULL && dynamic_cast((it + 1)->get()) != NULL)) { @@ -1053,7 +1053,7 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo) itInc = 1; numOfStepsAddToBps = 0; } - else if (distance(begin, it) > 1 && + else if (std::distance(begin, it) > 1 && (dynamic_cast((it - 1)->get()) != NULL || dynamic_cast((it - 2)->get()) != NULL) && dynamic_cast(it->get()) != NULL) @@ -1062,14 +1062,14 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo) itInc = 1; numOfStepsAddToBps = 0; } - else if (distance(it, end) > 2 && + else if (std::distance(it, end) > 2 && dynamic_cast((it + 1)->get()) != NULL && dynamic_cast((it + 2)->get()) != NULL) { itInc = 3; numOfStepsAddToBps = 3; } - else if (distance(it, end) > 3 && + else if (std::distance(it, end) > 3 && dynamic_cast((it + 1)->get()) != NULL && dynamic_cast((it + 2)->get()) != NULL && dynamic_cast((it + 3)->get()) != NULL) @@ -1077,7 +1077,7 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo) itInc = 4; numOfStepsAddToBps = 4; } - else if (distance(it, end) > 3 && + else if (std::distance(it, end) > 3 && dynamic_cast((it + 1)->get()) != NULL && dynamic_cast((it + 2)->get()) != NULL && dynamic_cast((it + 3)->get()) != NULL) @@ -1085,7 +1085,7 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo) itInc = 4; numOfStepsAddToBps = 4; } - else if (distance(it, end) > 4 && + else if (std::distance(it, end) > 4 && dynamic_cast((it + 1)->get()) != NULL && dynamic_cast((it + 2)->get()) != NULL && dynamic_cast((it + 3)->get()) != NULL && @@ -1094,7 +1094,7 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo) itInc = 5; numOfStepsAddToBps = 5; } - else if (distance(it, end) > 1 && + else if (std::distance(it, end) > 1 && (dynamic_cast(it->get()) != NULL || dynamic_cast(it->get()) != NULL) && dynamic_cast((it + 1)->get()) != NULL) @@ -2060,7 +2060,7 @@ uint32_t getKeyIndex(uint32_t key, const RowGroup& rg) if (i == rg.getKeys().end()) throw runtime_error("No key found."); - return distance(rg.getKeys().begin(), i); + return std::distance(rg.getKeys().begin(), i); } diff --git a/dbcon/joblist/joblistfactory.cpp b/dbcon/joblist/joblistfactory.cpp index b087c54ac..392387d4b 100644 --- a/dbcon/joblist/joblistfactory.cpp +++ b/dbcon/joblist/joblistfactory.cpp @@ -1110,11 +1110,11 @@ const JobStepVector doAggProject(const CalpontSelectExecutionPlan* csep, JobInfo else it = pcv.insert(pcv.end(), srcp); - projectKeys.insert(projectKeys.begin() + distance(pcv.begin(), it), tupleKey); + projectKeys.insert(projectKeys.begin() + std::distance(pcv.begin(), it), tupleKey); } else if (doDistinct) // @bug4250, move forward distinct column if necessary. { - uint32_t pos = distance(projectKeys.begin(), keyIt); + uint32_t pos = std::distance(projectKeys.begin(), keyIt); if (pos >= lastGroupByPos) { @@ -1263,11 +1263,11 @@ const JobStepVector doAggProject(const CalpontSelectExecutionPlan* csep, JobInfo else it = pcv.insert(pcv.end(), srcp); - projectKeys.insert(projectKeys.begin() + distance(pcv.begin(), it), tupleKey); + projectKeys.insert(projectKeys.begin() + std::distance(pcv.begin(), it), tupleKey); } else if (doDistinct) // @bug4250, move forward distinct column if necessary. { - uint32_t pos = distance(projectKeys.begin(), keyIt); + uint32_t pos = std::distance(projectKeys.begin(), keyIt); if (pos >= lastGroupByPos) { @@ -1392,7 +1392,7 @@ void changePcolStepToPcolScan(JobStepVector::iterator& it, JobStepVector::iterat { //If we have a pDictionaryScan-pColStep duo, then change the pColStep if (typeid(*(it->get())) == typeid(pDictionaryScan) && - distance(it, end) > 1 && + std::distance(it, end) > 1 && typeid(*((it + 1)->get())) == typeid(pColStep)) { ++it; diff --git a/dbcon/joblist/windowfunctionstep.cpp b/dbcon/joblist/windowfunctionstep.cpp index c09224899..ab1acd1fe 100755 --- a/dbcon/joblist/windowfunctionstep.cpp +++ b/dbcon/joblist/windowfunctionstep.cpp @@ -1647,8 +1647,8 @@ void WindowFunctionStep::sort(std::vector::iterator v, uint64_t n) } } - sort(v, distance(v, h) + 1); - sort(l, distance(l, v) + n); + sort(v, std::distance(v, h) + 1); + sort(l, std::distance(l, v) + n); } diff --git a/dbcon/mysql/CMakeLists.txt b/dbcon/mysql/CMakeLists.txt index d99c75d9f..6a06ad703 100644 --- a/dbcon/mysql/CMakeLists.txt +++ b/dbcon/mysql/CMakeLists.txt @@ -23,96 +23,37 @@ SET ( libcalmysql_SRCS ha_view.cpp sm.cpp ha_window_function.cpp ha_mcs_partition.cpp - ha_pseudocolumn.cpp) + ha_pseudocolumn.cpp + is_columnstore_tables.cpp + is_columnstore_columns.cpp + is_columnstore_files.cpp + is_columnstore_extents.cpp) add_definitions(-DMYSQL_DYNAMIC_PLUGIN) set_source_files_properties(ha_mcs.cpp PROPERTIES COMPILE_FLAGS "-fno-implicit-templates") -add_library(calmysql SHARED ${libcalmysql_SRCS}) +if (COMMAND mysql_add_plugin) + mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY DEFAULT + LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool + COMPONENT columnstore-engine) +else () + add_library(ha_columnstore SHARED ${libcalmysql_SRCS}) + SET_TARGET_PROPERTIES(ha_columnstore PROPERTIES PREFIX "") -target_link_libraries(calmysql ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool) + target_link_libraries(ha_columnstore ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool) -set_target_properties(calmysql PROPERTIES VERSION 1.0.0 SOVERSION 1) - -SET ( is_columnstore_tables_SRCS - is_columnstore_tables.cpp - sm.cpp - ) -add_library(is_columnstore_tables SHARED ${is_columnstore_tables_SRCS}) - -target_link_libraries(is_columnstore_tables ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool) - -# Don't prepend .so file with 'lib' -set_target_properties(is_columnstore_tables PROPERTIES PREFIX "") -set_target_properties(is_columnstore_tables PROPERTIES VERSION 1.0.0 SOVERSION 1) - -SET ( is_columnstore_columns_SRCS - is_columnstore_columns.cpp - sm.cpp - ) -add_library(is_columnstore_columns SHARED ${is_columnstore_columns_SRCS}) - -target_link_libraries(is_columnstore_columns ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool) - -# Don't prepend .so file with 'lib' -set_target_properties(is_columnstore_columns PROPERTIES PREFIX "") -set_target_properties(is_columnstore_columns PROPERTIES VERSION 1.0.0 SOVERSION 1) - -SET ( is_columnstore_extents_SRCS - is_columnstore_extents.cpp - sm.cpp - ) -add_library(is_columnstore_extents SHARED ${is_columnstore_extents_SRCS}) - -target_link_libraries(is_columnstore_extents ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool) - -# Don't prepend .so file with 'lib' -set_target_properties(is_columnstore_extents PROPERTIES PREFIX "") -set_target_properties(is_columnstore_extents PROPERTIES VERSION 1.0.0 SOVERSION 1) - -SET ( is_columnstore_files_SRCS - is_columnstore_files.cpp - sm.cpp - ) -add_library(is_columnstore_files SHARED ${is_columnstore_files_SRCS}) - -target_link_libraries(is_columnstore_files ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool) - -# Don't prepend .so file with 'lib' -set_target_properties(is_columnstore_files PROPERTIES PREFIX "") -set_target_properties(is_columnstore_files PROPERTIES VERSION 1.0.0 SOVERSION 1) - - -install(TARGETS calmysql is_columnstore_tables is_columnstore_columns is_columnstore_extents is_columnstore_files DESTINATION ${MARIADB_PLUGINDIR} COMPONENT storage-engine) + install(TARGETS ha_columnstore DESTINATION ${MARIADB_PLUGINDIR} COMPONENT columnstore-engine) +endif () install(FILES syscatalog_mysql.sql dumpcat_mysql.sql calsetuserpriority.sql calremoveuserpriority.sql calshowprocesslist.sql columnstore_info.sql - DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT storage-engine) + DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-engine) install(PROGRAMS install_mcs_mysql.sh mysql-Columnstore - DESTINATION ${ENGINE_SBINDIR} COMPONENT storage-engine) + DESTINATION ${ENGINE_SBINDIR} COMPONENT columnstore-engine) install(FILES columnstore.cnf - DESTINATION ${MARIADB_MYCNFDIR} COMPONENT storage-engine) - - -#AM_CPPFLAGS = $(idb_common_includes) $(idb_cppflags) -#AM_CFLAGS = $(idb_cflags) -#AM_CXXFLAGS = $(idb_cxxflags) -#AM_LDFLAGS = $(idb_ldflags) -#lib_LTLIBRARIES = libcalmysql.la -#libcalmysql_la_SOURCES = ha_mcs.cpp ha_mcs_impl.cpp ha_mcs_dml.cpp ha_mcs_ddl.cpp ha_mcs_execplan.cpp ha_scalar_sub.cpp ha_in_sub.cpp ha_exists_sub.cpp ha_from_sub.cpp ha_select_sub.cpp ha_view.cpp sm.cpp ha_window_function.cpp ha_mcs_partition.cpp ha_pseudocolumn.cpp -#libcalmysql_la_LDFLAGS = -version-info 1:0:0 $(idb_common_ldflags) $(idb_common_libs) $(idb_write_libs) $(AM_LDFLAGS) -#libcalmysql_la_CPPFLAGS = -I/usr/include/libxml2 -I../../../mysql/include -I../../../mysql/sql -I../../../mysql/regex -DMYSQL_DYNAMIC_PLUGIN $(AM_CPPFLAGS) -#include_HEADERS = idb_mysql.h -# -#dist_mysql_DATA = syscatalog_mysql.sql dumpcat_mysql.sql calsetuserpriority.sql calremoveuserpriority.sql calshowprocesslist.sql my.cnf -#dist_mysql_SCRIPTS = install_mcs_mysql.sh mysql-Columnstore dumpcat.pl -# -#libcalmysql_la-ha_mcs.lo: ha_mcs.cpp -# if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcalmysql_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -fno-rtti -fno-implicit-templates -MT libcalmysql_la-ha_mcs.lo -MD -MP -MF "$(DEPDIR)/libcalmysql_la-ha_mcs.Tpo" -c -o libcalmysql_la-ha_mcs.lo `test -f 'ha_mcs.cpp' || echo '$(srcdir)/'`ha_mcs.cpp; \ -# then mv -f "$(DEPDIR)/libcalmysql_la-ha_mcs.Tpo" "$(DEPDIR)/libcalmysql_la-ha_mcs.Plo"; else rm -f "$(DEPDIR)/libcalmysql_la-ha_mcs.Tpo"; exit 1; fi - + DESTINATION ${MARIADB_MYCNFDIR} COMPONENT columnstore-engine) diff --git a/dbcon/mysql/columnstore.cnf b/dbcon/mysql/columnstore.cnf index 7c551d355..24e43cef3 100644 --- a/dbcon/mysql/columnstore.cnf +++ b/dbcon/mysql/columnstore.cnf @@ -39,8 +39,4 @@ server-id = 1 lower_case_table_names=1 -plugin-load-add=libcalmysql.so -plugin-load-add=is_columnstore_tables.so -plugin-load-add=is_columnstore_columns.so -plugin-load-add=is_columnstore_extents.so -plugin-load-add=is_columnstore_files.so +plugin-load-add=ha_columnstore.so diff --git a/dbcon/mysql/ha_mcs.cpp b/dbcon/mysql/ha_mcs.cpp index d501140f5..76932b545 100644 --- a/dbcon/mysql/ha_mcs.cpp +++ b/dbcon/mysql/ha_mcs.cpp @@ -23,6 +23,7 @@ #include "ha_mcs_pushdown.h" #define NEED_CALPONT_EXTERNS #include "ha_mcs_impl.h" +#include "is_columnstore.h" static handler* calpont_create_handler(handlerton* hton, TABLE_SHARE* table, @@ -911,6 +912,10 @@ const COND* ha_mcs::cond_push(const COND* cond) struct st_mysql_storage_engine columnstore_storage_engine = { MYSQL_HANDLERTON_INTERFACE_VERSION }; +static struct st_mysql_information_schema is_columnstore_plugin_version = +{ MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION }; + + mysql_declare_plugin(columnstore) { MYSQL_STORAGE_ENGINE_PLUGIN, @@ -943,6 +948,70 @@ maria_declare_plugin(columnstore) mcs_system_variables, /* system variables */ "1.0", /* string version */ MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ +}, +{ + MYSQL_INFORMATION_SCHEMA_PLUGIN, + &is_columnstore_plugin_version, + "COLUMNSTORE_COLUMNS", + "MariaDB Corporation", + "An information schema plugin to list ColumnStore columns", + PLUGIN_LICENSE_GPL, + is_columnstore_columns_plugin_init, + //is_columnstore_tables_plugin_deinit, + NULL, + 0x0100, + NULL, + NULL, + "1.0", + MariaDB_PLUGIN_MATURITY_STABLE +}, +{ + MYSQL_INFORMATION_SCHEMA_PLUGIN, + &is_columnstore_plugin_version, + "COLUMNSTORE_TABLES", + "MariaDB Corporation", + "An information schema plugin to list ColumnStore tables", + PLUGIN_LICENSE_GPL, + is_columnstore_tables_plugin_init, + //is_columnstore_tables_plugin_deinit, + NULL, + 0x0100, + NULL, + NULL, + "1.0", + MariaDB_PLUGIN_MATURITY_STABLE +}, +{ + MYSQL_INFORMATION_SCHEMA_PLUGIN, + &is_columnstore_plugin_version, + "COLUMNSTORE_FILES", + "MariaDB Corporation", + "An information schema plugin to list ColumnStore filess", + PLUGIN_LICENSE_GPL, + is_columnstore_files_plugin_init, + //is_columnstore_files_plugin_deinit, + NULL, + 0x0100, + NULL, + NULL, + "1.0", + MariaDB_PLUGIN_MATURITY_STABLE +}, +{ + MYSQL_INFORMATION_SCHEMA_PLUGIN, + &is_columnstore_plugin_version, + "COLUMNSTORE_EXTENTS", + "MariaDB Corporation", + "An information schema plugin to list ColumnStore extents", + PLUGIN_LICENSE_GPL, + is_columnstore_extents_plugin_init, + //is_columnstore_extents_plugin_deinit, + NULL, + 0x0100, + NULL, + NULL, + "1.0", + MariaDB_PLUGIN_MATURITY_STABLE } maria_declare_plugin_end; diff --git a/dbcon/mysql/install_mcs_mysql.sh.in b/dbcon/mysql/install_mcs_mysql.sh.in index f677b92ae..6449279e1 100755 --- a/dbcon/mysql/install_mcs_mysql.sh.in +++ b/dbcon/mysql/install_mcs_mysql.sh.in @@ -17,31 +17,31 @@ for arg in "$@"; do done mysql --force --user=root mysql 2> ${tmpdir}/mysql_install.log <fields_info = is_columnstore_columns_fields; @@ -268,26 +269,3 @@ static int is_columnstore_columns_plugin_init(void* p) return 0; } -static struct st_mysql_information_schema is_columnstore_columns_plugin_version = -{ MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION }; - -maria_declare_plugin(is_columnstore_columns_plugin) -{ - MYSQL_INFORMATION_SCHEMA_PLUGIN, - &is_columnstore_columns_plugin_version, - "COLUMNSTORE_COLUMNS", - "MariaDB Corporation", - "An information schema plugin to list ColumnStore columns", - PLUGIN_LICENSE_GPL, - is_columnstore_columns_plugin_init, - //is_columnstore_tables_plugin_deinit, - NULL, - 0x0100, - NULL, - NULL, - "1.0", - MariaDB_PLUGIN_MATURITY_STABLE -} -maria_declare_plugin_end; - - diff --git a/dbcon/mysql/is_columnstore_extents.cpp b/dbcon/mysql/is_columnstore_extents.cpp index 99aa43eba..cb8044806 100644 --- a/dbcon/mysql/is_columnstore_extents.cpp +++ b/dbcon/mysql/is_columnstore_extents.cpp @@ -26,7 +26,7 @@ #include "dbrm.h" #include "objectidmanager.h" - +#include "is_columnstore.h" // Required declaration as it isn't in a MairaDB include bool schema_table_store_record(THD* thd, TABLE* table); @@ -278,34 +278,10 @@ static int is_columnstore_extents_fill(THD* thd, TABLE_LIST* tables, COND* cond) return 0; } -static int is_columnstore_extents_plugin_init(void* p) +int is_columnstore_extents_plugin_init(void* p) { ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p; schema->fields_info = is_columnstore_extents_fields; schema->fill_table = is_columnstore_extents_fill; return 0; } - -static struct st_mysql_information_schema is_columnstore_extents_plugin_version = -{ MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION }; - -maria_declare_plugin(is_columnstore_extents_plugin) -{ - MYSQL_INFORMATION_SCHEMA_PLUGIN, - &is_columnstore_extents_plugin_version, - "COLUMNSTORE_EXTENTS", - "MariaDB Corporation", - "An information schema plugin to list ColumnStore extents", - PLUGIN_LICENSE_GPL, - is_columnstore_extents_plugin_init, - //is_columnstore_extents_plugin_deinit, - NULL, - 0x0100, - NULL, - NULL, - "1.0", - MariaDB_PLUGIN_MATURITY_STABLE -} -maria_declare_plugin_end; - - diff --git a/dbcon/mysql/is_columnstore_files.cpp b/dbcon/mysql/is_columnstore_files.cpp index 378985303..429b5c650 100644 --- a/dbcon/mysql/is_columnstore_files.cpp +++ b/dbcon/mysql/is_columnstore_files.cpp @@ -35,6 +35,7 @@ #include "messagequeue.h" #include "messagequeuepool.h" #include "we_messages.h" +#include "is_columnstore.h" // Required declaration as it isn't in a MairaDB include bool schema_table_store_record(THD* thd, TABLE* table); @@ -289,7 +290,7 @@ static int is_columnstore_files_fill(THD* thd, TABLE_LIST* tables, COND* cond) return 0; } -static int is_columnstore_files_plugin_init(void* p) +int is_columnstore_files_plugin_init(void* p) { ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p; schema->fields_info = is_columnstore_files_fields; @@ -297,24 +298,3 @@ static int is_columnstore_files_plugin_init(void* p) return 0; } -static struct st_mysql_information_schema is_columnstore_files_plugin_version = -{ MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION }; - -maria_declare_plugin(is_columnstore_files_plugin) -{ - MYSQL_INFORMATION_SCHEMA_PLUGIN, - &is_columnstore_files_plugin_version, - "COLUMNSTORE_FILES", - "MariaDB Corporation", - "An information schema plugin to list ColumnStore filess", - PLUGIN_LICENSE_GPL, - is_columnstore_files_plugin_init, - //is_columnstore_files_plugin_deinit, - NULL, - 0x0100, - NULL, - NULL, - "1.0", - MariaDB_PLUGIN_MATURITY_STABLE -} -maria_declare_plugin_end; diff --git a/dbcon/mysql/is_columnstore_tables.cpp b/dbcon/mysql/is_columnstore_tables.cpp index 1f66308f7..711d80da5 100644 --- a/dbcon/mysql/is_columnstore_tables.cpp +++ b/dbcon/mysql/is_columnstore_tables.cpp @@ -26,7 +26,7 @@ #include #include "calpontsystemcatalog.h" #include "dataconvert.h" - +#include "is_columnstore.h" // Required declaration as it isn't in a MairaDB include bool schema_table_store_record(THD* thd, TABLE* table); @@ -158,7 +158,7 @@ static int is_columnstore_tables_fill(THD* thd, TABLE_LIST* tables, COND* cond) return 0; } -static int is_columnstore_tables_plugin_init(void* p) +int is_columnstore_tables_plugin_init(void* p) { ST_SCHEMA_TABLE* schema = (ST_SCHEMA_TABLE*) p; schema->fields_info = is_columnstore_tables_fields; @@ -166,26 +166,3 @@ static int is_columnstore_tables_plugin_init(void* p) return 0; } -static struct st_mysql_information_schema is_columnstore_tables_plugin_version = -{ MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION }; - -maria_declare_plugin(is_columnstore_tables_plugin) -{ - MYSQL_INFORMATION_SCHEMA_PLUGIN, - &is_columnstore_tables_plugin_version, - "COLUMNSTORE_TABLES", - "MariaDB Corporation", - "An information schema plugin to list ColumnStore tables", - PLUGIN_LICENSE_GPL, - is_columnstore_tables_plugin_init, - //is_columnstore_tables_plugin_deinit, - NULL, - 0x0100, - NULL, - NULL, - "1.0", - MariaDB_PLUGIN_MATURITY_STABLE -} -maria_declare_plugin_end; - - diff --git a/dbcon/mysql/libcalmysql.rc b/dbcon/mysql/libcalmysql.rc deleted file mode 100644 index 46f9a0701..000000000 --- a/dbcon/mysql/libcalmysql.rc +++ /dev/null @@ -1,102 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,6,0,0 - PRODUCTVERSION 4,6,0,0 - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "InfiniDB, Inc." - VALUE "FileDescription", "InfiniDB MySQL Connector API" - VALUE "FileVersion", "4.6.0-0" - VALUE "InternalName", "libcalmysql" - VALUE "LegalCopyright", "Copyright (C) 2014" - VALUE "OriginalFilename", "libcalmysql.dll" - VALUE "ProductName", "InfiniDB" - VALUE "ProductVersion", "4.6.0.0 Beta" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/dbcon/mysql/resource.h b/dbcon/mysql/resource.h deleted file mode 100644 index c692fe412..000000000 --- a/dbcon/mysql/resource.h +++ /dev/null @@ -1,14 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by libcalmysql.rc - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/ddlproc/CMakeLists.txt b/ddlproc/CMakeLists.txt index 222313a69..80703b77b 100644 --- a/ddlproc/CMakeLists.txt +++ b/ddlproc/CMakeLists.txt @@ -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 platform) +install(TARGETS DDLProc DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/dmlproc/CMakeLists.txt b/dmlproc/CMakeLists.txt index fece5b614..267b9aee7 100644 --- a/dmlproc/CMakeLists.txt +++ b/dmlproc/CMakeLists.txt @@ -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 platform) +install(TARGETS DMLProc DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/exemgr/CMakeLists.txt b/exemgr/CMakeLists.txt index 4c8e7b65c..ae4ca54b4 100644 --- a/exemgr/CMakeLists.txt +++ b/exemgr/CMakeLists.txt @@ -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 platform) +install(TARGETS ExeMgr DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### install files ############### diff --git a/exemgr/main.cpp b/exemgr/main.cpp index 7dbe7f4d4..94b9aabb7 100644 --- a/exemgr/main.cpp +++ b/exemgr/main.cpp @@ -70,7 +70,7 @@ #include "liboamcpp.h" #include "crashtrace.h" #include "utils_utf8.h" -#include "config.h" +#include "mcsconfig.h" #include #include diff --git a/config.h.in b/mcsconfig.h.in similarity index 99% rename from config.h.in rename to mcsconfig.h.in index e2b9b6c1e..4ee8e9ee6 100644 --- a/config.h.in +++ b/mcsconfig.h.in @@ -1,6 +1,6 @@ -/* config.h.cmake */ -#ifndef TEST_CONFIG_H -#define TEST_CONFIG_H +/* mcsconfig.h.cmake */ +#ifndef TEST_MCSCONFIG_H +#define TEST_MCSCONFIG_H /* Define to 1 to let the system come up without using OAM */ #cmakedefine SKIP_OAM_INIT 1 diff --git a/oam/cloud/CMakeLists.txt b/oam/cloud/CMakeLists.txt index 8d16f4a29..b5e7130ab 100644 --- a/oam/cloud/CMakeLists.txt +++ b/oam/cloud/CMakeLists.txt @@ -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 platform) +install(PROGRAMS MCSInstanceCmds.sh MCSVolumeCmds.sh MCSgetCredentials.sh DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/oam/etc/CMakeLists.txt b/oam/etc/CMakeLists.txt index 735555108..3223de1d4 100644 --- a/oam/etc/CMakeLists.txt +++ b/oam/etc/CMakeLists.txt @@ -4,4 +4,4 @@ install(FILES AlarmConfig.xml Columnstore.xml ProcessConfig.xml ConsoleCmds.xml - DESTINATION ${ENGINE_SYSCONFDIR}/columnstore COMPONENT platform) + DESTINATION ${ENGINE_SYSCONFDIR}/columnstore COMPONENT columnstore-platform) diff --git a/oam/install_scripts/CMakeLists.txt b/oam/install_scripts/CMakeLists.txt index 632f85c3a..05387c5d0 100644 --- a/oam/install_scripts/CMakeLists.txt +++ b/oam/install_scripts/CMakeLists.txt @@ -34,7 +34,7 @@ install(PROGRAMS columnstore-post-install disable-rep-columnstore.sh mariadb-command-line.sh mcs_module_installer.sh - DESTINATION ${ENGINE_BINDIR} COMPONENT platform) + DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) install(FILES columnstore.service columnstoreAlias @@ -44,7 +44,7 @@ install(FILES columnstore.service columnstoreLogRotate myCnf-include-args.text myCnf-exclude-args.text - DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT platform) + DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-platform) - install(FILES module DESTINATION ${ENGINE_DATADIR}/local COMPONENT platform) +install(FILES module DESTINATION ${ENGINE_DATADIR}/local COMPONENT columnstore-platform) diff --git a/oam/install_scripts/columnstoreAlias b/oam/install_scripts/columnstoreAlias index 800aefced..9d55397a4 100644 --- a/oam/install_scripts/columnstoreAlias +++ b/oam/install_scripts/columnstoreAlias @@ -1,6 +1,5 @@ # MariaDB Columnstore Alias Commands # -alias mcsmysql='mysql -u root' alias ma=mcsadmin alias core='cd /var/log/mariadb/columnstore/corefiles' alias tdebug='tail -f /var/log/mariadb/columnstore/debug.log' diff --git a/oam/install_scripts/columnstore_run.sh b/oam/install_scripts/columnstore_run.sh index 59523337d..e77464543 100755 --- a/oam/install_scripts/columnstore_run.sh +++ b/oam/install_scripts/columnstore_run.sh @@ -49,7 +49,7 @@ if [ $vflg -gt 0 ]; then fi while [ $keep_going -ne 0 ]; do - $exename $args + LD_PRELOAD=libjemalloc.so $exename $args if [ -e ${lopt}/StopColumnstore ]; then exit 0 fi diff --git a/oam/oamcpp/CMakeLists.txt b/oam/oamcpp/CMakeLists.txt index 72d6cdae2..a1fd0292e 100644 --- a/oam/oamcpp/CMakeLists.txt +++ b/oam/oamcpp/CMakeLists.txt @@ -12,8 +12,5 @@ target_link_libraries(oamcpp ) target_compile_options(oamcpp PRIVATE -Wno-unused-result) -set_target_properties(oamcpp PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS oamcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) - +install(TARGETS oamcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp index 16ba7aec1..ca5132718 100644 --- a/oam/oamcpp/liboamcpp.cpp +++ b/oam/oamcpp/liboamcpp.cpp @@ -56,7 +56,7 @@ #ifdef _MSC_VER #include "idbregistry.h" #endif -#include "config.h" +#include "mcsconfig.h" #include "installdir.h" #include "dbrm.h" #include "sessionmanager.h" diff --git a/oam/oamcpp/oamcache.cpp b/oam/oamcpp/oamcache.cpp index 8e6c39e11..bf15b000b 100644 --- a/oam/oamcpp/oamcache.cpp +++ b/oam/oamcpp/oamcache.cpp @@ -34,7 +34,7 @@ using namespace boost; #include "exceptclasses.h" #include "configcpp.h" #include "installdir.h" -#include "config.h" +#include "mcsconfig.h" namespace { diff --git a/oam/post/CMakeLists.txt b/oam/post/CMakeLists.txt index 43de4807f..7ac1d273c 100644 --- a/oam/post/CMakeLists.txt +++ b/oam/post/CMakeLists.txt @@ -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 platform) +install(PROGRAMS columnstore_functions mcstest-001.sh mcstest-002.sh mcstest-003.sh mcstest-004.sh DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT columnstore-platform) diff --git a/oamapps/alarmmanager/CMakeLists.txt b/oamapps/alarmmanager/CMakeLists.txt index a6b12ab75..b1e028717 100644 --- a/oamapps/alarmmanager/CMakeLists.txt +++ b/oamapps/alarmmanager/CMakeLists.txt @@ -10,8 +10,6 @@ add_library(alarmmanager SHARED ${alarmmanager_LIB_SRCS}) target_compile_options(alarmmanager PRIVATE -Wno-unused-result) -set_target_properties(alarmmanager PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS alarmmanager DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS alarmmanager DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/oamapps/columnstoreDB/CMakeLists.txt b/oamapps/columnstoreDB/CMakeLists.txt index df17ff3e2..b9e483ad3 100644 --- a/oamapps/columnstoreDB/CMakeLists.txt +++ b/oamapps/columnstoreDB/CMakeLists.txt @@ -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 platform) +install(TARGETS columnstoreDBWrite DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/oamapps/columnstoreSupport/CMakeLists.txt b/oamapps/columnstoreSupport/CMakeLists.txt index 98573e2b0..5d19b0784 100644 --- a/oamapps/columnstoreSupport/CMakeLists.txt +++ b/oamapps/columnstoreSupport/CMakeLists.txt @@ -10,11 +10,11 @@ add_executable(columnstoreSupport ${columnstoreSupport_SRCS}) target_compile_options(columnstoreSupport PRIVATE -Wno-unused-result) -target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) +target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS columnstoreSupport DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS columnstoreSupport DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) install(PROGRAMS alarmReport.sh bulklogReport.sh configReport.sh hardwareReport.sh logReport.sh resourceReport.sh softwareReport.sh - DESTINATION ${ENGINE_BINDIR} COMPONENT platform) + DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/oamapps/columnstoreSupport/columnstoreSupport.cpp b/oamapps/columnstoreSupport/columnstoreSupport.cpp index ad94cabc8..3c6f487a4 100644 --- a/oamapps/columnstoreSupport/columnstoreSupport.cpp +++ b/oamapps/columnstoreSupport/columnstoreSupport.cpp @@ -27,9 +27,9 @@ #include "stdio.h" #include "ctype.h" #include -#include +#include -#include "config.h" +#include "mcsconfig.h" #include "liboamcpp.h" #include "configcpp.h" #include "installdir.h" diff --git a/oamapps/mcsadmin/CMakeLists.txt b/oamapps/mcsadmin/CMakeLists.txt index 1052d77f8..63ef583a0 100644 --- a/oamapps/mcsadmin/CMakeLists.txt +++ b/oamapps/mcsadmin/CMakeLists.txt @@ -10,7 +10,7 @@ add_executable(mcsadmin ${mcsadmin_SRCS}) target_compile_options(mcsadmin PRIVATE -Wno-unused-result) -target_link_libraries(mcsadmin ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS} ${ENGINE_WRITE_LIBS}) +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 platform) +install(TARGETS mcsadmin DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp index ea1c221cd..cdaaa9b8a 100644 --- a/oamapps/mcsadmin/mcsadmin.cpp +++ b/oamapps/mcsadmin/mcsadmin.cpp @@ -33,7 +33,7 @@ extern int h_errno; #include #include -#include "config.h" +#include "mcsconfig.h" #include "sessionmanager.h" #include "dbrm.h" #include "messagequeue.h" diff --git a/oamapps/mcsadmin/mcsadmin.h b/oamapps/mcsadmin/mcsadmin.h index 66fda95c8..59fd366a2 100644 --- a/oamapps/mcsadmin/mcsadmin.h +++ b/oamapps/mcsadmin/mcsadmin.h @@ -39,8 +39,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/oamapps/postConfigure/CMakeLists.txt b/oamapps/postConfigure/CMakeLists.txt index 55831d259..8f573d0a8 100644 --- a/oamapps/postConfigure/CMakeLists.txt +++ b/oamapps/postConfigure/CMakeLists.txt @@ -10,9 +10,9 @@ add_executable(postConfigure ${postConfigure_SRCS}) target_compile_options(postConfigure PRIVATE -Wno-unused-result) -target_link_libraries(postConfigure ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) +target_link_libraries(postConfigure ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS postConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS postConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -23,9 +23,9 @@ add_executable(columnstore_installer ${installer_SRCS}) target_compile_options(columnstore_installer PRIVATE -Wno-unused-result) -target_link_libraries(columnstore_installer ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) +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 platform) +install(TARGETS columnstore_installer DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -34,9 +34,9 @@ set(getMySQLpw_SRCS getMySQLpw.cpp) add_executable(getMySQLpw ${getMySQLpw_SRCS}) -target_link_libraries(getMySQLpw ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) +target_link_libraries(getMySQLpw ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS getMySQLpw DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS getMySQLpw DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -45,9 +45,9 @@ install(TARGETS getMySQLpw DESTINATION ${ENGINE_BINDIR} COMPONENT platform) #add_executable(amazonInstaller ${amazonInstaller_SRCS}) -#target_link_libraries(amazonInstaller ${ENGINE_LDFLAGS} readline ncurses ${SNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) +#target_link_libraries(amazonInstaller ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${SNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -#install(TARGETS amazonInstaller DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +#install(TARGETS amazonInstaller DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -58,12 +58,12 @@ add_executable(mycnfUpgrade ${mycnfUpgrade_SRCS}) target_compile_options(mycnfUpgrade PRIVATE -Wno-unused-result) -target_link_libraries(mycnfUpgrade ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) +target_link_libraries(mycnfUpgrade ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### install(PROGRAMS quick_installer_single_server.sh quick_installer_multi_server.sh quick_installer_amazon.sh - DESTINATION ${ENGINE_BINDIR} COMPONENT platform) + DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/oamapps/postConfigure/helpers.cpp b/oamapps/postConfigure/helpers.cpp index f8406d174..a61d7a1f0 100644 --- a/oamapps/postConfigure/helpers.cpp +++ b/oamapps/postConfigure/helpers.cpp @@ -23,9 +23,9 @@ #include #include -#include +#include -#include "config.h" +#include "mcsconfig.h" #include "configcpp.h" using namespace config; diff --git a/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp index 616589522..3266bac8d 100644 --- a/oamapps/postConfigure/installer.cpp +++ b/oamapps/postConfigure/installer.cpp @@ -47,7 +47,7 @@ #include #include -#include "config.h" +#include "mcsconfig.h" #include "liboamcpp.h" #include "configcpp.h" @@ -785,7 +785,7 @@ int main(int argc, char* argv[]) cout << ". " << ProfileFile << endl << endl; - cout << "Enter 'mcsmysql' to access the MariaDB ColumnStore SQL console" << 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; @@ -801,7 +801,7 @@ int main(int argc, char* argv[]) cout << ". " << ProfileFile << endl << endl; - cout << "Enter 'mcsmysql' to access the MariaDB ColumnStore SQL console" << 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; diff --git a/oamapps/postConfigure/mycnfUpgrade.cpp b/oamapps/postConfigure/mycnfUpgrade.cpp index 0297c715f..33f2f2f91 100644 --- a/oamapps/postConfigure/mycnfUpgrade.cpp +++ b/oamapps/postConfigure/mycnfUpgrade.cpp @@ -51,7 +51,7 @@ #include #include "liboamcpp.h" #include "installdir.h" -#include "config.h" +#include "mcsconfig.h" using namespace std; using namespace oam; diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp index 17fb4867d..953f7bcc4 100644 --- a/oamapps/postConfigure/postConfigure.cpp +++ b/oamapps/postConfigure/postConfigure.cpp @@ -62,13 +62,13 @@ #include #include -#include -#include +#include +#include #include #include #include -#include "config.h" +#include "mcsconfig.h" #include "columnstoreversion.h" #include "liboamcpp.h" #include "configcpp.h" @@ -3875,7 +3875,7 @@ int main(int argc, char* argv[]) cout << ". " << ProfileFile << endl << endl; - cout << "Enter 'mcsmysql' to access the MariaDB ColumnStore SQL console" << 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; @@ -3892,7 +3892,7 @@ int main(int argc, char* argv[]) cout << ". " << ProfileFile << endl << endl; - cout << "Enter 'mcsmysql' to access the MariaDB ColumnStore SQL console" << 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; diff --git a/oamapps/serverMonitor/CMakeLists.txt b/oamapps/serverMonitor/CMakeLists.txt index 59fbad662..dbd4dcd53 100644 --- a/oamapps/serverMonitor/CMakeLists.txt +++ b/oamapps/serverMonitor/CMakeLists.txt @@ -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 platform) +install(TARGETS ServerMonitor DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/primitives/blockcache/iomanager.cpp b/primitives/blockcache/iomanager.cpp index 716b0b69d..097f3cad6 100644 --- a/primitives/blockcache/iomanager.cpp +++ b/primitives/blockcache/iomanager.cpp @@ -28,7 +28,7 @@ // // -#include "config.h" +#include "mcsconfig.h" #define _FILE_OFFSET_BITS 64 #define _LARGEFILE64_SOURCE diff --git a/primitives/primproc/CMakeLists.txt b/primitives/primproc/CMakeLists.txt index 477792b0d..f96f8eecb 100644 --- a/primitives/primproc/CMakeLists.txt +++ b/primitives/primproc/CMakeLists.txt @@ -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 platform) +install(TARGETS PrimProc DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/procmgr/CMakeLists.txt b/procmgr/CMakeLists.txt index 99320901d..f1bc5fa09 100644 --- a/procmgr/CMakeLists.txt +++ b/procmgr/CMakeLists.txt @@ -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 platform) +install(TARGETS ProcMgr DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp index aa7877148..faffb62fd 100644 --- a/procmgr/processmanager.cpp +++ b/procmgr/processmanager.cpp @@ -25,7 +25,7 @@ #include #include "columnstoreversion.h" -#include "config.h" +#include "mcsconfig.h" #include "processmanager.h" #include "installdir.h" #include "dbrm.h" diff --git a/procmon/CMakeLists.txt b/procmon/CMakeLists.txt index bd6efcceb..a0a8045a1 100644 --- a/procmon/CMakeLists.txt +++ b/procmon/CMakeLists.txt @@ -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 platform) +install(TARGETS ProcMon DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/procmon/processmonitor.cpp b/procmon/processmonitor.cpp index 121318758..4e88bd752 100644 --- a/procmon/processmonitor.cpp +++ b/procmon/processmonitor.cpp @@ -28,7 +28,7 @@ #include #include "columnstoreversion.h" -#include "config.h" +#include "mcsconfig.h" #include "IDBDataFile.h" #include "IDBPolicy.h" #include "processmonitor.h" diff --git a/storage-manager/CMakeLists.txt b/storage-manager/CMakeLists.txt index 36fcfc796..d63fe8296 100755 --- a/storage-manager/CMakeLists.txt +++ b/storage-manager/CMakeLists.txt @@ -60,7 +60,7 @@ set(CMAKE_INSTALL_RPATH $ORIGIN $ORIGIN/../lib) add_library(storagemanager SHARED ${storagemanager_SRCS}) add_dependencies(storagemanager marias3) target_compile_definitions(storagemanager PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS) -target_link_libraries(storagemanager boost_system boost_thread boost_filesystem boost_regex pthread ${S3API_DEPS} ${JEMALLOC_LIBRARIES}) +target_link_libraries(storagemanager boost_chrono boost_system boost_thread boost_filesystem boost_regex pthread ${S3API_DEPS}) set_property(TARGET storagemanager PROPERTY CXX_STANDARD 11) add_executable(StorageManager src/main.cpp) @@ -95,7 +95,7 @@ add_custom_command( # The includes and lib linkages required to link against cloudio ... # pretty crazy. When lib dependencies are eventually config'd right, # change this to only include and link against cloudio. -include_directories(${CMAKE_SOURCE_DIR}/utils/cloudio ${ENGINE_COMMON_INCLUDES}) +include_directories(${ENGINE_SRC_DIR}/utils/cloudio ${ENGINE_COMMON_INCLUDES}) add_executable(smcat src/smcat.cpp) target_link_libraries(smcat storagemanager cloudio ${ENGINE_LDFLAGS} @@ -126,16 +126,16 @@ target_link_libraries(smrm storagemanager cloudio install(TARGETS storagemanager LIBRARY DESTINATION ${ENGINE_LIBDIR} - COMPONENT platform + COMPONENT columnstore-platform ) install(TARGETS StorageManager smcat smput smls smrm RUNTIME DESTINATION ${ENGINE_BINDIR} - COMPONENT platform + COMPONENT columnstore-platform ) install(FILES storagemanager.cnf DESTINATION ${ENGINE_SYSCONFDIR}/columnstore - COMPONENT platform) + COMPONENT columnstore-platform) diff --git a/storage-manager/src/Config.cpp b/storage-manager/src/Config.cpp index 48fa663f7..2ba96e3e7 100644 --- a/storage-manager/src/Config.cpp +++ b/storage-manager/src/Config.cpp @@ -19,7 +19,7 @@ #include "Config.h" // This one is the build system config -#include "config.h" +#include "mcsconfig.h" #include #include diff --git a/storage-manager/src/Ownership.h b/storage-manager/src/Ownership.h index fc53769c4..5327c940e 100644 --- a/storage-manager/src/Ownership.h +++ b/storage-manager/src/Ownership.h @@ -19,6 +19,7 @@ #define OWNERSHIP_H_ #include +#include #include #include #include "SMLogging.h" diff --git a/storage-manager/src/ThreadPool.h b/storage-manager/src/ThreadPool.h index e72780eff..3bf811a55 100644 --- a/storage-manager/src/ThreadPool.h +++ b/storage-manager/src/ThreadPool.h @@ -23,6 +23,7 @@ #include #include #include +#include #include "SMLogging.h" namespace storagemanager diff --git a/tools/clearShm/CMakeLists.txt b/tools/clearShm/CMakeLists.txt index 301a14494..14a68ce09 100644 --- a/tools/clearShm/CMakeLists.txt +++ b/tools/clearShm/CMakeLists.txt @@ -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 platform) +install(TARGETS clearShm DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/clearShm/main.cpp b/tools/clearShm/main.cpp index cf3a7e92b..f1a33ef78 100644 --- a/tools/clearShm/main.cpp +++ b/tools/clearShm/main.cpp @@ -18,7 +18,7 @@ // $Id: main.cpp 2101 2013-01-21 14:12:52Z rdempsey $ -#include "config.h" +#include "mcsconfig.h" #include #include diff --git a/tools/cleartablelock/CMakeLists.txt b/tools/cleartablelock/CMakeLists.txt index b87712fd4..d80ca05d7 100644 --- a/tools/cleartablelock/CMakeLists.txt +++ b/tools/cleartablelock/CMakeLists.txt @@ -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 platform) +install(TARGETS cleartablelock DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/configMgt/CMakeLists.txt b/tools/configMgt/CMakeLists.txt index 12eb03cb1..ac6aaa236 100644 --- a/tools/configMgt/CMakeLists.txt +++ b/tools/configMgt/CMakeLists.txt @@ -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 platform) +install(TARGETS autoConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/configMgt/configure.cpp b/tools/configMgt/configure.cpp index 38a686d49..be4461cde 100644 --- a/tools/configMgt/configure.cpp +++ b/tools/configMgt/configure.cpp @@ -46,8 +46,8 @@ #include "ctype.h" #include -#include -#include +#include +#include #include "liboamcpp.h" #include "configcpp.h" diff --git a/tools/cplogger/CMakeLists.txt b/tools/cplogger/CMakeLists.txt index be05afe50..4a9af844f 100644 --- a/tools/cplogger/CMakeLists.txt +++ b/tools/cplogger/CMakeLists.txt @@ -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 platform) +install(TARGETS cplogger DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/dbbuilder/CMakeLists.txt b/tools/dbbuilder/CMakeLists.txt index 1d09cd6aa..c9b5ab816 100644 --- a/tools/dbbuilder/CMakeLists.txt +++ b/tools/dbbuilder/CMakeLists.txt @@ -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 platform) +install(TARGETS dbbuilder DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/dbbuilder/dbbuilder.cpp b/tools/dbbuilder/dbbuilder.cpp index ed9153690..334e05333 100644 --- a/tools/dbbuilder/dbbuilder.cpp +++ b/tools/dbbuilder/dbbuilder.cpp @@ -28,7 +28,7 @@ using namespace std; #include -#include "config.h" +#include "mcsconfig.h" #include "dbbuilder.h" #include "systemcatalog.h" #include "liboamcpp.h" diff --git a/tools/dbloadxml/CMakeLists.txt b/tools/dbloadxml/CMakeLists.txt index 52532ca40..d7629c96b 100644 --- a/tools/dbloadxml/CMakeLists.txt +++ b/tools/dbloadxml/CMakeLists.txt @@ -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 platform) +install(TARGETS colxml DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/ddlcleanup/CMakeLists.txt b/tools/ddlcleanup/CMakeLists.txt index 8094aeaaa..c8cac521c 100644 --- a/tools/ddlcleanup/CMakeLists.txt +++ b/tools/ddlcleanup/CMakeLists.txt @@ -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 platform) +install(TARGETS ddlcleanup DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/editem/CMakeLists.txt b/tools/editem/CMakeLists.txt index 15d2dfe31..f7e38728d 100644 --- a/tools/editem/CMakeLists.txt +++ b/tools/editem/CMakeLists.txt @@ -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 platform) +install(TARGETS editem DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/getConfig/CMakeLists.txt b/tools/getConfig/CMakeLists.txt index 8266b163b..a79409370 100644 --- a/tools/getConfig/CMakeLists.txt +++ b/tools/getConfig/CMakeLists.txt @@ -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 platform) +install(TARGETS mcsGetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/idbmeminfo/CMakeLists.txt b/tools/idbmeminfo/CMakeLists.txt index 4c9908b23..905c63c95 100644 --- a/tools/idbmeminfo/CMakeLists.txt +++ b/tools/idbmeminfo/CMakeLists.txt @@ -10,5 +10,5 @@ add_executable(idbmeminfo ${idbmeminfo_SRCS}) target_link_libraries(idbmeminfo ${ENGINE_LDFLAGS}) -install(TARGETS idbmeminfo DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS idbmeminfo DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/qfe/returnedrows.cpp b/tools/qfe/returnedrows.cpp index da356b211..fc631993a 100644 --- a/tools/qfe/returnedrows.cpp +++ b/tools/qfe/returnedrows.cpp @@ -9,7 +9,7 @@ using namespace std; using namespace boost; #ifndef _MSC_VER -#include "config.h" +#include "mcsconfig.h" #endif #include "socktype.h" diff --git a/tools/qfe/server.cpp b/tools/qfe/server.cpp index 2bf4e187e..e38a86ab5 100644 --- a/tools/qfe/server.cpp +++ b/tools/qfe/server.cpp @@ -55,7 +55,7 @@ using namespace std; using namespace boost; #ifndef _MSC_VER -#include "config.h" +#include "mcsconfig.h" #endif #include "socktype.h" diff --git a/tools/qfe/socketio.cpp b/tools/qfe/socketio.cpp index 0bd6981d4..c6ccf367c 100644 --- a/tools/qfe/socketio.cpp +++ b/tools/qfe/socketio.cpp @@ -22,7 +22,7 @@ using namespace std; using namespace boost; #ifndef _MSC_VER -#include "config.h" +#include "mcsconfig.h" #endif #include "exceptclasses.h" diff --git a/tools/setConfig/CMakeLists.txt b/tools/setConfig/CMakeLists.txt index 4cecd0f98..a1a0cad2c 100644 --- a/tools/setConfig/CMakeLists.txt +++ b/tools/setConfig/CMakeLists.txt @@ -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 platform) +install(TARGETS mcsSetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) -install(PROGRAMS configxml.sh DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(PROGRAMS configxml.sh DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/tools/viewtablelock/CMakeLists.txt b/tools/viewtablelock/CMakeLists.txt index 44d45bafa..24f97293a 100644 --- a/tools/viewtablelock/CMakeLists.txt +++ b/tools/viewtablelock/CMakeLists.txt @@ -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 platform) +install(TARGETS viewtablelock DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/utils/batchloader/CMakeLists.txt b/utils/batchloader/CMakeLists.txt index 07ecc04e5..474133f95 100644 --- a/utils/batchloader/CMakeLists.txt +++ b/utils/batchloader/CMakeLists.txt @@ -10,8 +10,6 @@ add_library(batchloader SHARED ${batchloader_LIB_SRCS}) target_link_libraries(batchloader ${NETSNMP_LIBRARIES}) -set_target_properties(batchloader PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS batchloader DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS batchloader DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/cacheutils/CMakeLists.txt b/utils/cacheutils/CMakeLists.txt index bb8c766a6..20b85b71b 100644 --- a/utils/cacheutils/CMakeLists.txt +++ b/utils/cacheutils/CMakeLists.txt @@ -8,7 +8,5 @@ set(cacheutils_LIB_SRCS cacheutils.cpp) add_library(cacheutils SHARED ${cacheutils_LIB_SRCS}) -set_target_properties(cacheutils PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS cacheutils DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS cacheutils DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/cloudio/CMakeLists.txt b/utils/cloudio/CMakeLists.txt index 7ef9ed0ab..5105f835e 100755 --- a/utils/cloudio/CMakeLists.txt +++ b/utils/cloudio/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(${ENGINE_COMMON_INCLUDES} ${CMAKE_SOURCE_DIR}/storage-manager/include) +include_directories(${ENGINE_COMMON_INCLUDES} ${ENGINE_SRC_DIR}/storage-manager/include) set(cloudio_LIB_SRCS SMComm.cpp SMDataFile.cpp SMFileFactory.cpp SMFileSystem.cpp SocketPool.cpp cloud_plugin.cpp) @@ -9,9 +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) -set_target_properties(cloudio PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS cloudio DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS cloudio DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) add_executable(cloudio_component_test component_test.cpp) diff --git a/utils/clusterTester/CMakeLists.txt b/utils/clusterTester/CMakeLists.txt index ef3830c3e..8d8a930b7 100644 --- a/utils/clusterTester/CMakeLists.txt +++ b/utils/clusterTester/CMakeLists.txt @@ -1,5 +1,5 @@ install(PROGRAMS columnstoreClusterTester.sh os_detect.sh - DESTINATION ${ENGINE_BINDIR} COMPONENT platform) - + DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) + diff --git a/utils/common/CMakeLists.txt b/utils/common/CMakeLists.txt index eff8be12f..17dac6385 100644 --- a/utils/common/CMakeLists.txt +++ b/utils/common/CMakeLists.txt @@ -15,8 +15,5 @@ add_library(common SHARED ${common_LIB_SRCS}) add_dependencies(common loggingcpp) - -set_target_properties(common PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS common DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS common DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/compress/CMakeLists.txt b/utils/compress/CMakeLists.txt index adf173c48..b2849b233 100644 --- a/utils/compress/CMakeLists.txt +++ b/utils/compress/CMakeLists.txt @@ -12,7 +12,5 @@ add_library(compress SHARED ${compress_LIB_SRCS}) target_link_libraries(compress ${SNAPPY_LIBRARIES}) -set_target_properties(compress PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS compress DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS compress DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/configcpp/CMakeLists.txt b/utils/configcpp/CMakeLists.txt index f52f2a84e..13f7b80aa 100644 --- a/utils/configcpp/CMakeLists.txt +++ b/utils/configcpp/CMakeLists.txt @@ -7,9 +7,7 @@ set(configcpp_LIB_SRCS configcpp.cpp xmlparser.cpp configstream.cpp) add_library(configcpp SHARED ${configcpp_LIB_SRCS}) -set_target_properties(configcpp PROPERTIES VERSION 1.0.0 SOVERSION 1) - target_compile_definitions(configcpp PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS) -install(TARGETS configcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS configcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/configcpp/configcpp.cpp b/utils/configcpp/configcpp.cpp index 2e5c02795..1da1b22c8 100644 --- a/utils/configcpp/configcpp.cpp +++ b/utils/configcpp/configcpp.cpp @@ -19,7 +19,7 @@ * $Id: configcpp.cpp 3899 2013-06-17 20:54:10Z rdempsey $ * ******************************************************************************************/ -#include "config.h" +#include "mcsconfig.h" #include #include diff --git a/utils/configcpp/configstream.cpp b/utils/configcpp/configstream.cpp index 1bf85343f..2ad5aea96 100644 --- a/utils/configcpp/configstream.cpp +++ b/utils/configcpp/configstream.cpp @@ -19,7 +19,7 @@ * $Id$ * ******************************************************************************************/ -#include "config.h" +#include "mcsconfig.h" #include #include diff --git a/utils/configcpp/xmlparser.cpp b/utils/configcpp/xmlparser.cpp index 9ae0690e1..7b16af9d5 100644 --- a/utils/configcpp/xmlparser.cpp +++ b/utils/configcpp/xmlparser.cpp @@ -19,7 +19,7 @@ * $Id$ * ******************************************************************************************/ -#include "config.h" +#include "mcsconfig.h" #include #include diff --git a/utils/dataconvert/CMakeLists.txt b/utils/dataconvert/CMakeLists.txt index e9a11648d..8888b441b 100644 --- a/utils/dataconvert/CMakeLists.txt +++ b/utils/dataconvert/CMakeLists.txt @@ -8,6 +8,4 @@ set(dataconvert_LIB_SRCS dataconvert.cpp) add_library(dataconvert SHARED ${dataconvert_LIB_SRCS}) -set_target_properties(dataconvert PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS dataconvert DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS dataconvert DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/ddlcleanup/CMakeLists.txt b/utils/ddlcleanup/CMakeLists.txt index d15ba02b1..7569800f1 100644 --- a/utils/ddlcleanup/CMakeLists.txt +++ b/utils/ddlcleanup/CMakeLists.txt @@ -10,7 +10,5 @@ add_library(ddlcleanuputil SHARED ${ddlcleanuputil_LIB_SRCS}) target_link_libraries(ddlcleanuputil ${NETSNMP_LIBRARIES}) -set_target_properties(ddlcleanuputil PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS ddlcleanuputil DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS ddlcleanuputil DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/funcexp/CMakeLists.txt b/utils/funcexp/CMakeLists.txt index 70e4b54e3..acee44e8d 100644 --- a/utils/funcexp/CMakeLists.txt +++ b/utils/funcexp/CMakeLists.txt @@ -110,8 +110,5 @@ add_library(funcexp SHARED ${funcexp_LIB_SRCS}) target_link_libraries(funcexp ${NETSNMP_LIBRARIES}) -set_target_properties(funcexp PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS funcexp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) - +install(TARGETS funcexp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/idbdatafile/CMakeLists.txt b/utils/idbdatafile/CMakeLists.txt index c8f63ad37..c61547ee1 100644 --- a/utils/idbdatafile/CMakeLists.txt +++ b/utils/idbdatafile/CMakeLists.txt @@ -19,6 +19,4 @@ target_link_libraries(idbdatafile ${NETSNMP_LIBRARIES} ${ENGINE_OAM_LIBS}) target_compile_definitions(idbdatafile PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS) -set_target_properties(idbdatafile PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS idbdatafile DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS idbdatafile DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/joiner/CMakeLists.txt b/utils/joiner/CMakeLists.txt index cc67192cf..dd2003a1d 100644 --- a/utils/joiner/CMakeLists.txt +++ b/utils/joiner/CMakeLists.txt @@ -8,8 +8,6 @@ set(joiner_LIB_SRCS joiner.cpp tuplejoiner.cpp joinpartition.cpp) add_library(joiner SHARED ${joiner_LIB_SRCS}) -set_target_properties(joiner PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS joiner DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS joiner DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/libmarias3/CMakeLists.txt b/utils/libmarias3/CMakeLists.txt index 4cbc50a95..8695dcefd 100644 --- a/utils/libmarias3/CMakeLists.txt +++ b/utils/libmarias3/CMakeLists.txt @@ -2,13 +2,13 @@ set(S3API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libmarias3 CACHE INTERNAL "S3API_DIR") find_package(Git QUIET) -if(GIT_FOUND) +if(GIT_FOUND AND EXISTS ${ENGINE_SRC_DIR}/.git) # Update submodules as needed option(GIT_SUBMODULE "Check submodules during build" ON) if(GIT_SUBMODULE) message(STATUS "Submodule update") execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + WORKING_DIRECTORY ${ENGINE_SRC_DIR} RESULT_VARIABLE GIT_SUBMOD_RESULT) if(NOT GIT_SUBMOD_RESULT EQUAL "0") message(FATAL_ERROR "git submodule update --init failed with ${GIT_SUBMOD_RESULT}, please checkout submodules") @@ -18,7 +18,7 @@ endif() include(ExternalProject) ExternalProject_Add(ms3 - DOWNLOAD_COMMAND cd ${CMAKE_SOURCE_DIR} && git submodule update --init + SOURCE_DIR ${S3API_DIR} CONFIGURE_COMMAND autoreconf -fi ${S3API_DIR} && ${S3API_DIR}/configure --enable-shared --disable-static --prefix=${CMAKE_BINARY_DIR} ${S3_CONFIGURE_OPT} BUILD_COMMAND make BUILD_IN_SOURCE 0 @@ -32,5 +32,5 @@ install(PROGRAMS ${CMAKE_BINARY_DIR}/lib/libmarias3.so.3 ${CMAKE_BINARY_DIR}/lib/libmarias3.so DESTINATION ${ENGINE_LIBDIR} - COMPONENT platform + COMPONENT columnstore-platform ) diff --git a/utils/libmysql_client/CMakeLists.txt b/utils/libmysql_client/CMakeLists.txt index 67da6461a..78324d632 100644 --- a/utils/libmysql_client/CMakeLists.txt +++ b/utils/libmysql_client/CMakeLists.txt @@ -7,7 +7,5 @@ set(libmysql_client_LIB_SRCS libmysql_client.cpp) add_library(libmysql_client SHARED ${libmysql_client_LIB_SRCS}) -set_target_properties(libmysql_client PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS libmysql_client DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS libmysql_client DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/loggingcpp/CMakeLists.txt b/utils/loggingcpp/CMakeLists.txt index b44cd8b21..491346529 100644 --- a/utils/loggingcpp/CMakeLists.txt +++ b/utils/loggingcpp/CMakeLists.txt @@ -26,9 +26,7 @@ add_library(loggingcpp SHARED -set_target_properties(loggingcpp PROPERTIES VERSION 1.0.0 SOVERSION 1) +install(TARGETS loggingcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) -install(TARGETS loggingcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) - -install(FILES MessageFile.txt ErrorMessage.txt DESTINATION ${ENGINE_SYSCONFDIR}/columnstore COMPONENT platform) +install(FILES MessageFile.txt ErrorMessage.txt DESTINATION ${ENGINE_SYSCONFDIR}/columnstore COMPONENT columnstore-platform) diff --git a/utils/loggingcpp/idberrorinfo.cpp b/utils/loggingcpp/idberrorinfo.cpp index a2e9056d2..fd562ae1d 100644 --- a/utils/loggingcpp/idberrorinfo.cpp +++ b/utils/loggingcpp/idberrorinfo.cpp @@ -34,7 +34,7 @@ using namespace std; #include using namespace boost; -#include "config.h" +#include "mcsconfig.h" #include "configcpp.h" using namespace config; #include "loggingid.h" diff --git a/utils/loggingcpp/message.cpp b/utils/loggingcpp/message.cpp index 7f1468594..5b7ec6c4f 100644 --- a/utils/loggingcpp/message.cpp +++ b/utils/loggingcpp/message.cpp @@ -34,7 +34,7 @@ using namespace std; #include using namespace boost; -#include "config.h" +#include "mcsconfig.h" #include "configcpp.h" using namespace config; #include "messageobj.h" diff --git a/utils/messageqcpp/CMakeLists.txt b/utils/messageqcpp/CMakeLists.txt index 4f7c0e24c..149eb3847 100644 --- a/utils/messageqcpp/CMakeLists.txt +++ b/utils/messageqcpp/CMakeLists.txt @@ -16,6 +16,4 @@ set(messageqcpp_LIB_SRCS add_library(messageqcpp SHARED ${messageqcpp_LIB_SRCS}) -set_target_properties(messageqcpp PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS messageqcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS messageqcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/messageqcpp/compressed_iss.cpp b/utils/messageqcpp/compressed_iss.cpp index ae28577ac..26af982e3 100644 --- a/utils/messageqcpp/compressed_iss.cpp +++ b/utils/messageqcpp/compressed_iss.cpp @@ -20,7 +20,7 @@ * * ***********************************************************************/ -#include "config.h" +#include "mcsconfig.h" #include #include diff --git a/utils/messageqcpp/inetstreamsocket.cpp b/utils/messageqcpp/inetstreamsocket.cpp index d94a3eb94..ef6782e68 100644 --- a/utils/messageqcpp/inetstreamsocket.cpp +++ b/utils/messageqcpp/inetstreamsocket.cpp @@ -44,7 +44,7 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ -#include "config.h" +#include "mcsconfig.h" #include #include diff --git a/utils/multicast/socklib.h b/utils/multicast/socklib.h index 0c75af389..28d2b8f4d 100644 --- a/utils/multicast/socklib.h +++ b/utils/multicast/socklib.h @@ -20,7 +20,7 @@ #ifndef UDPCAST_CONFIG_H # define UDPCAST_CONFIG_H -# include "config.h" +# include "mcsconfig.h" #endif #include diff --git a/utils/querystats/CMakeLists.txt b/utils/querystats/CMakeLists.txt index 0a8b6f5df..8057468b5 100644 --- a/utils/querystats/CMakeLists.txt +++ b/utils/querystats/CMakeLists.txt @@ -7,7 +7,5 @@ set(querystats_LIB_SRCS querystats.cpp) add_library(querystats SHARED ${querystats_LIB_SRCS}) -set_target_properties(querystats PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS querystats DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS querystats DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/querytele/CMakeLists.txt b/utils/querytele/CMakeLists.txt index 404c3fc73..d64a95163 100644 --- a/utils/querytele/CMakeLists.txt +++ b/utils/querytele/CMakeLists.txt @@ -14,7 +14,5 @@ set(querytele_LIB_SRCS add_library(querytele SHARED ${querytele_LIB_SRCS}) -set_target_properties(querytele PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS querytele DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS querytele DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/regr/CMakeLists.txt b/utils/regr/CMakeLists.txt index 0b858a917..7dca571f9 100755 --- a/utils/regr/CMakeLists.txt +++ b/utils/regr/CMakeLists.txt @@ -10,9 +10,7 @@ add_definitions(-DMYSQL_DYNAMIC_PLUGIN) add_library(regr SHARED ${regr_LIB_SRCS} ) -set_target_properties(regr PROPERTIES VERSION 1.1.0 SOVERSION 1) - -install(TARGETS regr DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS regr DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) @@ -20,7 +18,5 @@ set(regr_mysql_LIB_SRCS regrmysql.cpp modamysql.cpp) add_library(regr_mysql SHARED ${regr_mysql_LIB_SRCS}) -set_target_properties(regr_mysql PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS regr_mysql DESTINATION ${MARIADB_PLUGINDIR} COMPONENT storage-engine) +install(TARGETS regr_mysql DESTINATION ${MARIADB_PLUGINDIR} COMPONENT columnstore-engine) diff --git a/utils/rowgroup/CMakeLists.txt b/utils/rowgroup/CMakeLists.txt index 028fa2a67..f79e757aa 100644 --- a/utils/rowgroup/CMakeLists.txt +++ b/utils/rowgroup/CMakeLists.txt @@ -12,7 +12,5 @@ add_library(rowgroup SHARED ${rowgroup_LIB_SRCS}) target_link_libraries(rowgroup ${NETSNMP_LIBRARIES} funcexp) -set_target_properties(rowgroup PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS rowgroup DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS rowgroup DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/rwlock/CMakeLists.txt b/utils/rwlock/CMakeLists.txt index a6201d40f..fcde11218 100644 --- a/utils/rwlock/CMakeLists.txt +++ b/utils/rwlock/CMakeLists.txt @@ -9,7 +9,5 @@ set(rwlock_LIB_SRCS rwlock.cpp rwlock_local.cpp) add_library(rwlock SHARED ${rwlock_LIB_SRCS}) -set_target_properties(rwlock PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS rwlock DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS rwlock DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/threadpool/CMakeLists.txt b/utils/threadpool/CMakeLists.txt index 47a09d88b..6939047b9 100644 --- a/utils/threadpool/CMakeLists.txt +++ b/utils/threadpool/CMakeLists.txt @@ -8,6 +8,4 @@ set(threadpool_LIB_SRCS weightedthreadpool.cpp threadpool.cpp prioritythreadpool add_library(threadpool SHARED ${threadpool_LIB_SRCS}) -set_target_properties(threadpool PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS threadpool DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS threadpool DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/thrift/CMakeLists.txt b/utils/thrift/CMakeLists.txt index 1521cb617..d5c9a29af 100644 --- a/utils/thrift/CMakeLists.txt +++ b/utils/thrift/CMakeLists.txt @@ -16,7 +16,5 @@ add_definitions(-DTHRIFT_SQUELCH_CONSOLE_OUTPUT) add_library(thrift SHARED ${thrift_LIB_SRCS}) -set_target_properties(thrift PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS thrift DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS thrift DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/utils/udfsdk/CMakeLists.txt b/utils/udfsdk/CMakeLists.txt index 053725698..016e7d892 100755 --- a/utils/udfsdk/CMakeLists.txt +++ b/utils/udfsdk/CMakeLists.txt @@ -10,9 +10,7 @@ add_definitions(-DMYSQL_DYNAMIC_PLUGIN) add_library(udfsdk SHARED ${udfsdk_LIB_SRCS}) -set_target_properties(udfsdk PROPERTIES VERSION 1.1.0 SOVERSION 1) - -install(TARGETS udfsdk DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS udfsdk DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) @@ -20,7 +18,5 @@ set(udf_mysql_LIB_SRCS udfmysql.cpp) add_library(udf_mysql SHARED ${udf_mysql_LIB_SRCS}) -set_target_properties(udf_mysql PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS udf_mysql DESTINATION ${MARIADB_PLUGINDIR} COMPONENT storage-engine) +install(TARGETS udf_mysql DESTINATION ${MARIADB_PLUGINDIR} COMPONENT columnstore-engine) diff --git a/utils/udfsdk/README.txt b/utils/udfsdk/README.txt index 3210979b4..ffd3ad6d8 100644 --- a/utils/udfsdk/README.txt +++ b/utils/udfsdk/README.txt @@ -14,8 +14,8 @@ files to create your own function or just try that function as is. $ cp libudf_mysql.so.1.0.0 libudfsdk.so.1.0.0 /usr/local/mariadb/columnstore/lib/ - Restart ColumnStore $ mcsadmin restartsystem y -- Using the mcsmysql client add the user defined function, e.g, - $ mcsmysql +- Using the mariadb client add the user defined function, e.g, + $ mariadb > create function mcs_add returns integer soname 'libudf_mysql.so'; > create function mcs_isnull returns string soname 'libudf_mysql.so'; diff --git a/utils/windowfunction/CMakeLists.txt b/utils/windowfunction/CMakeLists.txt index 77e4e86d3..9298cd1f3 100755 --- a/utils/windowfunction/CMakeLists.txt +++ b/utils/windowfunction/CMakeLists.txt @@ -26,12 +26,10 @@ set(windowfunction_LIB_SRCS add_library(windowfunction SHARED ${windowfunction_LIB_SRCS}) -set_target_properties(windowfunction PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS windowfunction DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS windowfunction DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) if (WITH_SORTING_COMPARATORS_UT) add_executable(comparators_tests comparators-tests.cpp) target_link_libraries(comparators_tests ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${CPPUNIT_LIBRARIES} cppunit) - install(TARGETS comparators_tests DESTINATION ${ENGINE_BINDIR} COMPONENT platform) + install(TARGETS comparators_tests DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) endif() diff --git a/versioning/BRM/CMakeLists.txt b/versioning/BRM/CMakeLists.txt index 8182ffc33..feda0c245 100644 --- a/versioning/BRM/CMakeLists.txt +++ b/versioning/BRM/CMakeLists.txt @@ -32,9 +32,7 @@ set(brm_LIB_SRCS add_library(brm SHARED ${brm_LIB_SRCS}) -set_target_properties(brm PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS brm DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS brm DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) ########### next target ############### @@ -45,7 +43,7 @@ add_executable(controllernode ${controllernode_SRCS}) target_link_libraries(controllernode ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ) -install(TARGETS controllernode DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS controllernode DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -56,7 +54,7 @@ add_executable(workernode ${workernode_SRCS}) target_link_libraries(workernode ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS workernode DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS workernode DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -67,7 +65,7 @@ add_executable(dbrmctl ${dbrmctl_SRCS}) target_link_libraries(dbrmctl ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS}) -install(TARGETS dbrmctl DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS dbrmctl DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -78,7 +76,7 @@ add_executable(reset_locks ${reset_locks_SRCS}) target_link_libraries(reset_locks ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES}) -install(TARGETS reset_locks DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS reset_locks DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -89,7 +87,7 @@ add_executable(rollback ${rollback_SRCS}) target_link_libraries(rollback ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES}) -install(TARGETS rollback DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS rollback DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -100,7 +98,7 @@ add_executable(save_brm ${save_brm_SRCS}) target_link_libraries(save_brm ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES}) -install(TARGETS save_brm DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS save_brm DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### next target ############### @@ -111,5 +109,5 @@ add_executable(load_brm ${load_brm_SRCS}) target_link_libraries(load_brm ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES}) -install(TARGETS load_brm DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS load_brm DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/versioning/BRM/brmtypes.cpp b/versioning/BRM/brmtypes.cpp index b614bba03..848cecdb1 100644 --- a/versioning/BRM/brmtypes.cpp +++ b/versioning/BRM/brmtypes.cpp @@ -24,7 +24,7 @@ * Definitions of the functions declared in brmtypes.h */ -#include "config.h" +#include "mcsconfig.h" #include #include diff --git a/writeengine/bulk/CMakeLists.txt b/writeengine/bulk/CMakeLists.txt index bd1d83f29..dfc0e6fba 100644 --- a/writeengine/bulk/CMakeLists.txt +++ b/writeengine/bulk/CMakeLists.txt @@ -40,5 +40,5 @@ add_executable(cpimport.bin ${cpimport.bin_SRCS}) add_dependencies(cpimport.bin marias3) target_link_libraries(cpimport.bin ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${S3API_DEPS} we_bulk we_xml) -install(TARGETS cpimport.bin DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS cpimport.bin DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/writeengine/client/CMakeLists.txt b/writeengine/client/CMakeLists.txt index 2133e1632..431dd5583 100644 --- a/writeengine/client/CMakeLists.txt +++ b/writeengine/client/CMakeLists.txt @@ -10,8 +10,6 @@ add_library(writeengineclient SHARED ${writeengineclient_LIB_SRCS}) target_link_libraries(writeengineclient ${NETSNMP_LIBRARIES}) -set_target_properties(writeengineclient PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS writeengineclient DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS writeengineclient DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/writeengine/redistribute/CMakeLists.txt b/writeengine/redistribute/CMakeLists.txt index 22308ced0..f53add736 100644 --- a/writeengine/redistribute/CMakeLists.txt +++ b/writeengine/redistribute/CMakeLists.txt @@ -13,10 +13,8 @@ add_library(writeengineredistribute SHARED ${writeengineredistribute_LIB_SRCS}) target_link_libraries(writeengineredistribute ${NETSNMP_LIBRARIES}) -set_target_properties(writeengineredistribute PROPERTIES VERSION 1.0.0 SOVERSION 1) - target_compile_definitions(writeengineredistribute PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS) -install(TARGETS writeengineredistribute DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS writeengineredistribute DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs) diff --git a/writeengine/redistribute/we_redistributecontrolthread.cpp b/writeengine/redistribute/we_redistributecontrolthread.cpp index 90f4fbaf9..07af0112c 100644 --- a/writeengine/redistribute/we_redistributecontrolthread.cpp +++ b/writeengine/redistribute/we_redistributecontrolthread.cpp @@ -37,7 +37,7 @@ using namespace std; #include "boost/filesystem/operations.hpp" using namespace boost; -#include "config.h" +#include "mcsconfig.h" #include "installdir.h" #include "configcpp.h" diff --git a/writeengine/server/CMakeLists.txt b/writeengine/server/CMakeLists.txt index cb11ff375..7629eaf64 100644 --- a/writeengine/server/CMakeLists.txt +++ b/writeengine/server/CMakeLists.txt @@ -21,5 +21,5 @@ add_executable(WriteEngineServer ${WriteEngineServer_SRCS}) target_link_libraries(WriteEngineServer ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS} threadpool writeengineredistribute) -install(TARGETS WriteEngineServer DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS WriteEngineServer DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/writeengine/server/we_dataloader.cpp b/writeengine/server/we_dataloader.cpp index f2239458b..10a0d0c76 100644 --- a/writeengine/server/we_dataloader.cpp +++ b/writeengine/server/we_dataloader.cpp @@ -25,7 +25,7 @@ * Author: Boby Paul: bpaul@calpont.com */ -#include "config.h" // Used to pickup STRERROR_R_CHAR_P definition +#include "mcsconfig.h" // Used to pickup STRERROR_R_CHAR_P definition #include #include diff --git a/writeengine/shared/CMakeLists.txt b/writeengine/shared/CMakeLists.txt index 898da28a0..0e62b7bef 100644 --- a/writeengine/shared/CMakeLists.txt +++ b/writeengine/shared/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories(${ENGINE_COMMON_INCLUDES} ../dictionary) add_executable(we_shared_components_tests ./shared_components_tests.cpp) target_link_libraries(we_shared_components_tests ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${CPPUNIT_LIBRARIES}) -install(TARGETS we_shared_components_tests DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS we_shared_components_tests DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) ########### install files ############### diff --git a/writeengine/shared/we_convertor.cpp b/writeengine/shared/we_convertor.cpp index dadec77da..c550c1050 100644 --- a/writeengine/shared/we_convertor.cpp +++ b/writeengine/shared/we_convertor.cpp @@ -27,7 +27,7 @@ #ifdef _MSC_VER #include #endif -#include "config.h" +#include "mcsconfig.h" #include "we_convertor.h" diff --git a/writeengine/shared/we_fileop.cpp b/writeengine/shared/we_fileop.cpp index c2426ca2c..d4f9f1665 100644 --- a/writeengine/shared/we_fileop.cpp +++ b/writeengine/shared/we_fileop.cpp @@ -17,7 +17,7 @@ // $Id: we_fileop.cpp 4737 2013-08-14 20:45:46Z bwilkinson $ -#include "config.h" +#include "mcsconfig.h" #include #include #include diff --git a/writeengine/splitter/CMakeLists.txt b/writeengine/splitter/CMakeLists.txt index 09aca8542..c02645534 100644 --- a/writeengine/splitter/CMakeLists.txt +++ b/writeengine/splitter/CMakeLists.txt @@ -19,5 +19,5 @@ add_executable(cpimport ${cpimport_SRCS}) target_link_libraries(cpimport ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} batchloader threadpool) -install(TARGETS cpimport DESTINATION ${ENGINE_BINDIR} COMPONENT platform) +install(TARGETS cpimport DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform) diff --git a/writeengine/splitter/we_sdhandler.cpp b/writeengine/splitter/we_sdhandler.cpp index 14b055a33..0ef4064fe 100644 --- a/writeengine/splitter/we_sdhandler.cpp +++ b/writeengine/splitter/we_sdhandler.cpp @@ -43,7 +43,7 @@ using namespace std; #include using namespace boost; -#include "config.h" +#include "mcsconfig.h" #include "configcpp.h" using namespace config; diff --git a/writeengine/wrapper/CMakeLists.txt b/writeengine/wrapper/CMakeLists.txt index 205e3cd77..8d9266c90 100644 --- a/writeengine/wrapper/CMakeLists.txt +++ b/writeengine/wrapper/CMakeLists.txt @@ -41,6 +41,4 @@ add_library(writeengine SHARED ${writeengine_LIB_SRCS}) target_link_libraries(writeengine ${NETSNMP_LIBRARIES}) -set_target_properties(writeengine PROPERTIES VERSION 1.0.0 SOVERSION 1) - -install(TARGETS writeengine DESTINATION ${ENGINE_LIBDIR} COMPONENT libs) +install(TARGETS writeengine DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)