remove deprecated LogParse class (#1310)

* remove deprecated LogParse class
alibaba · Jan 4, 2024 · 1a3830a · 1a3830a
1 parent d895044
commit 1a3830a
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 2,319 deletions.
diff --git a/core/monitor/Monitor.cpp b/core/monitor/Monitor.cpp
@@ -121,6 +121,7 @@ void LogtailMonitor::Stop() {
         lock_guard<mutex> lock(mThreadRunningMux);
         mIsThreadRunning = false;
     }
+    mStopCV.notify_one();
     future_status s = mThreadRes.wait_for(chrono::seconds(1));
     if (s == future_status::ready) {
         LOG_INFO(sLogger, ("profiling", "stopped successfully"));

diff --git a/core/parser/CMakeLists.txt b/core/parser/CMakeLists.txt
@@ -18,8 +18,4 @@ project(parser)
 file(GLOB LIB_SOURCE_FILES *.cpp *.h)
 append_source_files(LIB_SOURCE_FILES)
 add_library(${PROJECT_NAME} STATIC ${LIB_SOURCE_FILES})
-target_link_libraries(${PROJECT_NAME} common)
-target_link_libraries(${PROJECT_NAME} logger)
-target_link_libraries(${PROJECT_NAME} log_pb)
-target_link_libraries(${PROJECT_NAME} monitor)
-target_link_libraries(${PROJECT_NAME} app_config)
+target_link_libraries(${PROJECT_NAME} models)
diff --git a/core/parser/LogParser.cpp b/core/parser/LogParser.cpp
diff --git a/core/parser/LogParser.h b/core/parser/LogParser.h
diff --git a/core/pipeline/PipelineManager.cpp b/core/pipeline/PipelineManager.cpp
@@ -16,6 +16,7 @@
 
 #include "pipeline/PipelineManager.h"
 
+#include "config_manager/ConfigManager.h"
 #include "file_server/FileServer.h"
 #include "go_pipeline/LogtailPlugin.h"
 #ifdef __linux__

diff --git a/core/processor/ProcessorSPL.cpp b/core/processor/ProcessorSPL.cpp
@@ -136,7 +136,6 @@ void ProcessorSPL::Process(std::vector<PipelineEventGroup>& logGroupList) {
     PipelineEventGroup logGroup = std::move(logGroupList[0]);
     std::vector<PipelineEventGroup>().swap(logGroupList);
 
-    size_t inSize = logGroup.GetEvents().size();
     std::vector<std::string> colNames{FIELD_CONTENT};
     // 根据spip->getInputSearches()，设置input数组
     std::vector<Input*> inputs;

diff --git a/core/processor/daemon/CMakeLists.txt b/core/processor/daemon/CMakeLists.txt
@@ -24,7 +24,6 @@ append_source_files(LIB_SOURCE_FILES)
 add_library(${PROJECT_NAME} STATIC ${LIB_SOURCE_FILES})
 target_link_libraries(${PROJECT_NAME} common)
 target_link_libraries(${PROJECT_NAME} logger)
-target_link_libraries(${PROJECT_NAME} parser)
 target_link_libraries(${PROJECT_NAME} log_pb)
 target_link_libraries(${PROJECT_NAME} monitor)
 target_link_libraries(${PROJECT_NAME} app_config)

diff --git a/core/processor/daemon/LogProcess.cpp b/core/processor/daemon/LogProcess.cpp
@@ -28,7 +28,6 @@
 #include "models/PipelineEventGroup.h"
 #include "pipeline/PipelineManager.h"
 #include "monitor/Monitor.h"
-#include "parser/LogParser.h"
 #include "sdk/Client.h"
 #include "sender/Sender.h"
 #include "log_pb/sls_logs.pb.h"

diff --git a/core/reader/CMakeLists.txt b/core/reader/CMakeLists.txt
@@ -24,7 +24,6 @@ append_source_files(LIB_SOURCE_FILES)
 add_library(${PROJECT_NAME} STATIC ${LIB_SOURCE_FILES})
 target_link_libraries(${PROJECT_NAME} common)
 target_link_libraries(${PROJECT_NAME} logger)
-target_link_libraries(${PROJECT_NAME} parser)
 target_link_libraries(${PROJECT_NAME} checkpoint)
 target_link_libraries(${PROJECT_NAME} monitor)
 target_link_libraries(${PROJECT_NAME} event_handler)

diff --git a/core/reader/LogFileReader.h b/core/reader/LogFileReader.h
@@ -15,25 +15,28 @@
  */
 
 #pragma once
-#include <utility>
+
+#include <atomic>
+#include <deque>
 #include <string>
-#include <vector>
 #include <unordered_set>
-#include <deque>
-#include <atomic>
-#include "parser/LogParser.h"
-#include "common/TimeUtil.h"
-#include "common/StringTools.h"
-#include "common/EncodingConverter.h"
+#include <utility>
+#include <vector>
+
+#include "checkpoint/RangeCheckpoint.h"
 #include "common/DevInode.h"
+#include "common/EncodingConverter.h"
+#include "common/FileInfo.h"
 #include "common/LogFileOperator.h"
-#include "logger/Logger.h"
+#include "common/StringTools.h"
+#include "common/TimeUtil.h"
+#include "event/Event.h"
+#include "file_server/FileDiscoveryOptions.h"
+#include "file_server/MultilineOptions.h"
 #include "log_pb/sls_logs.pb.h"
-#include "common/FileInfo.h"
-#include "checkpoint/RangeCheckpoint.h"
-#include "reader/SourceBuffer.h"
+#include "logger/Logger.h"
 #include "reader/FileReaderOptions.h"
-#include "file_server/MultilineOptions.h"
+#include "reader/SourceBuffer.h"
 
 namespace logtail {
 

diff --git a/core/spl/PipelineEventGroupOutput.cpp b/core/spl/PipelineEventGroupOutput.cpp
@@ -32,7 +32,7 @@ namespace apsara::sls::spl {
 
 void PipelineEventGroupOutput::setHeader(const IOHeader& header, std::string& err) {
     mIOHeader = &header;
-    for (int32_t i = 0; i < header.columnNames.size(); i++) {
+    for (size_t i = 0; i < header.columnNames.size(); i++) {
         auto field = header.columnNames[i].ToString();
         auto length = field.length();
         if (length >= LENGTH_FIELD_PREFIX_TAG

diff --git a/core/unittest/CMakeLists.txt b/core/unittest/CMakeLists.txt
@@ -67,7 +67,6 @@ add_subdirectory(input)
 add_subdirectory(log_pb)
 add_subdirectory(models)
 add_subdirectory(monitor)
-add_subdirectory(parser)
 add_subdirectory(pipeline)
 add_subdirectory(plugin)
 add_subdirectory(polling)

diff --git a/core/unittest/parser/CMakeLists.txt b/core/unittest/parser/CMakeLists.txt