You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-09-02 12:41:17 +03:00
Kill Jemalloc
It does nothing for us, adding it when detected just causes pain.
This commit is contained in:
@@ -102,12 +102,6 @@ if (NOT LIBXML2_FOUND)
|
|||||||
MESSAGE(FATAL_ERROR "Could not find a usable libxml2 development environment!")
|
MESSAGE(FATAL_ERROR "Could not find a usable libxml2 development environment!")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
INCLUDE (FindJeMalloc.cmake)
|
|
||||||
if (NOT JEMALLOC_FOUND)
|
|
||||||
message(NOTICE "jemalloc not found! Compiling with standard malloc")
|
|
||||||
SET(JEMALLOC_LIBRARIES "")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
FIND_PROGRAM(AWK_EXECUTABLE awk DOC "path to the awk executable")
|
FIND_PROGRAM(AWK_EXECUTABLE awk DOC "path to the awk executable")
|
||||||
if(NOT AWK_EXECUTABLE)
|
if(NOT AWK_EXECUTABLE)
|
||||||
message(FATAL_ERROR "awk not found!")
|
message(FATAL_ERROR "awk not found!")
|
||||||
@@ -139,7 +133,7 @@ SET (ENGINE_LOCALDIR "${INSTALL_ENGINE}/local")
|
|||||||
SET (ENGINE_MYSQLDIR "${INSTALL_ENGINE}/mysql")
|
SET (ENGINE_MYSQLDIR "${INSTALL_ENGINE}/mysql")
|
||||||
SET (ENGINE_TOOLSDIR "${INSTALL_ENGINE}/tools")
|
SET (ENGINE_TOOLSDIR "${INSTALL_ENGINE}/tools")
|
||||||
|
|
||||||
SET (ENGINE_COMMON_LIBS messageqcpp loggingcpp configcpp idbboot ${Boost_LIBRARIES} xml2 pthread rt ${JEMALLOC_LIBRARIES})
|
SET (ENGINE_COMMON_LIBS messageqcpp loggingcpp configcpp idbboot ${Boost_LIBRARIES} xml2 pthread rt)
|
||||||
SET (ENGINE_OAM_LIBS oamcpp alarmmanager)
|
SET (ENGINE_OAM_LIBS oamcpp alarmmanager)
|
||||||
SET (ENGINE_BRM_LIBS brm idbdatafile cacheutils rwlock ${ENGINE_OAM_LIBS} ${ENGINE_COMMON_LIBS})
|
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 dataconvert common compress mysqlcl_idb querystats querytele thrift threadpool ${ENGINE_BRM_LIBS})
|
SET (ENGINE_EXEC_LIBS joblist execplan windowfunction joiner rowgroup funcexp udfsdk dataconvert common compress mysqlcl_idb querystats querytele thrift threadpool ${ENGINE_BRM_LIBS})
|
||||||
|
@@ -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
|
|
||||||
)
|
|
@@ -336,7 +336,6 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}-%{release}
|
|||||||
/usr/local/mariadb/columnstore/lib/libmysqlcl_idb.so.1.0.0
|
/usr/local/mariadb/columnstore/lib/libmysqlcl_idb.so.1.0.0
|
||||||
/usr/local/mariadb/columnstore/lib/libquerystats.so.1.0.0
|
/usr/local/mariadb/columnstore/lib/libquerystats.so.1.0.0
|
||||||
/usr/local/mariadb/columnstore/lib/libwriteengineredistribute.so.1.0.0
|
/usr/local/mariadb/columnstore/lib/libwriteengineredistribute.so.1.0.0
|
||||||
/usr/local/mariadb/columnstore/lib/libjemalloc.so.3.3.0
|
|
||||||
/usr/local/mariadb/columnstore/lib/libidbdatafile.so.1.0.0
|
/usr/local/mariadb/columnstore/lib/libidbdatafile.so.1.0.0
|
||||||
/usr/local/mariadb/columnstore/lib/hdfs-20.so
|
/usr/local/mariadb/columnstore/lib/hdfs-20.so
|
||||||
/usr/local/mariadb/columnstore/lib/hdfs-12.so
|
/usr/local/mariadb/columnstore/lib/hdfs-12.so
|
||||||
|
@@ -338,7 +338,6 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}-%{release}
|
|||||||
/usr/local/Calpont/lib/libmysqlcl_idb.so.1.0.0
|
/usr/local/Calpont/lib/libmysqlcl_idb.so.1.0.0
|
||||||
/usr/local/Calpont/lib/libquerystats.so.1.0.0
|
/usr/local/Calpont/lib/libquerystats.so.1.0.0
|
||||||
/usr/local/Calpont/lib/libwriteengineredistribute.so.1.0.0
|
/usr/local/Calpont/lib/libwriteengineredistribute.so.1.0.0
|
||||||
/usr/local/Calpont/lib/libjemalloc.so.3.3.0
|
|
||||||
/usr/local/Calpont/lib/libidbdatafile.so.1.0.0
|
/usr/local/Calpont/lib/libidbdatafile.so.1.0.0
|
||||||
/usr/local/Calpont/lib/hdfs-20.so
|
/usr/local/Calpont/lib/hdfs-20.so
|
||||||
/usr/local/Calpont/lib/hdfs-12.so
|
/usr/local/Calpont/lib/hdfs-12.so
|
||||||
|
Reference in New Issue
Block a user