Add comparator to unique store.

2 files changed, 2 insertions, 4 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/enumstore.h b/searchlib/src/vespa/searchlib/attribute/enumstore.h
index 0b16ec3acc1..8cafd04586e 100644
--- a/searchlib/src/vespa/searchlib/attribute/enumstore.h
+++ b/searchlib/src/vespa/searchlib/attribute/enumstore.h
@@ -55,7 +55,6 @@ private:
     UniqueStoreType        _store;
     IEnumStoreDictionary*  _dict;
     bool                   _is_folded;
-    ComparatorType         _comparator;
     ComparatorType         _foldedComparator;
     enumstore::EnumStoreCompactionSpec _compaction_spec;
     EntryType              _default_value;
@@ -187,8 +186,8 @@ public:
         return BatchUpdater(*this);
     }
 
-    const EntryComparator & get_comparator() const {
-        return _comparator;
+    const EntryComparator & get_comparator() const noexcept {
+        return _store.get_comparator();
     }
 
     ComparatorType make_comparator(const EntryType& lookup_value) const {
diff --git a/searchlib/src/vespa/searchlib/attribute/enumstore.hpp b/searchlib/src/vespa/searchlib/attribute/enumstore.hpp
index c0eebee8e94..85cf676182e 100644
--- a/searchlib/src/vespa/searchlib/attribute/enumstore.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/enumstore.hpp
@@ -77,7 +77,6 @@ EnumStoreT<EntryT>::EnumStoreT(bool has_postings, const DictionaryConfig& dict_c
     : _store(std::move(memory_allocator)),
       _dict(),
       _is_folded(dict_cfg.getMatch() == DictionaryConfig::Match::UNCASED),
-      _comparator(_store.get_data_store()),
       _foldedComparator(make_optionally_folded_comparator(is_folded())),
       _compaction_spec(),
       _default_value(default_value),