fix: memory leak, improved code readability

Author: Willaaaaaaa

CMakeLists.txt

@@ -172,6 +172,17 @@ SET(CMAKE_C_FLAGS ${CMAKE_COMMON_FLAGS})
 
 MESSAGE(STATUS "CMAKE_CXX_FLAGS is " ${CMAKE_CXX_FLAGS})
 
+# Line Reading configs
+IF(USE_REPLXX)
+    ADD_DEFINITIONS(-DUSE_REPLXX=1)
+    MESSAGE(STATUS "Using replxx for line reading")
+    FIND_PACKAGE(Threads REQUIRED)
+    FIND_PACKAGE(replxx REQUIRED)
+ELSE()
+    ADD_DEFINITIONS(-DUSE_REPLXX=0)
+    MESSAGE(STATUS "Using linenoise for line reading")
+ENDIF()
+
 # ADD_SUBDIRECTORY(src bin)  bin 为目标目录， 可以省略
 # ADD_SUBDIRECTORY(deps)
 ADD_SUBDIRECTORY(src)
@@ -184,14 +195,3 @@ ENDIF(WITH_BENCHMARK)
 IF(WITH_UNIT_TESTS)
     ADD_SUBDIRECTORY(unittest)
 ENDIF(WITH_UNIT_TESTS)
-
-# Line Reading configs
-IF(USE_REPLXX)
-    ADD_DEFINITIONS(-DUSE_REPLXX=1)
-    MESSAGE(STATUS "Using replxx for line reading")
-    FIND_PACKAGE(Threads REQUIRED)
-    FIND_PACKAGE(replxx REQUIRED)
-ELSE()
-    ADD_DEFINITIONS(-DUSE_REPLXX=0)
-    MESSAGE(STATUS "Using linenoise for line reading")
-ENDIF()

src/common/linereader/line_interface.h

@@ -0,0 +1,59 @@
+/* Copyright (c) 2021 OceanBase and/or its affiliates. All rights reserved.
+miniob is licensed under Mulan PSL v2.
+You can use this software according to the terms and conditions of the Mulan PSL v2.
+You may obtain a copy of Mulan PSL v2 at:
+         http://license.coscl.org.cn/MulanPSL2
+THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+See the Mulan PSL v2 for more details. */
+
+//
+// Created by Willaaaaaaa in 2025
+//
+
+#include "common/linereader/line_reader.h"
+
+namespace common {
+LineReader LineReaderManager::reader_;
+bool LineReaderManager::is_first_call_ = true;
+
+char* LineReaderManager::my_readline(const char* prompt, const std::string& history_file) {
+  if (is_first_call_) {
+    reader_.history_load(history_file);
+    is_first_call_ = false;
+  }
+
+  char* line = reader_.input(prompt);
+  if (line == nullptr) {
+    return nullptr;
+  }
+
+  bool is_valid_input = false;
+  for (auto c = line; *c != '\0'; ++c) {
+    if (!isspace(*c)) {
+      is_valid_input = true;
+      break;
+    }
+  }
+
+  if (is_valid_input) {
+    reader_.history_add(line);
+  }
+  
+  return line;
+}
+
+bool LineReaderManager::is_exit_command(const char* cmd, const std::string& history_file) {
+  bool is_exit = 0 == strncasecmp("exit", cmd, 4) || 
+                0 == strncasecmp("bye", cmd, 3) || 
+                0 == strncasecmp("\\q", cmd, 2) ||
+                0 == strncasecmp("interrupted", cmd, 11);
+                
+  if (is_exit) {
+    reader_.history_save(history_file);
+  }
+  
+  return is_exit;
+}
+} // namespace common

src/common/linereader/line_reader.cpp

@@ -0,0 +1,51 @@
+/* Copyright (c) 2021 OceanBase and/or its affiliates. All rights reserved.
+miniob is licensed under Mulan PSL v2.
+You can use this software according to the terms and conditions of the Mulan PSL v2.
+You may obtain a copy of Mulan PSL v2 at:
+         http://license.coscl.org.cn/MulanPSL2
+THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+See the Mulan PSL v2 for more details. */
+
+//
+// Created by Willaaaaaaa in 2025
+//
+
+#ifndef COMMON_LINE_READER
+#define COMMON_LINE_READER
+
+#if USE_REPLXX
+  #include "replxx.hxx"
+  using LineReader = replxx::Replxx;
+#else
+  #include "common/linereader/linenoise_reader.h"
+  using LineReader = LinenoiseReader;
+#endif
+
+namespace common {
+class LineReaderManager {
+public:
+  /**
+   * @brief Read a line from input
+   * @param prompt The prompt to display
+   * @param history_file path/to/file
+   * @return char* to input string or nullptr
+   */
+  static char* my_readline(const char* prompt, const std::string& history_file);
+
+  /**
+   * @brief Check if the command is an exit command
+   * @param cmd The input command
+   * @param history_file path/to/file
+   * @return True if the command is an exit command
+   */
+  static bool is_exit_command(const char* cmd, const std::string& history_file);
+
+private:
+  static LineReader reader_;
+  static bool is_first_call_;
+};
+} // namespace common
+
+#endif // COMMON_LINE_READER

src/common/linereader/line_reader.h

@@ -9,44 +9,42 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 See the Mulan PSL v2 for more details. */
 
 // 
-// Created by Willaaaaaaa on 2025
+// Created by Willaaaaaaa in 2025
 //
 
-#include "common/linereader/linereader.h"
+#include "common/linereader/linenoise_reader.h"
 #include "common/linereader/linenoise.h"
 #include "common/lang/string.h"
 
