summaryrefslogtreecommitdiffstats
path: root/searchlib/src/tests/memoryindex
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@online.no>2022-10-04 14:47:30 +0200
committerTor Egge <Tor.Egge@online.no>2022-10-04 14:47:30 +0200
commit1d6380f1350b8a9e5c00c9be2e2bd854bf88bcb3 (patch)
treed90c7534ceae3c11fd2ae6641cd6a59336eb2309 /searchlib/src/tests/memoryindex
parent69069193606d6640829ff37d29a641a4e88244c3 (diff)
Add vespalib::datastore::Aligner.
Diffstat (limited to 'searchlib/src/tests/memoryindex')
-rw-r--r--searchlib/src/tests/memoryindex/datastore/word_store_test.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/searchlib/src/tests/memoryindex/datastore/word_store_test.cpp b/searchlib/src/tests/memoryindex/datastore/word_store_test.cpp
index 1ca87467fc6..29c032664c0 100644
--- a/searchlib/src/tests/memoryindex/datastore/word_store_test.cpp
+++ b/searchlib/src/tests/memoryindex/datastore/word_store_test.cpp
@@ -15,17 +15,19 @@ TEST(WordStoreTest, words_can_be_added_and_retrieved)
std::string w2 = "that";
std::string w3 = "words";
WordStore ws;
+ static constexpr auto buffer_array_size = WordStore::buffer_array_size;
+ using Aligner = WordStore::Aligner;
EntryRef r1 = ws.addWord(w1);
EntryRef r2 = ws.addWord(w2);
EntryRef r3 = ws.addWord(w3);
uint32_t invp = WordStore::buffer_array_size; // Reserved as invalid
uint32_t w1s = w1.size() + 1;
- uint32_t w1p = WordStore::calc_pad(w1s);
+ uint32_t w1p = Aligner::pad(w1s);
uint32_t w2s = w2.size() + 1;
- uint32_t w2p = WordStore::calc_pad(w2s);
- EXPECT_EQ(invp, WordStore::RefType(r1).offset() * WordStore::buffer_array_size);
- EXPECT_EQ(invp + w1s + w1p, WordStore::RefType(r2).offset() * WordStore::buffer_array_size);
- EXPECT_EQ(invp + w1s + w1p + w2s + w2p, WordStore::RefType(r3).offset() * WordStore::buffer_array_size);
+ uint32_t w2p = Aligner::pad(w2s);
+ EXPECT_EQ(invp, WordStore::RefType(r1).offset() * buffer_array_size);
+ EXPECT_EQ(invp + w1s + w1p, WordStore::RefType(r2).offset() * buffer_array_size);
+ EXPECT_EQ(invp + w1s + w1p + w2s + w2p, WordStore::RefType(r3).offset() * buffer_array_size);
EXPECT_EQ(0u, WordStore::RefType(r1).bufferId());
EXPECT_EQ(0u, WordStore::RefType(r2).bufferId());
EXPECT_EQ(0u, WordStore::RefType(r3).bufferId());