From 220529fdba0630473c2d7446a1ff9c8d96b88950 Mon Sep 17 00:00:00 2001
From: blueskygzhz <147569085+blueskygzhz@users.noreply.github.com>
Date: Mon, 29 Apr 2024 11:43:37 +0800
Subject: [PATCH 1/4] judge allowRollback first to improve performance

---
 core/reader/JsonLogFileReader.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/reader/JsonLogFileReader.cpp b/core/reader/JsonLogFileReader.cpp
index 0796b1abca..c5ed9ccc29 100644
--- a/core/reader/JsonLogFileReader.cpp
+++ b/core/reader/JsonLogFileReader.cpp
@@ -23,6 +23,9 @@ int32_t JsonLogFileReader::RemoveLastIncompleteLog(char* buffer,
                                                    int32_t size,
                                                    int32_t& rollbackLineFeedCount,
                                                    bool allowRollback) {
+    if (!allowRollback)
+      return size;
+  
     int32_t readBytes = 0;
     int32_t endIdx = 0;
     int32_t beginIdx = 0;
@@ -47,14 +50,11 @@ int32_t JsonLogFileReader::RemoveLastIncompleteLog(char* buffer,
     } while (beginIdx < size);
     readBytes = beginIdx;
 
-    if (allowRollback) {
-        rollbackLineFeedCount = std::count(buffer + beginIdx, buffer + size, '\n');
-        if (beginIdx < size && buffer[size - 1] != '\n') {
-            ++rollbackLineFeedCount;
-        }
-    } else {
-        return size;
+    rollbackLineFeedCount = std::count(buffer + beginIdx, buffer + size, '\n');
+    if (beginIdx < size && buffer[size - 1] != '\n') {
+      ++rollbackLineFeedCount;
     }
+
     return readBytes;
 }
 

From 1eed98c1c32447e697702c5bf24574130357805c Mon Sep 17 00:00:00 2001
From: blueskygzhz <147569085+blueskygzhz@users.noreply.github.com>
Date: Mon, 29 Apr 2024 14:05:29 +0800
Subject: [PATCH 2/4] Update JsonLogFileReader.cpp

assign value before return
---
 core/reader/JsonLogFileReader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/reader/JsonLogFileReader.cpp b/core/reader/JsonLogFileReader.cpp
index c5ed9ccc29..d425473863 100644
--- a/core/reader/JsonLogFileReader.cpp
+++ b/core/reader/JsonLogFileReader.cpp
@@ -23,13 +23,13 @@ int32_t JsonLogFileReader::RemoveLastIncompleteLog(char* buffer,
                                                    int32_t size,
                                                    int32_t& rollbackLineFeedCount,
                                                    bool allowRollback) {
+    rollbackLineFeedCount = 0;
     if (!allowRollback)
       return size;
   
     int32_t readBytes = 0;
     int32_t endIdx = 0;
     int32_t beginIdx = 0;
-    rollbackLineFeedCount = 0;
     bool startWithBlock = false;
     // check if has json block in this buffer
     do {

From 644e46cfad5e9af459ca48aa00bf6cc9c3b3a363 Mon Sep 17 00:00:00 2001
From: blueskygzhz <147569085+blueskygzhz@users.noreply.github.com>
Date: Wed, 8 May 2024 15:53:02 +0800
Subject: [PATCH 3/4] Rename LogtaiMetric.cpp to LogtailMetric.cpp

fix cpp filename mispell
---
 core/monitor/{LogtaiMetric.cpp => LogtailMetric.cpp} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename core/monitor/{LogtaiMetric.cpp => LogtailMetric.cpp} (100%)

diff --git a/core/monitor/LogtaiMetric.cpp b/core/monitor/LogtailMetric.cpp
similarity index 100%
rename from core/monitor/LogtaiMetric.cpp
rename to core/monitor/LogtailMetric.cpp

From b195edf67ba85fb9621b8991ec4783ad417ebc34 Mon Sep 17 00:00:00 2001
From: blueskygzhz <147569085+blueskygzhz@users.noreply.github.com>
Date: Wed, 8 May 2024 15:58:01 +0800
Subject: [PATCH 4/4] Update JsonLogFileReader.cpp

---
 core/reader/JsonLogFileReader.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/reader/JsonLogFileReader.cpp b/core/reader/JsonLogFileReader.cpp
index d425473863..0796b1abca 100644
--- a/core/reader/JsonLogFileReader.cpp
+++ b/core/reader/JsonLogFileReader.cpp
@@ -23,13 +23,10 @@ int32_t JsonLogFileReader::RemoveLastIncompleteLog(char* buffer,
                                                    int32_t size,
                                                    int32_t& rollbackLineFeedCount,
                                                    bool allowRollback) {
-    rollbackLineFeedCount = 0;
-    if (!allowRollback)
-      return size;
-  
     int32_t readBytes = 0;
     int32_t endIdx = 0;
     int32_t beginIdx = 0;
+    rollbackLineFeedCount = 0;
     bool startWithBlock = false;
     // check if has json block in this buffer
     do {
@@ -50,11 +47,14 @@ int32_t JsonLogFileReader::RemoveLastIncompleteLog(char* buffer,
     } while (beginIdx < size);
     readBytes = beginIdx;
 
-    rollbackLineFeedCount = std::count(buffer + beginIdx, buffer + size, '\n');
-    if (beginIdx < size && buffer[size - 1] != '\n') {
-      ++rollbackLineFeedCount;
+    if (allowRollback) {
+        rollbackLineFeedCount = std::count(buffer + beginIdx, buffer + size, '\n');
+        if (beginIdx < size && buffer[size - 1] != '\n') {
+            ++rollbackLineFeedCount;
+        }
+    } else {
+        return size;
     }
-
     return readBytes;
 }