Fix error when jemalloc is not enabled

JDRaftKeeper · Sep 19, 2024 · 4d453b4 · 4d453b4
1 parent d652312
commit 4d453b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
@@ -95,14 +95,14 @@ int Server::run()
 
 int Server::main(const std::vector<std::string> & /*args*/)
 {
-#if USE_JEMALLOC
-    setJemallocBackgroundThreads(true);
-#endif
-
     static ServerErrorHandler error_handler;
     Poco::ErrorHandler::set(&error_handler);
     Poco::Logger * log = &logger();
 
+#if USE_JEMALLOC
+    setJemallocBackgroundThreads(true);
+#endif
+
 #if !defined(NDEBUG) || !defined(__OPTIMIZE__)
     LOG_WARNING(log, "Server was built in debug mode. It will work slowly.");
 #endif

diff --git a/src/Service/FourLetterCommand.cpp b/src/Service/FourLetterCommand.cpp
@@ -149,6 +149,7 @@ void FourLetterCommandFactory::registerCommands(KeeperDispatcher & keeper_dispat
         FourLetterCommandPtr uptime_command = std::make_shared<UpTimeCommand>(keeper_dispatcher);
         factory.registerCommand(uptime_command);
 
+#if USE_JEMALLOC
         FourLetterCommandPtr jemalloc_dump_stats = std::make_shared<JemallocDumpStats>(keeper_dispatcher);
         factory.registerCommand(jemalloc_dump_stats);
 
@@ -163,6 +164,7 @@ void FourLetterCommandFactory::registerCommands(KeeperDispatcher & keeper_dispat
 
         FourLetterCommandPtr jemalloc_purge_arenas = std::make_shared<JemallocPurgeUnusedArenas>(keeper_dispatcher);
         factory.registerCommand(jemalloc_purge_arenas);
+#endif
 
         factory.initializeWhiteList(keeper_dispatcher);
         factory.setInitialize(true);
@@ -488,7 +490,7 @@ String LogInfoCommand::run()
     KeeperLogInfo log_info = keeper_dispatcher.getKeeperLogInfo();
     StringBuffer ret;
 
-    auto append = [&ret] (String key, uint64_t value) -> void
+    auto append = [&ret] (const String & key, uint64_t value) -> void
     {
         writeText(key, ret);
         writeText("\t", ret);