diff options
-rw-r--r-- | searchlib/src/tests/attribute/enumstore/enumstore_test.cpp | 48 | ||||
-rw-r--r-- | vespalib/src/tests/datastore/unique_store/unique_store_test.cpp | 32 |
2 files changed, 40 insertions, 40 deletions
diff --git a/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp b/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp index 2499a219de3..0f15c288f63 100644 --- a/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp +++ b/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp @@ -17,7 +17,7 @@ using FloatEnumStore = EnumStoreT<float>; using NumericEnumStore = EnumStoreT<int32_t>; using StringEnumStore = EnumStoreT<const char*>; -struct OrderedDoubleEnumStore { +struct BTreeDoubleEnumStore { using EnumStoreType = DoubleEnumStore; static constexpr Type type = Type::BTREE; }; @@ -27,12 +27,12 @@ struct HybridDoubleEnumStore { static constexpr Type type = Type::BTREE_AND_HASH; }; -struct UnorderedDoubleEnumStore { +struct HashDoubleEnumStore { using EnumStoreType = DoubleEnumStore; static constexpr Type type = Type::HASH; }; -struct OrderedFloatEnumStore { +struct BTreeFloatEnumStore { using EnumStoreType = FloatEnumStore; static constexpr Type type = Type::BTREE; }; @@ -42,12 +42,12 @@ struct HybridFloatEnumStore { static constexpr Type type = Type::BTREE_AND_HASH; }; -struct UnorderedFloatEnumStore { +struct HashFloatEnumStore { using EnumStoreType = FloatEnumStore; static constexpr Type type = Type::HASH; }; -struct OrderedNumericEnumStore { +struct BTreeNumericEnumStore { using EnumStoreType = NumericEnumStore; static constexpr Type type = Type::BTREE; }; @@ -57,12 +57,12 @@ struct HybridNumericEnumStore { static constexpr Type type = Type::BTREE_AND_HASH; }; -struct UnorderedNumericEnumStore { +struct HashNumericEnumStore { using EnumStoreType = NumericEnumStore; static constexpr Type type = Type::HASH; }; -struct OrderedStringEnumStore { +struct BTreeStringEnumStore { using EnumStoreType = StringEnumStore; static constexpr Type type = Type::BTREE; }; @@ -72,7 +72,7 @@ struct HybridStringEnumStore { static constexpr Type type = Type::BTREE_AND_HASH; }; -struct UnorderedStringEnumStore { +struct HashStringEnumStore { using EnumStoreType = StringEnumStore; static constexpr Type type = Type::HASH; }; @@ -120,13 +120,13 @@ checkReaders(const StringEnumStore& ses, } } -template <typename EnumStoreTypeAndOrdering> +template <typename EnumStoreTypeAndDictionaryType> class FloatEnumStoreTest : public ::testing::Test { public: - using EnumStoreType = typename EnumStoreTypeAndOrdering::EnumStoreType; + using EnumStoreType = typename EnumStoreTypeAndDictionaryType::EnumStoreType; EnumStoreType es; FloatEnumStoreTest() - : es(false, EnumStoreTypeAndOrdering::type) + : es(false, EnumStoreTypeAndDictionaryType::type) {} }; @@ -136,7 +136,7 @@ public: #pragma GCC diagnostic ignored "-Wsuggest-override" #endif -using FloatEnumStoreTestTypes = ::testing::Types<OrderedFloatEnumStore, OrderedDoubleEnumStore, HybridFloatEnumStore, HybridDoubleEnumStore, UnorderedFloatEnumStore, UnorderedDoubleEnumStore>; +using FloatEnumStoreTestTypes = ::testing::Types<BTreeFloatEnumStore, BTreeDoubleEnumStore, HybridFloatEnumStore, HybridDoubleEnumStore, HashFloatEnumStore, HashDoubleEnumStore>; VESPA_GTEST_TYPED_TEST_SUITE(FloatEnumStoreTest, FloatEnumStoreTestTypes); TYPED_TEST(FloatEnumStoreTest, numbers_can_be_inserted_and_retrieved) @@ -464,16 +464,16 @@ LoaderTestValues<StringEnumStore>::load_values(enumstore::EnumeratedLoaderBase& loader.load_unique_values(raw_values.data(), raw_values.size()); } -template <typename EnumStoreTypeAndOrdering> +template <typename EnumStoreTypeAndDictionaryType> class LoaderTest : public ::testing::Test { public: - using EnumStoreType = typename EnumStoreTypeAndOrdering::EnumStoreType; + using EnumStoreType = typename EnumStoreTypeAndDictionaryType::EnumStoreType; using EntryType = typename EnumStoreType::EntryType; EnumStoreType store; using Values = LoaderTestValues<EnumStoreType>; LoaderTest() - : store(true, EnumStoreTypeAndOrdering::type) + : store(true, EnumStoreTypeAndDictionaryType::type) {} void load_values(enumstore::EnumeratedLoaderBase& loader) const { @@ -525,7 +525,7 @@ public: #pragma GCC diagnostic ignored "-Wsuggest-override" #endif -using LoaderTestTypes = ::testing::Types<OrderedNumericEnumStore, OrderedFloatEnumStore, OrderedStringEnumStore, HybridNumericEnumStore, HybridFloatEnumStore, HybridStringEnumStore, UnorderedNumericEnumStore, UnorderedFloatEnumStore, UnorderedStringEnumStore>; +using LoaderTestTypes = ::testing::Types<BTreeNumericEnumStore, BTreeFloatEnumStore, BTreeStringEnumStore, HybridNumericEnumStore, HybridFloatEnumStore, HybridStringEnumStore, HashNumericEnumStore, HashFloatEnumStore, HashStringEnumStore>; VESPA_GTEST_TYPED_TEST_SUITE(LoaderTest, LoaderTestTypes); TYPED_TEST(LoaderTest, store_is_instantiated_with_enumerated_loader) @@ -579,15 +579,15 @@ TYPED_TEST(LoaderTest, store_is_instantiated_with_non_enumerated_loader) #pragma GCC diagnostic pop -template <typename EnumStoreTypeAndOrdering> +template <typename EnumStoreTypeAndDictionaryType> class EnumStoreDictionaryTest : public ::testing::Test { public: - using EnumStoreType = typename EnumStoreTypeAndOrdering::EnumStoreType; + using EnumStoreType = typename EnumStoreTypeAndDictionaryType::EnumStoreType; using EntryType = typename EnumStoreType::EntryType; EnumStoreType store; EnumStoreDictionaryTest() - : store(true, EnumStoreTypeAndOrdering::type) + : store(true, EnumStoreTypeAndDictionaryType::type) {} // Reuse test values from LoaderTest @@ -600,9 +600,9 @@ public: static EntryRef fake_pidx() { return EntryRef(42); } }; -template <typename EnumStoreTypeAndOrdering> +template <typename EnumStoreTypeAndDictionaryType> void -EnumStoreDictionaryTest<EnumStoreTypeAndOrdering>::update_posting_idx(EnumIndex enum_idx, EntryRef old_posting_idx, EntryRef new_posting_idx) +EnumStoreDictionaryTest<EnumStoreTypeAndDictionaryType>::update_posting_idx(EnumIndex enum_idx, EntryRef old_posting_idx, EntryRef new_posting_idx) { auto& dict = store.get_dictionary(); EntryRef old_posting_idx_check; @@ -610,9 +610,9 @@ EnumStoreDictionaryTest<EnumStoreTypeAndOrdering>::update_posting_idx(EnumIndex EXPECT_EQ(old_posting_idx, old_posting_idx_check); } -template <typename EnumStoreTypeAndOrdering> +template <typename EnumStoreTypeAndDictionaryType> EnumIndex -EnumStoreDictionaryTest<EnumStoreTypeAndOrdering>::insert_value(size_t value_idx) +EnumStoreDictionaryTest<EnumStoreTypeAndDictionaryType>::insert_value(size_t value_idx) { assert(value_idx < values().size()); auto enum_idx = store.insert(values()[value_idx]); @@ -626,7 +626,7 @@ EnumStoreDictionaryTest<EnumStoreTypeAndOrdering>::insert_value(size_t value_idx #pragma GCC diagnostic ignored "-Wsuggest-override" #endif -using EnumStoreDictionaryTestTypes = ::testing::Types<OrderedNumericEnumStore, HybridNumericEnumStore, UnorderedNumericEnumStore>; +using EnumStoreDictionaryTestTypes = ::testing::Types<BTreeNumericEnumStore, HybridNumericEnumStore, HashNumericEnumStore>; VESPA_GTEST_TYPED_TEST_SUITE(EnumStoreDictionaryTest, EnumStoreDictionaryTestTypes); TYPED_TEST(EnumStoreDictionaryTest, find_frozen_index_works) diff --git a/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp b/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp index 57fe326342d..e61713e40d8 100644 --- a/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp +++ b/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp @@ -184,31 +184,31 @@ std::vector<const char *> TestBaseValues<CStringUniqueStore>::values{ "aa", "bbb template <> std::vector<double> TestBaseValues<DoubleUniqueStore>::values{ 10.0, 20.0, 30.0, 10.0 }; -struct OrderedNumberUniqueStore +struct BTreeNumberUniqueStore { using UniqueStoreType = NumberUniqueStore; static constexpr DictionaryType dictionary_type = DictionaryType::BTREE; }; -struct OrderedStringUniqueStore +struct BTreeStringUniqueStore { using UniqueStoreType = StringUniqueStore; static constexpr DictionaryType dictionary_type = DictionaryType::BTREE; }; -struct OrderedCStringUniqueStore +struct BTreeCStringUniqueStore { using UniqueStoreType = CStringUniqueStore; static constexpr DictionaryType dictionary_type = DictionaryType::BTREE; }; -struct OrderedDoubleUniqueStore +struct BTreeDoubleUniqueStore { using UniqueStoreType = DoubleUniqueStore; static constexpr DictionaryType dictionary_type = DictionaryType::BTREE; }; -struct OrderedSmallOffsetNumberUniqueStore +struct BTreeSmallOffsetNumberUniqueStore { using UniqueStoreType = SmallOffsetNumberUniqueStore; static constexpr DictionaryType dictionary_type = DictionaryType::BTREE; @@ -244,37 +244,37 @@ struct HybridSmallOffsetNumberUniqueStore static constexpr DictionaryType dictionary_type = DictionaryType::BTREE_AND_HASH; }; -struct UnorderedNumberUniqueStore +struct HashNumberUniqueStore { using UniqueStoreType = NumberUniqueStore; static constexpr DictionaryType dictionary_type = DictionaryType::HASH; }; -struct UnorderedStringUniqueStore +struct HashStringUniqueStore { using UniqueStoreType = StringUniqueStore; static constexpr DictionaryType dictionary_type = DictionaryType::HASH; }; -struct UnorderedCStringUniqueStore +struct HashCStringUniqueStore { using UniqueStoreType = CStringUniqueStore; static constexpr DictionaryType dictionary_type = DictionaryType::HASH; }; -struct UnorderedDoubleUniqueStore +struct HashDoubleUniqueStore { using UniqueStoreType = DoubleUniqueStore; static constexpr DictionaryType dictionary_type = DictionaryType::HASH; }; -struct UnorderedSmallOffsetNumberUniqueStore +struct HashSmallOffsetNumberUniqueStore { using UniqueStoreType = SmallOffsetNumberUniqueStore; static constexpr DictionaryType dictionary_type = DictionaryType::HASH; }; -using UniqueStoreTestTypes = ::testing::Types<OrderedNumberUniqueStore, OrderedStringUniqueStore, OrderedCStringUniqueStore, OrderedDoubleUniqueStore, HybridNumberUniqueStore, HybridStringUniqueStore, HybridCStringUniqueStore, HybridDoubleUniqueStore, UnorderedNumberUniqueStore, UnorderedStringUniqueStore, UnorderedCStringUniqueStore, UnorderedDoubleUniqueStore>; +using UniqueStoreTestTypes = ::testing::Types<BTreeNumberUniqueStore, BTreeStringUniqueStore, BTreeCStringUniqueStore, BTreeDoubleUniqueStore, HybridNumberUniqueStore, HybridStringUniqueStore, HybridCStringUniqueStore, HybridDoubleUniqueStore, HashNumberUniqueStore, HashStringUniqueStore, HashCStringUniqueStore, HashDoubleUniqueStore>; VESPA_GTEST_TYPED_TEST_SUITE(TestBase, UniqueStoreTestTypes); // Disable warnings emitted by gtest generated files when using typed tests @@ -283,11 +283,11 @@ VESPA_GTEST_TYPED_TEST_SUITE(TestBase, UniqueStoreTestTypes); #pragma GCC diagnostic ignored "-Wsuggest-override" #endif -using NumberTest = TestBase<OrderedNumberUniqueStore>; -using StringTest = TestBase<OrderedStringUniqueStore>; -using CStringTest = TestBase<OrderedCStringUniqueStore>; -using DoubleTest = TestBase<OrderedDoubleUniqueStore>; -using SmallOffsetNumberTest = TestBase<OrderedSmallOffsetNumberUniqueStore>; +using NumberTest = TestBase<BTreeNumberUniqueStore>; +using StringTest = TestBase<BTreeStringUniqueStore>; +using CStringTest = TestBase<BTreeCStringUniqueStore>; +using DoubleTest = TestBase<BTreeDoubleUniqueStore>; +using SmallOffsetNumberTest = TestBase<BTreeSmallOffsetNumberUniqueStore>; TEST(UniqueStoreTest, trivial_and_non_trivial_types_are_tested) { |