Address review comments.

Author: gibber9809

components/core/src/clp_s/CMakeLists.txt

@@ -60,14 +60,14 @@ set(
         ../clp/GrepCore.hpp
         ../clp/hash_utils.cpp
         ../clp/hash_utils.hpp
-        ../clp/ir/LogEvent.hpp
-        ../clp/ir/types.hpp
         ../clp/ir/constants.hpp
         ../clp/ir/EncodedTextAst.cpp
         ../clp/ir/EncodedTextAst.hpp
+        ../clp/ir/LogEvent.hpp
         ../clp/ir/parsing.cpp
         ../clp/ir/parsing.hpp
         ../clp/ir/parsing.inc
+        ../clp/ir/types.hpp
         ../clp/LogSurgeonReader.cpp
         ../clp/LogSurgeonReader.hpp    
         ../clp/NetworkReader.cpp

components/core/src/clp_s/ColumnWriter.cpp

@@ -85,13 +85,13 @@ void ClpStringColumnWriter::store(ZstdCompressor& compressor) {
 size_t VariableStringColumnWriter::add_value(ParsedMessage::variable_t& value) {
     clp::variable_dictionary_id_t id{};
     m_var_dict->add_entry(std::get<std::string>(value), id);
-    m_variables.push_back(id);
+    m_var_dict_ids.push_back(id);
     return sizeof(clp::variable_dictionary_id_t);
 }
 
 void VariableStringColumnWriter::store(ZstdCompressor& compressor) {
-    size_t size = m_variables.size() * sizeof(clp::variable_dictionary_id_t);
-    compressor.write(reinterpret_cast<char const*>(m_variables.data()), size);
+    auto size{m_var_dict_ids.size() * sizeof(clp::variable_dictionary_id_t)};
+    compressor.write(reinterpret_cast<char const*>(m_var_dict_ids.data()), size);
 }
 
 size_t DateStringColumnWriter::add_value(ParsedMessage::variable_t& value) {

components/core/src/clp_s/ColumnWriter.hpp

@@ -117,6 +117,9 @@ class BooleanColumnWriter : public BaseColumnWriter {
 
 class ClpStringColumnWriter : public BaseColumnWriter {
 public:
+    // Types
+    using encoded_log_dict_id_t = uint64_t;
+
     // Constructor
     ClpStringColumnWriter(
             int32_t id,
@@ -141,7 +144,7 @@ class ClpStringColumnWriter : public BaseColumnWriter {
      * @param encoded_id
      * @return the encoded log dict id
      */
-    static clp::logtype_dictionary_id_t get_encoded_log_dict_id(uint64_t encoded_id) {
+    static clp::logtype_dictionary_id_t get_encoded_log_dict_id(encoded_log_dict_id_t encoded_id) {
         return static_cast<clp::logtype_dictionary_id_t>(encoded_id & cLogDictIdMask);
     }
 
@@ -160,7 +163,8 @@ class ClpStringColumnWriter : public BaseColumnWriter {
      * @param offset
      * @return The encoded log dict id
      */
-    static uint64_t encode_log_dict_id(clp::logtype_dictionary_id_t id, uint64_t offset) {
+    static encoded_log_dict_id_t
+    encode_log_dict_id(clp::logtype_dictionary_id_t id, uint64_t offset) {
         return static_cast<uint64_t>(id) | (offset << cOffsetBitPosition);
     }
 
@@ -172,8 +176,8 @@ class ClpStringColumnWriter : public BaseColumnWriter {
     std::shared_ptr<LogTypeDictionaryWriter> m_log_dict;
     LogTypeDictionaryEntry m_logtype_entry;
 
-    std::vector<int64_t> m_logtypes;
-    std::vector<int64_t> m_encoded_vars;
+    std::vector<encoded_log_dict_id_t> m_logtypes;
+    std::vector<clp::encoded_variable_t> m_encoded_vars;
     std::vector<clp::variable_dictionary_id_t> m_temp_var_dict_ids;
 };
 
@@ -194,7 +198,7 @@ class VariableStringColumnWriter : public BaseColumnWriter {
 
 private:
     std::shared_ptr<VariableDictionaryWriter> m_var_dict;
-    std::vector<clp::variable_dictionary_id_t> m_variables;
+    std::vector<clp::variable_dictionary_id_t> m_var_dict_ids;
 };
 
 class DateStringColumnWriter : public BaseColumnWriter {

components/core/src/clp_s/search/QueryRunner.cpp

@@ -868,7 +868,7 @@ void QueryRunner::populate_string_queries(std::shared_ptr<Expression> const& exp
                             dummy_timestamp,
                             dummy_timestamp,
                             m_ignore_case,
-                            m_dummy_lexer,
+                            m_placeholder_lexer,
                             true
                     )
             );

components/core/src/clp_s/search/QueryRunner.hpp

@@ -152,7 +152,7 @@ class QueryRunner : public FilterClass {
             std::vector<std::pair<ExpressionType, ast::OpList::iterator>>>
             m_expression_state;
 
-    log_surgeon::lexers::ByteLexer m_dummy_lexer;
+    log_surgeon::lexers::ByteLexer m_placeholder_lexer;
 
     simdjson::ondemand::parser m_array_parser;
     std::string m_array_search_string;