refactor(clp): Prepare Grep code for deduplication with clp-s: (#1143)

- Move `Grep::process_raw_query` and associated utilities into a new `GrepCore` class.
- Templatize dictionary-parameters in `GrepCore`.
- Use dictionary IDs instead of pointers to dictionary entries in subquery generation.
- Move segment matching out of `GrepCore::process_raw_query` flow.
- Make callers of `GrepCore::process_raw_query` explicitly specify all wildcards in the query string.
- Make callers of `GrepCore::process_raw_query` clean up the query string.

Author: gibber9809

components/core/CMakeLists.txt

@@ -579,6 +579,8 @@ set(SOURCE_FILES_unitTest
         src/clp/GlobalSQLiteMetadataDB.hpp
         src/clp/Grep.cpp
         src/clp/Grep.hpp
+        src/clp/GrepCore.cpp
+        src/clp/GrepCore.hpp
         src/clp/hash_utils.cpp
         src/clp/hash_utils.hpp
         src/clp/ir/constants.hpp
@@ -627,6 +629,8 @@ set(SOURCE_FILES_unitTest
         src/clp/Profiler.hpp
         src/clp/Query.cpp
         src/clp/Query.hpp
+        src/clp/QueryToken.cpp
+        src/clp/QueryToken.hpp
         src/clp/ReaderInterface.cpp
         src/clp/ReaderInterface.hpp
         src/clp/ReadOnlyMemoryMappedFile.cpp
@@ -716,7 +720,7 @@ set(SOURCE_FILES_unitTest
         tests/test-ffi_KeyValuePairLogEvent.cpp
         tests/test-ffi_SchemaTree.cpp
         tests/test-FileDescriptorReader.cpp
-        tests/test-Grep.cpp
+        tests/test-GrepCore.cpp
         tests/test-hash_utils.cpp
         tests/test-ir_encoding_methods.cpp
         tests/test-ir_parsing.cpp

components/core/src/clp/EncodedVariableInterpreter.hpp

@@ -184,7 +184,6 @@ class EncodedVariableInterpreter {
      * Encodes a string-form variable, and if it is dictionary variable, searches for its ID in the
      * given variable dictionary.
      * @tparam VariableDictionaryReaderType
-     * @tparam VariableDictionaryEntryType
      * @param var_str
      * @param var_dict
      * @param ignore_case
@@ -194,9 +193,7 @@ class EncodedVariableInterpreter {
      * dictionary
      * @return false otherwise
      */
-    template <
-            typename VariableDictionaryReaderType,
-            typename VariableDictionaryEntryType = typename VariableDictionaryReaderType::entry_t>
+    template <typename VariableDictionaryReaderType>
     static bool encode_and_search_dictionary(
             std::string_view var_str,
             VariableDictionaryReaderType const& var_dict,
@@ -437,7 +434,7 @@ bool EncodedVariableInterpreter::decode_variables_into_message(
     return true;
 }
 
-template <typename VariableDictionaryReaderType, typename VariableDictionaryEntryType>
+template <typename VariableDictionaryReaderType>
 bool EncodedVariableInterpreter::encode_and_search_dictionary(
         std::string_view var_str,
         VariableDictionaryReaderType const& var_dict,
@@ -468,20 +465,18 @@ bool EncodedVariableInterpreter::encode_and_search_dictionary(
 
         if (entries.size() == 1) {
             auto const* entry = entries.at(0);
-            sub_query.add_dict_var(encode_var_dict_id(entry->get_id()), entry);
+            sub_query.add_dict_var(encode_var_dict_id(entry->get_id()), entry->get_id());
             return true;
         }
 
-        std::unordered_set<VariableDictionaryEntryType const*> const entries_set{
-                entries.cbegin(),
-                entries.cend()
-        };
         std::unordered_set<encoded_variable_t> encoded_vars;
+        std::unordered_set<variable_dictionary_id_t> var_dict_ids;
         encoded_vars.reserve(entries.size());
         for (auto const* entry : entries) {
             encoded_vars.emplace(encode_var_dict_id(entry->get_id()));
+            var_dict_ids.emplace(entry->get_id());
         }
-        sub_query.add_imprecise_dict_var(encoded_vars, entries_set);
+        sub_query.add_imprecise_dict_var(encoded_vars, var_dict_ids);
     }
 
     return true;
@@ -504,11 +499,13 @@ bool EncodedVariableInterpreter::wildcard_search_dictionary_and_get_encoded_matc
 
     // Encode matches
     std::unordered_set<encoded_variable_t> encoded_vars;
+    std::unordered_set<variable_dictionary_id_t> var_dict_ids;
     for (auto entry : var_dict_entries) {
         encoded_vars.emplace(encode_var_dict_id(entry->get_id()));
+        var_dict_ids.emplace(entry->get_id());
     }
 
-    sub_query.add_imprecise_dict_var(encoded_vars, var_dict_entries);
+    sub_query.add_imprecise_dict_var(encoded_vars, var_dict_ids);
 
     return true;
 }