Further touching

Author: haiqi96

components/core/src/clp/clo/OutputHandler.hpp

@@ -5,6 +5,7 @@
 
 #include <queue>
 #include <string>
+#include <string_view>
 
 #include <mongocxx/client.hpp>
 #include <mongocxx/collection.hpp>
@@ -29,14 +30,14 @@ class OutputHandler {
     // Methods
     /**
      * Adds a query result to a batch or sends it to the destination.
-     * @param original_path The original path of the file input log event belongs to.
-     * @param original_path The original id of the file input log event belongs to.
+     * @param orig_file_path The original path of the file that input log event belongs to.
+     * @param orig_file_id The original id of the file that input log event belongs to.
      * @param encoded_message The encoded log event
-     * @param decompressed_message The content of the log event.
+     * @param decompressed_message The decompressed log event.
      * @return ErrorCode_Success if the result was added successfully, an error code otherwise.
      */
     virtual ErrorCode add_result(
-            std::string_view original_path,
+            std::string_view orig_file_path,
             std::string_view orig_file_id,
             streaming_archive::reader::Message const& encoded_message,
             std::string_view decompressed_message
@@ -87,13 +88,9 @@ class NetworkOutputHandler : public OutputHandler {
     // Methods inherited from Client
     /**
      * Sends a result to the network destination.
-     * @param original_path The original path of the file input log event belongs to.
-     * @param original_path The original id of the file input log event belongs to.
-     * @param encoded_message The encoded log event
-     * @param message The content of the log event.
      */
     ErrorCode add_result(
-            std::string_view original_path,
+            std::string_view orig_file_path,
             std::string_view orig_file_id,
             streaming_archive::reader::Message const& encoded_message,
             std::string_view decompressed_message
@@ -172,14 +169,10 @@ class ResultsCacheOutputHandler : public OutputHandler {
     // Methods inherited from OutputHandler
     /**
      * Adds a result to the batch.
-     * @param original_path The original path of the file input log event belongs to.
-     * @param original_path The original id of the file input log event belongs to.
-     * @param encoded_message The encoded log event
-     * @param message The content of the log event.
-     * @return
+     * @return ErrorCode_Success
      */
     ErrorCode add_result(
-            std::string_view original_path,
+            std::string_view orig_file_path,
             std::string_view orig_file_id,
             streaming_archive::reader::Message const& encoded_message,
             std::string_view decompressed_message
@@ -234,16 +227,8 @@ class CountOutputHandler : public OutputHandler {
     explicit CountOutputHandler(int reducer_socket_fd);
 
     // Methods inherited from OutputHandler
-    /**
-     * Adds a result.
-     * @param original_path The original path of the file input log event belongs to.
-     * @param original_path The original id of the file input log event belongs to.
-     * @param encoded_message The encoded log event
-     * @param message The content of the log event.
-     * @return Errorcode
-     */
     ErrorCode add_result(
-            std::string_view original_path,
+            std::string_view orig_file_path,
             std::string_view orig_file_id,
             streaming_archive::reader::Message const& encoded_message,
             std::string_view decompressed_message
@@ -274,7 +259,7 @@ class CountByTimeOutputHandler : public OutputHandler {
 
     // Methods inherited from OutputHandler
     ErrorCode add_result(
-            std::string_view original_path,
+            std::string_view orig_file_path,
             std::string_view orig_file_id,
             streaming_archive::reader::Message const& encoded_message,
             std::string_view decompressed_message

components/core/src/clp/clo/clo.cpp

@@ -98,7 +98,7 @@ static SearchFilesResult search_file(
         std::unique_ptr<OutputHandler>& output_handler
 ) {
     File compressed_file;
-    Message compressed_message;
+    Message encoded_message;
     string decompressed_message;
 
     ErrorCode error_code = archive.open_file(compressed_file, file_metadata_ix);
@@ -119,15 +119,15 @@ static SearchFilesResult search_file(
             query,
             archive,
             compressed_file,
-            compressed_message,
+            encoded_message,
             decompressed_message
     ))
     {
         if (ErrorCode_Success
             != output_handler->add_result(
                     compressed_file.get_orig_path(),
                     compressed_file.get_orig_file_id_as_string(),
-                    compressed_message,
+                    encoded_message,
                     decompressed_message
             ))
         {