Fixing matchLineWithRegex() function

prestodb · Aug 9, 2024 · 664dd0d · 664dd0d
1 parent 138d6bc
commit 664dd0d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/presto-native-execution/presto_cpp/main/LinuxMemoryChecker.cpp b/presto-native-execution/presto_cpp/main/LinuxMemoryChecker.cpp
@@ -64,7 +64,7 @@ int64_t LinuxMemoryChecker::systemUsedMemoryBytes() {
   size_t memTotal = 0;
   size_t inactiveAnon = 0;
   size_t activeAnon = 0;
-  boost::smatch match;
+  boost::cmatch match;
   std::array<char, 50> buf;
   static const boost::regex inactiveAnonRegex(R"!(inactive_anon\s*(\d+)\s*)!");
   static const boost::regex activeAnonRegex(R"!(active_anon\s*(\d+)\s*)!");
@@ -114,13 +114,13 @@ int64_t LinuxMemoryChecker::systemUsedMemoryBytes() {
 }
 
 size_t LinuxMemoryChecker::matchLineWithRegex(
-    folly::StringPiece& line,
-    boost::smatch& match,
+    const folly::StringPiece& line,
+    boost::cmatch& match,
     const boost::regex& regex) {
-  if (boost::regex_match(line.begin(), line.end(), match, regex)) {
-    folly::StringPiece numStr(
-        line.begin() + match.position(1), size_t(match.length(1)));
-    return folly::to<size_t>(numStr);
+  std::string str(line.data(), line.size());
+  if (boost::regex_match(str.c_str(), match, regex)) {
+    std::string numStr(match[1].str());
+    return std::stoul(numStr);
   }
   return 0;
 }

diff --git a/presto-native-execution/presto_cpp/main/LinuxMemoryChecker.h b/presto-native-execution/presto_cpp/main/LinuxMemoryChecker.h
@@ -39,8 +39,8 @@ class LinuxMemoryChecker : public PeriodicMemoryChecker {
   int64_t systemUsedMemoryBytes() override;
 
   size_t matchLineWithRegex(
-      folly::StringPiece& line,
-      boost::smatch& match,
+      const folly::StringPiece& line,
+      boost::cmatch& match,
       const boost::regex& regex);
 
   int64_t mallocBytes() const override {