From b81455744d938c442d248b09b10ebbee65e4e2ee Mon Sep 17 00:00:00 2001
From: Ben Thompson <ben.thompson@mariadb.com>
Date: Tue, 5 Feb 2019 13:43:21 -0600
Subject: [PATCH] Revert "Kill Jemalloc"

This reverts commit e03f7dc88503c7044ebc5befdd432238e31d3f16.
---
 CMakeLists.txt             |  8 ++++++-
 FindJeMalloc.cmake         | 44 ++++++++++++++++++++++++++++++++++++++
 build/infinidb.spec.in     |  1 +
 build/infinidb.spec.in.4.5 |  1 +
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 FindJeMalloc.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0932307ed..2645adc5c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,6 +92,12 @@ if (NOT LIBXML2_FOUND)
     MESSAGE(FATAL_ERROR "Could not find a usable libxml2 development environment!")
 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")
 if(NOT AWK_EXECUTABLE)
     message(FATAL_ERROR "awk not found!")
@@ -123,7 +129,7 @@ SET (ENGINE_LOCALDIR   "${INSTALL_ENGINE}/local")
 SET (ENGINE_MYSQLDIR   "${INSTALL_ENGINE}/mysql")
 SET (ENGINE_TOOLSDIR   "${INSTALL_ENGINE}/tools")
 
-SET (ENGINE_COMMON_LIBS     messageqcpp loggingcpp configcpp idbboot ${Boost_LIBRARIES} xml2 pthread rt)
+SET (ENGINE_COMMON_LIBS     messageqcpp loggingcpp configcpp idbboot ${Boost_LIBRARIES} xml2 pthread rt ${JEMALLOC_LIBRARIES})
 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 dataconvert common compress mysqlcl_idb querystats querytele thrift threadpool ${ENGINE_BRM_LIBS})
diff --git a/FindJeMalloc.cmake b/FindJeMalloc.cmake
new file mode 100644
index 000000000..c97bb1b9f
--- /dev/null
+++ b/FindJeMalloc.cmake
@@ -0,0 +1,44 @@
+# - 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/build/infinidb.spec.in b/build/infinidb.spec.in
index 20a44e834..2531044a0 100644
--- a/build/infinidb.spec.in
+++ b/build/infinidb.spec.in
@@ -336,6 +336,7 @@ 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/libquerystats.so.1.0.0
 /usr/local/mariadb/columnstore/lib/libwriteengineredistribute.so.1.0.0
+/usr/local/mariadb/columnstore/lib/libjemalloc.so.3.3.0
 /usr/local/mariadb/columnstore/lib/libidbdatafile.so.1.0.0
 /usr/local/mariadb/columnstore/lib/hdfs-20.so
 /usr/local/mariadb/columnstore/lib/hdfs-12.so
diff --git a/build/infinidb.spec.in.4.5 b/build/infinidb.spec.in.4.5
index 966f2a73a..b8145d580 100755
--- a/build/infinidb.spec.in.4.5
+++ b/build/infinidb.spec.in.4.5
@@ -338,6 +338,7 @@ 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/libquerystats.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/hdfs-20.so
 /usr/local/Calpont/lib/hdfs-12.so