Undo some unnecessary changes; Minor refactoring.

y-scope · Nov 24, 2023 · 772fc56 · 772fc56
1 parent fc65297
commit 772fc56
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/components/core/src/LogSurgeonReader.cpp b/components/core/src/LogSurgeonReader.cpp
@@ -1,12 +1,12 @@
 #include "LogSurgeonReader.hpp"
 
-LogSurgeonReader::LogSurgeonReader (ReaderInterface& reader_interface)
+LogSurgeonReader::LogSurgeonReader(ReaderInterface& reader_interface)
         : m_reader_interface(reader_interface) {
-    read = [this] (char* buf, size_t count, size_t& read_to) -> log_surgeon::ErrorCode {
+    read = [this](char* buf, size_t count, size_t& read_to) -> log_surgeon::ErrorCode {
         m_reader_interface.read(buf, count, read_to);
         if (read_to == 0) {
             return log_surgeon::ErrorCode::EndOfFile;
         }
         return log_surgeon::ErrorCode::Success;
     };
-}
+}
diff --git a/components/core/src/LogSurgeonReader.hpp b/components/core/src/LogSurgeonReader.hpp
@@ -1,17 +1,19 @@
 #ifndef LOG_SURGEON_READER_HPP
 #define LOG_SURGEON_READER_HPP
 
+#include <log_surgeon/Reader.hpp>
+
 #include "ReaderInterface.hpp"
 
 /*
  * Wrapper providing a read function that works with the parsers in log_surgeon.
  */
 class LogSurgeonReader : public log_surgeon::Reader {
 public:
-    LogSurgeonReader (ReaderInterface& reader_interface);
+    LogSurgeonReader(ReaderInterface& reader_interface);
 
 private:
     ReaderInterface& m_reader_interface;
 };
 
-#endif //LOG_SURGEON_READER_HPP
+#endif  // LOG_SURGEON_READER_HPP
diff --git a/components/core/src/ReaderInterface.hpp b/components/core/src/ReaderInterface.hpp
@@ -3,16 +3,13 @@
 
 // C++ standard libraries
 #include <cstddef>
-#include <memory>
 #include <string>
 
 // Project headers
 #include "Defs.h"
 #include "ErrorCode.hpp"
 #include "TraceableException.hpp"
 
-#include <log_surgeon/Reader.hpp>
-
 class ReaderInterface {
 public:
     // Types

diff --git a/components/core/src/streaming_archive/writer/Archive.cpp b/components/core/src/streaming_archive/writer/Archive.cpp
@@ -270,12 +270,16 @@ namespace streaming_archive::writer {
     void Archive::write_msg_using_schema (LogEventView const& log_view) {
         epochtime_t timestamp = 0;
         TimestampPattern* timestamp_pattern = nullptr;
-        if (log_view.get_log_output_buffer()->has_timestamp()) {
+        auto const& log_output_buffer = log_view.get_log_output_buffer();
+        if (log_output_buffer->has_timestamp()) {
             size_t start;
             size_t end;
-            timestamp_pattern = (TimestampPattern*) TimestampPattern::search_known_ts_patterns(
-                    log_view.get_log_output_buffer()->get_mutable_token(0).to_string(), timestamp,
-                    start, end);
+            timestamp_pattern = (TimestampPattern*)TimestampPattern::search_known_ts_patterns(
+                    log_output_buffer->get_mutable_token(0).to_string(),
+                    timestamp,
+                    start,
+                    end
+            );
             if (m_old_ts_pattern != timestamp_pattern) {
                 change_ts_pattern(timestamp_pattern);
                 m_old_ts_pattern = timestamp_pattern;
@@ -291,7 +295,6 @@ namespace streaming_archive::writer {
         m_logtype_dict_entry.clear();
         size_t num_uncompressed_bytes = 0;
         // Timestamp is included in the uncompressed message size
-        auto const& log_output_buffer = log_view.get_log_output_buffer();
         uint32_t start_pos = log_output_buffer->get_token(0).m_start_pos;
         if (timestamp_pattern == nullptr) {
             start_pos = log_output_buffer->get_token(1).m_start_pos;

diff --git a/components/core/tests/test-ParserWithUserSchema.cpp b/components/core/tests/test-ParserWithUserSchema.cpp
@@ -74,8 +74,8 @@ TEST_CASE("Test error for missing schema file", "[LALR1Parser][SchemaParser]") {
     std::string file_name = boost::filesystem::weakly_canonical(file_path).string();
     REQUIRE_THROWS_WITH(
             generate_schema_ast(file_path),
-            "Failed to read '" + file_path
-                    + "', error_code=" + std::to_string(static_cast<int>(log_surgeon::ErrorCode::FileNotFound))
+            "Failed to read '" + file_path + "', error_code="
+                    + std::to_string(static_cast<int>(log_surgeon::ErrorCode::FileNotFound))
     );
 }