diff options
author | Geir Storli <geirst@verizonmedia.com> | 2019-09-09 13:01:34 +0000 |
---|---|---|
committer | Geir Storli <geirst@verizonmedia.com> | 2019-09-09 13:02:17 +0000 |
commit | 60b59ca7215295d2349c0c0a9843fc4c4d559803 (patch) | |
tree | 94b44bd8c0fb6641e1c784f4706ec0bfaab8a762 /searchlib/src/tests | |
parent | f6af721145f1609bca2274970acbf314983fdc10 (diff) |
Remove wrapping of entry type in enum store.
Diffstat (limited to 'searchlib/src/tests')
-rw-r--r-- | searchlib/src/tests/attribute/comparator/comparator_test.cpp | 6 | ||||
-rw-r--r-- | searchlib/src/tests/attribute/enumstore/enumstore_test.cpp | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/searchlib/src/tests/attribute/comparator/comparator_test.cpp b/searchlib/src/tests/attribute/comparator/comparator_test.cpp index 0b709d44900..d935aaa30d2 100644 --- a/searchlib/src/tests/attribute/comparator/comparator_test.cpp +++ b/searchlib/src/tests/attribute/comparator/comparator_test.cpp @@ -15,9 +15,9 @@ namespace search { using namespace btree; -using NumericEnumStore = EnumStoreT<NumericEntryType<int32_t> >; -using FloatEnumStore = EnumStoreT<NumericEntryType<float> >; -using StringEnumStore = EnumStoreT<StringEntryType>; +using NumericEnumStore = EnumStoreT<int32_t>; +using FloatEnumStore = EnumStoreT<float>; +using StringEnumStore = EnumStoreT<const char*>; using EnumIndex = IEnumStore::Index; diff --git a/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp b/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp index 4d1d0b6fff5..ca40b5cc259 100644 --- a/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp +++ b/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp @@ -15,15 +15,15 @@ size_t enumStoreAlign(size_t size) return (size + 15) & -UINT64_C(16); } -using NumericEnumStore = EnumStoreT<NumericEntryType<uint32_t> >; +using NumericEnumStore = EnumStoreT<int32_t>; using generation_t = vespalib::GenerationHandler::generation_t; class EnumStoreTest : public vespalib::TestApp { private: - typedef EnumStoreT<StringEntryType> StringEnumStore; - typedef EnumStoreT<NumericEntryType<float> > FloatEnumStore; - typedef EnumStoreT<NumericEntryType<double> > DoubleEnumStore; + typedef EnumStoreT<const char*> StringEnumStore; + typedef EnumStoreT<float> FloatEnumStore; + typedef EnumStoreT<double> DoubleEnumStore; typedef IEnumStore::Index EnumIndex; @@ -193,7 +193,7 @@ EnumStoreTest::testAddEnum(bool hasPostings) EXPECT_TRUE(ses.findIndex(unique[i].c_str(), idx)); EXPECT_TRUE(idx == indices[i]); EXPECT_EQUAL(1u, ses.getRefCount(indices[i])); - StringEntryType::Type value = 0; + const char* value = nullptr; EXPECT_TRUE(ses.getValue(indices[i], value)); EXPECT_TRUE(strcmp(unique[i].c_str(), value) == 0); } @@ -339,7 +339,7 @@ EnumStoreTest::checkReaders(const StringEnumStore & ses, { (void) sesGen; //uint32_t refCount = 1000; - StringEnumStore::DataType t = ""; + const char* t = ""; for (uint32_t i = 0; i < readers.size(); ++i) { const Reader & r = readers[i]; for (uint32_t j = 0; j < r._indices.size(); ++j) { |