Wire in ordering enum in EnumStore.

2 files changed, 16 insertions, 16 deletions

diff --git a/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp b/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp
index 087968ff8d9..3690533eef9 100644
--- a/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp
+++ b/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp
@@ -27,7 +27,7 @@ using NodeAllocator = TreeType::NodeAllocatorType;
 
 TEST("requireThatNumericLessIsWorking")
 {
-    NumericEnumStore es(false);
+    NumericEnumStore es(false, DictionaryConfig::Ordering::ORDERED);
     EnumIndex e1 = es.insert(10);
     EnumIndex e2 = es.insert(30);
     auto cmp1 = es.make_comparator();
@@ -41,7 +41,7 @@ TEST("requireThatNumericLessIsWorking")
 
 TEST("requireThatNumericEqualIsWorking")
 {
-    NumericEnumStore es(false);
+    NumericEnumStore es(false, DictionaryConfig::Ordering::ORDERED);
     EnumIndex e1 = es.insert(10);
     EnumIndex e2 = es.insert(30);
     auto cmp1 = es.make_comparator();
@@ -56,7 +56,7 @@ TEST("requireThatNumericEqualIsWorking")
 
 TEST("requireThatFloatLessIsWorking")
 {
-    FloatEnumStore es(false);
+    FloatEnumStore es(false, DictionaryConfig::Ordering::ORDERED);
     EnumIndex e1 = es.insert(10.5);
     EnumIndex e2 = es.insert(30.5);
     EnumIndex e3 = es.insert(std::numeric_limits<float>::quiet_NaN());
@@ -74,7 +74,7 @@ TEST("requireThatFloatLessIsWorking")
 
 TEST("requireThatFloatEqualIsWorking")
 {
-    FloatEnumStore es(false);
+    FloatEnumStore es(false, DictionaryConfig::Ordering::ORDERED);
     EnumIndex e1 = es.insert(10.5);
     EnumIndex e2 = es.insert(30.5);
     EnumIndex e3 = es.insert(std::numeric_limits<float>::quiet_NaN());
@@ -93,7 +93,7 @@ TEST("requireThatFloatEqualIsWorking")
 
 TEST("requireThatStringLessIsWorking")
 {
-    StringEnumStore es(false);
+    StringEnumStore es(false, DictionaryConfig::Ordering::ORDERED);
     EnumIndex e1 = es.insert("Aa");
     EnumIndex e2 = es.insert("aa");
     EnumIndex e3 = es.insert("aB");
@@ -110,7 +110,7 @@ TEST("requireThatStringLessIsWorking")
 
 TEST("requireThatStringEqualIsWorking")
 {
-    StringEnumStore es(false);
+    StringEnumStore es(false, DictionaryConfig::Ordering::ORDERED);
     EnumIndex e1 = es.insert("Aa");
     EnumIndex e2 = es.insert("aa");
     EnumIndex e3 = es.insert("aB");
@@ -127,7 +127,7 @@ TEST("requireThatStringEqualIsWorking")
 
 TEST("requireThatComparatorWithTreeIsWorking")
 {
-    NumericEnumStore es(false);
+    NumericEnumStore es(false, DictionaryConfig::Ordering::ORDERED);
     vespalib::GenerationHandler g;
     TreeType t;
     NodeAllocator m;
@@ -152,7 +152,7 @@ TEST("requireThatComparatorWithTreeIsWorking")
 
 TEST("requireThatFoldedLessIsWorking")
 {
-    StringEnumStore es(false);
+    StringEnumStore es(false, DictionaryConfig::Ordering::ORDERED);
     EnumIndex e1 = es.insert("Aa");
     EnumIndex e2 = es.insert("aa");
     EnumIndex e3 = es.insert("aB");
@@ -172,7 +172,7 @@ TEST("requireThatFoldedLessIsWorking")
 
 TEST("requireThatFoldedEqualIsWorking")
 {
-    StringEnumStore es(false);
+    StringEnumStore es(false, DictionaryConfig::Ordering::ORDERED);
     EnumIndex e1 = es.insert("Aa");
     EnumIndex e2 = es.insert("aa");
     EnumIndex e3 = es.insert("aB");
diff --git a/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp b/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp
index 43e694f0bcd..00b13e1eabb 100644
--- a/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp
+++ b/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp
@@ -61,7 +61,7 @@ class FloatEnumStoreTest : public ::testing::Test {
 public:
     EnumStoreT es;
     FloatEnumStoreTest()
-        : es(false)
+        : es(false, DictionaryConfig::Ordering::ORDERED)
     {}
 };
 
@@ -105,7 +105,7 @@ TYPED_TEST(FloatEnumStoreTest, numbers_can_be_inserted_and_retrieved)
 
 TEST(EnumStoreTest, test_find_folded_on_string_enum_store)
 {
-    StringEnumStore ses(false);
+    StringEnumStore ses(false, DictionaryConfig::Ordering::ORDERED);
     std::vector<EnumIndex> indices;
     std::vector<std::string> unique({"", "one", "two", "TWO", "Two", "three"});
     for (std::string &str : unique) {
@@ -156,7 +156,7 @@ public:
 void
 StringEnumStoreTest::testInsert(bool hasPostings)
 {
-    StringEnumStore ses(hasPostings);
+    StringEnumStore ses(hasPostings, DictionaryConfig::Ordering::ORDERED);
 
     std::vector<EnumIndex> indices;
     std::vector<std::string> unique;
@@ -206,7 +206,7 @@ TEST_F(StringEnumStoreTest, test_insert_on_store_with_posting_lists)
 
 TEST(EnumStoreTest, test_hold_lists_and_generation)
 {
-    StringEnumStore ses(false);
+    StringEnumStore ses(false, DictionaryConfig::Ordering::ORDERED);
     StringVector uniques;
     generation_t sesGen = 0u;
     uniques.reserve(100);
@@ -283,7 +283,7 @@ dec_ref_count(NumericEnumStore& store, NumericEnumStore::Index idx)
 TEST(EnumStoreTest, address_space_usage_is_reported)
 {
     const size_t ADDRESS_LIMIT = 4290772994; // Max allocated elements in un-allocated buffers + allocated elements in allocated buffers.
-    NumericEnumStore store(false);
+    NumericEnumStore store(false, DictionaryConfig::Ordering::ORDERED);
 
     using vespalib::AddressSpace;
     EXPECT_EQ(AddressSpace(1, 1, ADDRESS_LIMIT), store.get_address_space_usage());
@@ -305,7 +305,7 @@ public:
     EnumIndex i5;
 
     BatchUpdaterTest()
-        : store(false),
+        : store(false, DictionaryConfig::Ordering::ORDERED),
           i3(),
           i5()
     {
@@ -383,7 +383,7 @@ public:
     static std::vector<EntryType> values;
 
     LoaderTest()
-        : store(true)
+        : store(true, DictionaryConfig::Ordering::ORDERED)
     {}
 
     void load_values(enumstore::EnumeratedLoaderBase& loader) const {