-namespace common {
-LineReader::LineReader() {
+LinenoiseReader::LinenoiseReader() {
   linenoiseHistorySetMaxLen(1000);
   linenoiseSetMultiLine(0);
 }
 
-char* LineReader::input(const char* prompt) {
+char* LinenoiseReader::input(const char* prompt) {
   return linenoise(prompt);
 }
 
-bool LineReader::history_load(const std::string& history_file) {
+bool LinenoiseReader::history_load(const std::string& history_file) {
   history_file_ = history_file;
   return linenoiseHistoryLoad(history_file.c_str()) == 0;
 }
 
-bool LineReader::history_save(const std::string& history_file) const {
+bool LinenoiseReader::history_save(const std::string& history_file) const {
   return linenoiseHistorySave(history_file.c_str()) == 0;
 }
 
-bool LineReader::history_add(const char* line) {
+bool LinenoiseReader::history_add(const char* line) {
   if (line != nullptr && *line != '\0') {
     return linenoiseHistoryAdd(line) == 0;
   }
   return false;
 }
 
-void LineReader::history_set_max_len(int len) {
+void LinenoiseReader::history_set_max_len(int len) {
   linenoiseHistorySetMaxLen(len);
 }
 
-void LineReader::clear_screen() {
+void LinenoiseReader::clear_screen() {
   linenoiseClearScreen();
 }
-} // namespace common

src/common/linereader/linereader.cpp renamed to src/common/linereader/linenoise_reader.cpp

@@ -9,23 +9,22 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 See the Mulan PSL v2 for more details. */
 
 // 
-// Created by Willaaaaaaa on 2025
+// Created by Willaaaaaaa in 2025
 //
 
-#ifndef COMMON_LINEREADER_H
-#define COMMON_LINEREADER_H
+#ifndef COMMON_LINENOISE_WRAPPER_H
+#define COMMON_LINENOISE_WRAPPER_H
 
 #include "common/lang/string.h"
 
-namespace common {
 /**
  * @brief A wrapper class for linenoise lib
  * @details Support history memory...
  */
-class LineReader {
+class LinenoiseReader {
 public:
-  LineReader();
-  ~LineReader() = default;
+  LinenoiseReader();
+  ~LinenoiseReader() = default;
 
   /**
    * @brief Read input with C string
@@ -69,6 +68,5 @@ class LineReader {
 private:
   std::string history_file_;
 };
-} // namespace common
 
-#endif // COMMON_LINEREADER_H
+#endif // COMMON_LINENOISE_WRAPPER_H

src/common/linereader/linereader.h renamed to src/common/linereader/linenoise_reader.h

@@ -29,7 +29,7 @@ See the Mulan PSL v2 for more details. */
 
 #include "common/defs.h"
 #include "common/lang/string.h"
-#include "common/linereader/line_interface.h"
+#include "common/linereader/line_reader.h"
 
 #define MAX_MEM_BUFFER_SIZE 8192
 #define PORT_DEFAULT 6789
@@ -45,7 +45,7 @@ const std::string LINE_HISTORY_FILE = "./.obclient.history";
 */
 bool is_exit_command(const char *cmd)
 {
-  return is_exit_command(cmd, LINE_HISTORY_FILE);
+  return LineReaderManager::is_exit_command(cmd, LINE_HISTORY_FILE);
 }
 
 int init_unix_sock(const char *unix_sock_path)
@@ -142,9 +142,8 @@ int main(int argc, char *argv[])
 
   char         *input_command              = nullptr;
   static time_t previous_history_save_time = 0;
-  static LineInterface reader;
 
-  while ((input_command = my_readline(prompt_str, LINE_HISTORY_FILE)) != nullptr) {
+  while ((input_command = LineReaderManager::my_readline(prompt_str, LINE_HISTORY_FILE)) != nullptr) {
     if (common::is_blank(input_command)) {
       free(input_command);
       input_command = nullptr;
@@ -158,7 +157,7 @@ int main(int argc, char *argv[])
     }
 
     if (time(NULL) - previous_history_save_time > 5) {
-      reader.history_save(LINE_HISTORY_FILE);
+      LineReaderManager::is_exit_command("", LINE_HISTORY_FILE);
       previous_history_save_time = time(NULL);
     }
 
@@ -203,7 +202,7 @@ int main(int argc, char *argv[])
   }
   close(sockfd);
 
-  reader.history_save(LINE_HISTORY_FILE);
+  LineReaderManager::is_exit_command("", LINE_HISTORY_FILE);
   printf("Command history saved to: %s\n", LINE_HISTORY_FILE.c_str());
 
   return 0;

src/obclient/client.cpp

@@ -15,11 +15,14 @@ See the Mulan PSL v2 for more details. */
 #include "common/lang/string.h"
 #include "common/log/log.h"
 #include "common/sys/rc.h"
+#include "common/linereader/line_reader.h"
+
+using common::LineReaderManager;
 
 namespace oceanbase {
 std::string my_readline(const std::string &prompt)
 {
-  char* line = ::my_readline(prompt.c_str(), LINE_HISTORY_FILE);
+  char* line = LineReaderManager::my_readline(prompt.c_str(), LINE_HISTORY_FILE);
   if (line == nullptr) {
     return "";
   }

src/oblsm/client/cliutil/parser.cpp

@@ -23,7 +23,7 @@ See the Mulan PSL v2 for more details. */
 #include "common/lang/string.h"
 #include "common/lang/string_view.h"
 #include "oblsm/client/cliutil/defs.h"
-#include "common/linereader/line_interface.h"
+#include "common/linereader/line_reader.h"
 
 #define MAX_MEM_BUFFER_SIZE 8192
 namespace oceanbase {