refactor(clp): Prepare parsing & search code for deduplication with clp-s: (#1138)

- Use templates in `EncodedVariableInterpreter` instead of CLP dictionary implementations.
- Use `std::string_view` where possible in `EncodedVariableInterpreter` and dictionary classes.

Author: gibber9809

components/core/src/clp/DictionaryReader.hpp

@@ -1,7 +1,10 @@
 #ifndef CLP_DICTIONARYREADER_HPP
 #define CLP_DICTIONARYREADER_HPP
 
+#include <iterator>
 #include <string>
+#include <string_view>
+#include <utility>
 #include <vector>
 
 #include <boost/algorithm/string.hpp>
@@ -34,6 +37,9 @@ class DictionaryReader {
         char const* what() const noexcept override { return "DictionaryReader operation failed"; }
     };
 
+    using dictionary_id_t = DictionaryIdType;
+    using entry_t = EntryType;
+
     // Constructors
     DictionaryReader() : m_is_open(false), m_num_segments_read_from_index(0) {
         static_assert(
@@ -85,15 +91,15 @@ class DictionaryReader {
      * @return a vector of matching entries, or an empty vector if no entry matches.
      */
     std::vector<EntryType const*>
-    get_entry_matching_value(std::string const& search_string, bool ignore_case) const;
+    get_entry_matching_value(std::string_view search_string, bool ignore_case) const;
     /**
      * Gets the entries that match a given wildcard string
      * @param wildcard_string
      * @param ignore_case
      * @param entries Set in which to store found entries
      */
     void get_entries_matching_wildcard_string(
-            std::string const& wildcard_string,
+            std::string_view wildcard_string,
             bool ignore_case,
             std::unordered_set<EntryType const*>& entries
     ) const;
@@ -235,7 +241,7 @@ DictionaryReader<DictionaryIdType, EntryType>::get_value(DictionaryIdType id) co
 template <typename DictionaryIdType, typename EntryType>
 std::vector<EntryType const*>
 DictionaryReader<DictionaryIdType, EntryType>::get_entry_matching_value(
-        std::string const& search_string,
+        std::string_view search_string,
         bool ignore_case
 ) const {
     if (false == ignore_case) {
@@ -252,7 +258,11 @@ DictionaryReader<DictionaryIdType, EntryType>::get_entry_matching_value(
     }
 
     std::vector<EntryType const*> entries;
-    auto const search_string_uppercase = boost::algorithm::to_upper_copy(search_string);
+    std::string search_string_uppercase;
+    std::ignore = boost::algorithm::to_upper_copy(
+            std::back_inserter(search_string_uppercase),
+            search_string
+    );
     for (auto const& entry : m_entries) {
         if (boost::algorithm::to_upper_copy(entry.get_value()) == search_string_uppercase) {
             entries.push_back(&entry);
@@ -263,7 +273,7 @@ DictionaryReader<DictionaryIdType, EntryType>::get_entry_matching_value(
 
 template <typename DictionaryIdType, typename EntryType>
 void DictionaryReader<DictionaryIdType, EntryType>::get_entries_matching_wildcard_string(
-        std::string const& wildcard_string,
+        std::string_view wildcard_string,
         bool ignore_case,
         std::unordered_set<EntryType const*>& entries
 ) const {

components/core/src/clp/DictionaryWriter.hpp

@@ -2,7 +2,8 @@
 #define CLP_DICTIONARYWRITER_HPP
 
 #include <string>
-#include <unordered_map>
+
+#include <absl/container/flat_hash_map.h>
 
 #include "ArrayBackedPosIntSet.hpp"
 #include "Defs.h"
@@ -34,6 +35,9 @@ class DictionaryWriter {
         char const* what() const noexcept override { return "DictionaryWriter operation failed"; }
     };
 
+    using dictionary_id_t = DictionaryIdType;
+    using entry_t = EntryType;
+
     // Constructors
     DictionaryWriter() : m_is_open(false) {}
 
@@ -83,7 +87,7 @@ class DictionaryWriter {
 
 protected:
     // Types
-    using value_to_id_t = std::unordered_map<std::string, DictionaryIdType>;
+    using value_to_id_t = absl::flat_hash_map<std::string, DictionaryIdType>;
 
     // Variables
     bool m_is_open;