summaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-03-23 17:03:28 +0100
committerGitHub <noreply@github.com>2021-03-23 17:03:28 +0100
commitf8cf0739f35de7b8da799e5206421ec5dc66df49 (patch)
tree9820da3e8def61610631d1ca4e978a10471cc50f /searchlib
parent2da65b6a987716d59a27a720a03f34fc6c9a596b (diff)
parentf86aedaee7c84fff85bd97099b7e08db3e4d5313 (diff)
Merge pull request #17122 from vespa-engine/balder/orderting-2-type
Balder/orderting 2 type
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp18
-rw-r--r--searchlib/src/tests/attribute/enumstore/enumstore_test.cpp38
-rw-r--r--searchlib/src/vespa/searchlib/attribute/configconverter.cpp18
-rw-r--r--searchlib/src/vespa/searchlib/attribute/enumattribute.hpp2
-rw-r--r--searchlib/src/vespa/searchlib/attribute/enumstore.cpp7
-rw-r--r--searchlib/src/vespa/searchlib/attribute/enumstore.h8
-rw-r--r--searchlib/src/vespa/searchlib/attribute/enumstore.hpp4
7 files changed, 50 insertions, 45 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 3690533eef9..d999a6f37a2 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, DictionaryConfig::Ordering::ORDERED);
+ NumericEnumStore es(false, DictionaryConfig::Type::BTREE);
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, DictionaryConfig::Ordering::ORDERED);
+ NumericEnumStore es(false, DictionaryConfig::Type::BTREE);
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, DictionaryConfig::Ordering::ORDERED);
+ FloatEnumStore es(false, DictionaryConfig::Type::BTREE);
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, DictionaryConfig::Ordering::ORDERED);
+ FloatEnumStore es(false, DictionaryConfig::Type::BTREE);
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, DictionaryConfig::Ordering::ORDERED);
+ StringEnumStore es(false, DictionaryConfig::Type::BTREE);
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, DictionaryConfig::Ordering::ORDERED);
+ StringEnumStore es(false, DictionaryConfig::Type::BTREE);
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, DictionaryConfig::Ordering::ORDERED);
+ NumericEnumStore es(false, DictionaryConfig::Type::BTREE);
vespalib::GenerationHandler g;
TreeType t;
NodeAllocator m;
@@ -152,7 +152,7 @@ TEST("requireThatComparatorWithTreeIsWorking")
TEST("requireThatFoldedLessIsWorking")
{
- StringEnumStore es(false, DictionaryConfig::Ordering::ORDERED);
+ StringEnumStore es(false, DictionaryConfig::Type::BTREE);
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, DictionaryConfig::Ordering::ORDERED);
+ StringEnumStore es(false, DictionaryConfig::Type::BTREE);
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 769a0d86343..8ce3de52521 100644
--- a/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp
+++ b/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp
@@ -6,7 +6,7 @@
#include <vespa/log/log.h>
LOG_SETUP("enumstore_test");
-using Ordering = search::DictionaryConfig::Ordering;
+using Type = search::DictionaryConfig::Type;
using vespalib::datastore::EntryRef;
namespace search {
@@ -19,42 +19,42 @@ using StringEnumStore = EnumStoreT<const char*>;
struct OrderedDoubleEnumStore {
using EnumStoreType = DoubleEnumStore;
- static constexpr Ordering ordering = Ordering::ORDERED;
+ static constexpr Type type = Type::BTREE;
};
struct UnorderedDoubleEnumStore {
using EnumStoreType = DoubleEnumStore;
- static constexpr Ordering ordering = Ordering::UNORDERED;
+ static constexpr Type type = Type::BTREE_AND_HASH;
};
struct OrderedFloatEnumStore {
using EnumStoreType = FloatEnumStore;
- static constexpr Ordering ordering = Ordering::ORDERED;
+ static constexpr Type type = Type::BTREE;
};
struct UnorderedFloatEnumStore {
using EnumStoreType = FloatEnumStore;
- static constexpr Ordering ordering = Ordering::UNORDERED;
+ static constexpr Type type = Type::BTREE_AND_HASH;
};
struct OrderedNumericEnumStore {
using EnumStoreType = NumericEnumStore;
- static constexpr Ordering ordering = Ordering::ORDERED;
+ static constexpr Type type = Type::BTREE;
};
struct UnorderedNumericEnumStore {
using EnumStoreType = NumericEnumStore;
- static constexpr Ordering ordering = Ordering::UNORDERED;
+ static constexpr Type type = Type::BTREE_AND_HASH;
};
struct OrderedStringEnumStore {
using EnumStoreType = StringEnumStore;
- static constexpr Ordering ordering = Ordering::ORDERED;
+ static constexpr Type type = Type::BTREE;
};
struct UnorderedStringEnumStore {
using EnumStoreType = StringEnumStore;
- static constexpr Ordering ordering = Ordering::UNORDERED;
+ static constexpr Type type = Type::BTREE_AND_HASH;
};
using StringVector = std::vector<std::string>;
@@ -106,7 +106,7 @@ public:
using EnumStoreType = typename EnumStoreTypeAndOrdering::EnumStoreType;
EnumStoreType es;
FloatEnumStoreTest()
- : es(false, EnumStoreTypeAndOrdering::ordering)
+ : es(false, EnumStoreTypeAndOrdering::type)
{}
};
@@ -150,7 +150,7 @@ TYPED_TEST(FloatEnumStoreTest, numbers_can_be_inserted_and_retrieved)
TEST(EnumStoreTest, test_find_folded_on_string_enum_store)
{
- StringEnumStore ses(false, DictionaryConfig::Ordering::ORDERED);
+ StringEnumStore ses(false, DictionaryConfig::Type::BTREE);
std::vector<EnumIndex> indices;
std::vector<std::string> unique({"", "one", "two", "TWO", "Two", "three"});
for (std::string &str : unique) {
@@ -201,7 +201,7 @@ public:
void
StringEnumStoreTest::testInsert(bool hasPostings)
{
- StringEnumStore ses(hasPostings, DictionaryConfig::Ordering::ORDERED);
+ StringEnumStore ses(hasPostings, DictionaryConfig::Type::BTREE);
std::vector<EnumIndex> indices;
std::vector<std::string> unique;
@@ -251,7 +251,7 @@ TEST_F(StringEnumStoreTest, test_insert_on_store_with_posting_lists)
TEST(EnumStoreTest, test_hold_lists_and_generation)
{
- StringEnumStore ses(false, DictionaryConfig::Ordering::ORDERED);
+ StringEnumStore ses(false, DictionaryConfig::Type::BTREE);
StringVector uniques;
generation_t sesGen = 0u;
uniques.reserve(100);
@@ -328,7 +328,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, DictionaryConfig::Ordering::ORDERED);
+ NumericEnumStore store(false, DictionaryConfig::Type::BTREE);
using vespalib::AddressSpace;
EXPECT_EQ(AddressSpace(1, 1, ADDRESS_LIMIT), store.get_address_space_usage());
@@ -350,7 +350,7 @@ public:
EnumIndex i5;
BatchUpdaterTest()
- : store(false, DictionaryConfig::Ordering::ORDERED),
+ : store(false, DictionaryConfig::Type::BTREE),
i3(),
i5()
{
@@ -458,7 +458,7 @@ public:
using Values = LoaderTestValues<EnumStoreType>;
LoaderTest()
- : store(true, EnumStoreTypeAndOrdering::ordering)
+ : store(true, EnumStoreTypeAndOrdering::type)
{}
void load_values(enumstore::EnumeratedLoaderBase& loader) const {
@@ -570,7 +570,7 @@ public:
EnumStoreType store;
EnumStoreDictionaryTest()
- : store(true, EnumStoreTypeAndOrdering::ordering)
+ : store(true, EnumStoreTypeAndOrdering::type)
{}
// Reuse test values from LoaderTest
@@ -618,7 +618,7 @@ TYPED_TEST(EnumStoreDictionaryTest, find_frozen_index_works)
this->update_posting_idx(value_0_idx, EntryRef(), this->fake_pidx());
auto& dict = this->store.get_dictionary();
EnumIndex idx;
- if (TypeParam::ordering == Ordering::ORDERED) {
+ if (TypeParam::type == Type::BTREE) {
EXPECT_FALSE(dict.find_frozen_index(this->make_bound_comparator(0), idx));
} else {
EXPECT_TRUE(dict.find_frozen_index(this->make_bound_comparator(0), idx));
@@ -640,7 +640,7 @@ TYPED_TEST(EnumStoreDictionaryTest, find_posting_list_works)
auto& dict = this->store.get_dictionary();
auto root = dict.get_frozen_root();
auto find_result = dict.find_posting_list(this->make_bound_comparator(0), root);
- if (TypeParam::ordering == Ordering::ORDERED) {
+ if (TypeParam::type == Type::BTREE) {
EXPECT_FALSE(find_result.first.valid());
EXPECT_FALSE(find_result.second.valid());
} else {
diff --git a/searchlib/src/vespa/searchlib/attribute/configconverter.cpp b/searchlib/src/vespa/searchlib/attribute/configconverter.cpp
index 145a021801d..2e946c7d34b 100644
--- a/searchlib/src/vespa/searchlib/attribute/configconverter.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/configconverter.cpp
@@ -50,20 +50,22 @@ getCollectionTypeMap()
static DataTypeMap _dataTypeMap = getDataTypeMap();
static CollectionTypeMap _collectionTypeMap = getCollectionTypeMap();
-DictionaryConfig::Ordering
-convert(AttributesConfig::Attribute::Dictionary::Ordering ordering_cfg) {
- switch (ordering_cfg) {
- case AttributesConfig::Attribute::Dictionary::Ordering::ORDERED:
- return DictionaryConfig::Ordering::ORDERED;
- case AttributesConfig::Attribute::Dictionary::Ordering::UNORDERED:
- return DictionaryConfig::Ordering::UNORDERED;
+DictionaryConfig::Type
+convert(AttributesConfig::Attribute::Dictionary::Type type_cfg) {
+ switch (type_cfg) {
+ case AttributesConfig::Attribute::Dictionary::Type::BTREE:
+ return DictionaryConfig::Type::BTREE;
+ case AttributesConfig::Attribute::Dictionary::Type::HASH:
+ return DictionaryConfig::Type::HASH;
+ case AttributesConfig::Attribute::Dictionary::Type::BTREE_AND_HASH:
+ return DictionaryConfig::Type::BTREE_AND_HASH;
}
assert(false);
}
DictionaryConfig
convert_dictionary(const AttributesConfig::Attribute::Dictionary & dictionary) {
- return DictionaryConfig(convert(dictionary.ordering));
+ return DictionaryConfig(convert(dictionary.type));
}
}
diff --git a/searchlib/src/vespa/searchlib/attribute/enumattribute.hpp b/searchlib/src/vespa/searchlib/attribute/enumattribute.hpp
index dc501dc9d89..fd523e227b0 100644
--- a/searchlib/src/vespa/searchlib/attribute/enumattribute.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/enumattribute.hpp
@@ -13,7 +13,7 @@ EnumAttribute<B>::
EnumAttribute(const vespalib::string &baseFileName,
const AttributeVector::Config &cfg)
: B(baseFileName, cfg),
- _enumStore(cfg.fastSearch(), cfg.get_dictionary_config().getOrdering())
+ _enumStore(cfg.fastSearch(), cfg.get_dictionary_config().getType())
{
this->setEnum(true);
}
diff --git a/searchlib/src/vespa/searchlib/attribute/enumstore.cpp b/searchlib/src/vespa/searchlib/attribute/enumstore.cpp
index 0961f7c87f1..5beafea0046 100644
--- a/searchlib/src/vespa/searchlib/attribute/enumstore.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/enumstore.cpp
@@ -42,14 +42,15 @@ EnumStoreT<const char*>::load_unique_value(const void* src,
}
std::unique_ptr<vespalib::datastore::IUniqueStoreDictionary>
-make_enum_store_dictionary(IEnumStore &store, bool has_postings, search::DictionaryConfig::Ordering ordering, std::unique_ptr<vespalib::datastore::EntryComparator> compare, std::unique_ptr<vespalib::datastore::EntryComparator> folded_compare)
+make_enum_store_dictionary(IEnumStore &store, bool has_postings, search::DictionaryConfig::Type type, std::unique_ptr<vespalib::datastore::EntryComparator> compare, std::unique_ptr<vespalib::datastore::EntryComparator> folded_compare)
{
if (has_postings) {
if (folded_compare) {
return std::make_unique<EnumStoreFoldedDictionary>(store, std::move(compare), std::move(folded_compare));
} else {
- switch (ordering) {
- case search::DictionaryConfig::Ordering::UNORDERED:
+ switch (type) {
+ case search::DictionaryConfig::Type::HASH:
+ case search::DictionaryConfig::Type::BTREE_AND_HASH:
return std::make_unique<EnumStoreDictionary<EnumPostingTree, vespalib::datastore::SimpleHashMap>>(store, std::move(compare));
default:
return std::make_unique<EnumStoreDictionary<EnumPostingTree>>(store, std::move(compare));
diff --git a/searchlib/src/vespa/searchlib/attribute/enumstore.h b/searchlib/src/vespa/searchlib/attribute/enumstore.h
index dc75ac1f38b..02b2ec019f6 100644
--- a/searchlib/src/vespa/searchlib/attribute/enumstore.h
+++ b/searchlib/src/vespa/searchlib/attribute/enumstore.h
@@ -74,8 +74,8 @@ private:
ssize_t load_unique_value(const void* src, size_t available, Index& idx);
public:
- EnumStoreT(bool has_postings, search::DictionaryConfig::Ordering ordering);
- virtual ~EnumStoreT();
+ EnumStoreT(bool has_postings, search::DictionaryConfig::Type type);
+ ~EnumStoreT() override;
uint32_t get_ref_count(Index idx) const { return get_entry_base(idx).get_ref_count(); }
void inc_ref_count(Index idx) { return get_entry_base(idx).inc_ref_count(); }
@@ -213,7 +213,9 @@ public:
};
std::unique_ptr<vespalib::datastore::IUniqueStoreDictionary>
-make_enum_store_dictionary(IEnumStore &store, bool has_postings, search::DictionaryConfig::Ordering ordering, std::unique_ptr<vespalib::datastore::EntryComparator> compare, std::unique_ptr<vespalib::datastore::EntryComparator> folded_compare);
+make_enum_store_dictionary(IEnumStore &store, bool has_postings, search::DictionaryConfig::Type type,
+ std::unique_ptr<vespalib::datastore::EntryComparator> compare,
+ std::unique_ptr<vespalib::datastore::EntryComparator> folded_compare);
template <>
diff --git a/searchlib/src/vespa/searchlib/attribute/enumstore.hpp b/searchlib/src/vespa/searchlib/attribute/enumstore.hpp
index 22f0d3e50dc..357026ab944 100644
--- a/searchlib/src/vespa/searchlib/attribute/enumstore.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/enumstore.hpp
@@ -72,13 +72,13 @@ EnumStoreT<EntryT>::load_unique_value(const void* src, size_t available, Index&
}
template <typename EntryT>
-EnumStoreT<EntryT>::EnumStoreT(bool has_postings, search::DictionaryConfig::Ordering ordering)
+EnumStoreT<EntryT>::EnumStoreT(bool has_postings, search::DictionaryConfig::Type type)
: _store(),
_dict(),
_cached_values_memory_usage(),
_cached_values_address_space_usage(0, 0, (1ull << 32))
{
- _store.set_dictionary(make_enum_store_dictionary(*this, has_postings, ordering,
+ _store.set_dictionary(make_enum_store_dictionary(*this, has_postings, type,
std::make_unique<ComparatorType>(_store.get_data_store()),
(has_string_type() ?
std::make_unique<FoldedComparatorType>(_store.get_data_store()) :