Use BTREE/HASH instead of ORDERED/UNORDERED.

3 files changed, 31 insertions, 27 deletions

diff --git a/searchcommon/src/tests/attribute/config/attribute_config_test.cpp b/searchcommon/src/tests/attribute/config/attribute_config_test.cpp
index 3dc1cf6d27e..98b2bfe5c90 100644
--- a/searchcommon/src/tests/attribute/config/attribute_config_test.cpp
+++ b/searchcommon/src/tests/attribute/config/attribute_config_test.cpp
@@ -110,22 +110,24 @@ TEST("Test GrowStrategy consistency") {
 }
 
 TEST("DictionaryConfig") {
-    using Ordering = DictionaryConfig::Ordering;
-    EXPECT_EQUAL(Ordering::ORDERED, DictionaryConfig().getOrdering());
-    EXPECT_EQUAL(Ordering::ORDERED, DictionaryConfig(Ordering::ORDERED).getOrdering());
-    EXPECT_EQUAL(Ordering::UNORDERED, DictionaryConfig(Ordering::UNORDERED).getOrdering());
-    EXPECT_EQUAL(DictionaryConfig(Ordering::ORDERED), DictionaryConfig(Ordering::ORDERED));
-    EXPECT_EQUAL(DictionaryConfig(Ordering::UNORDERED), DictionaryConfig(Ordering::UNORDERED));
-    EXPECT_NOT_EQUAL(DictionaryConfig(Ordering::UNORDERED), DictionaryConfig(Ordering::ORDERED));
-    EXPECT_NOT_EQUAL(DictionaryConfig(Ordering::ORDERED), DictionaryConfig(Ordering::UNORDERED));
-    EXPECT_TRUE(Config().set_dictionary_config(DictionaryConfig(Ordering::UNORDERED)) ==
-                 Config().set_dictionary_config(DictionaryConfig(Ordering::UNORDERED)));
-    EXPECT_FALSE(Config().set_dictionary_config(DictionaryConfig(Ordering::UNORDERED)) ==
-                     Config().set_dictionary_config(DictionaryConfig(Ordering::ORDERED)));
-    EXPECT_FALSE(Config().set_dictionary_config(DictionaryConfig(Ordering::UNORDERED)) !=
-                Config().set_dictionary_config(DictionaryConfig(Ordering::UNORDERED)));
-    EXPECT_TRUE(Config().set_dictionary_config(DictionaryConfig(Ordering::UNORDERED)) !=
-                 Config().set_dictionary_config(DictionaryConfig(Ordering::ORDERED)));
+    using Type = DictionaryConfig::Type;
+    EXPECT_EQUAL(Type::BTREE, DictionaryConfig().getType());
+    EXPECT_EQUAL(Type::BTREE, DictionaryConfig(Type::BTREE).getType());
+    EXPECT_EQUAL(Type::HASH, DictionaryConfig(Type::HASH).getType());
+    EXPECT_EQUAL(Type::BTREE_AND_HASH, DictionaryConfig(Type::BTREE_AND_HASH).getType());
+    EXPECT_EQUAL(DictionaryConfig(Type::BTREE), DictionaryConfig(Type::BTREE));
+    EXPECT_EQUAL(DictionaryConfig(Type::HASH), DictionaryConfig(Type::HASH));
+    EXPECT_EQUAL(DictionaryConfig(Type::BTREE_AND_HASH), DictionaryConfig(Type::BTREE_AND_HASH));
+    EXPECT_NOT_EQUAL(DictionaryConfig(Type::HASH), DictionaryConfig(Type::BTREE));
+    EXPECT_NOT_EQUAL(DictionaryConfig(Type::BTREE), DictionaryConfig(Type::HASH));
+    EXPECT_TRUE(Config().set_dictionary_config(DictionaryConfig(Type::HASH)) ==
+                Config().set_dictionary_config(DictionaryConfig(Type::HASH)));
+    EXPECT_FALSE(Config().set_dictionary_config(DictionaryConfig(Type::HASH)) ==
+                 Config().set_dictionary_config(DictionaryConfig(Type::BTREE)));
+    EXPECT_FALSE(Config().set_dictionary_config(DictionaryConfig(Type::HASH)) !=
+                 Config().set_dictionary_config(DictionaryConfig(Type::HASH)));
+    EXPECT_TRUE(Config().set_dictionary_config(DictionaryConfig(Type::HASH)) !=
+                Config().set_dictionary_config(DictionaryConfig(Type::BTREE)));
 }
 
 
diff --git a/searchcommon/src/vespa/searchcommon/common/dictionary_config.cpp b/searchcommon/src/vespa/searchcommon/common/dictionary_config.cpp
index 00b6ae2710f..a6a0255f96d 100644
--- a/searchcommon/src/vespa/searchcommon/common/dictionary_config.cpp
+++ b/searchcommon/src/vespa/searchcommon/common/dictionary_config.cpp
@@ -8,11 +8,13 @@ namespace search {
 
 std::ostream&
 operator<<(std::ostream& os, const DictionaryConfig & cfg) {
-    switch(cfg.getOrdering()) {
-        case DictionaryConfig::Ordering::ORDERED:
-        return os << "ORDERED";
-        case DictionaryConfig::Ordering::UNORDERED:
-        return os << "UNORDERED";
+    switch(cfg.getType()) {
+    case DictionaryConfig::Type::BTREE:
+        return os << "BTREE";
+    case DictionaryConfig::Type::HASH:
+        return os << "HASH";
+    case DictionaryConfig::Type::BTREE_AND_HASH:
+        return os << "BTREE_AND_HASH";
     }
     assert(false);
 }
diff --git a/searchcommon/src/vespa/searchcommon/common/dictionary_config.h b/searchcommon/src/vespa/searchcommon/common/dictionary_config.h
index 06c88d88670..c35f7eaafef 100644
--- a/searchcommon/src/vespa/searchcommon/common/dictionary_config.h
+++ b/searchcommon/src/vespa/searchcommon/common/dictionary_config.h
@@ -11,13 +11,13 @@ namespace search {
  */
 class DictionaryConfig {
 public:
-    enum class Ordering { ORDERED, UNORDERED };
-    DictionaryConfig() noexcept : _ordering(Ordering::ORDERED) {}
-    DictionaryConfig(Ordering ordering) noexcept : _ordering(ordering) {}
-    Ordering getOrdering() const { return _ordering; }
-    bool operator == (const DictionaryConfig & b) const { return _ordering == b._ordering; }
+    enum class Type { BTREE, HASH, BTREE_AND_HASH };
+    DictionaryConfig() noexcept : _type(Type::BTREE) {}
+    DictionaryConfig(Type ordering) noexcept : _type(ordering) {}
+    Type getType() const { return _type; }
+    bool operator == (const DictionaryConfig & b) const { return _type == b._type; }
 private:
-    Ordering _ordering;
+    Type _type;
 };
 
 std::ostream& operator<<(std::ostream& os, const DictionaryConfig & cfg);