diff options
Diffstat (limited to 'searchlib/src')
5 files changed, 34 insertions, 41 deletions
diff --git a/searchlib/src/tests/attribute/attribute_test.cpp b/searchlib/src/tests/attribute/attribute_test.cpp index 16b5ef78951..f336742ca4b 100644 --- a/searchlib/src/tests/attribute/attribute_test.cpp +++ b/searchlib/src/tests/attribute/attribute_test.cpp @@ -912,8 +912,8 @@ AttributeTest::testSingle() cfg.setFastSearch(true); AttributePtr ptr = createAttribute("sv-post-int32", cfg); ptr->updateStat(true); - EXPECT_EQ(887756u, ptr->getStatus().getAllocated()); - EXPECT_EQ(656444u, ptr->getStatus().getUsed()); + EXPECT_EQ(347084u, ptr->getStatus().getAllocated()); + EXPECT_EQ(101852u, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testSingle<IntegerAttribute, AttributeVector::largeint_t, int32_t>(ptr, values); } @@ -934,8 +934,8 @@ AttributeTest::testSingle() cfg.setFastSearch(true); AttributePtr ptr = createAttribute("sv-post-float", cfg); ptr->updateStat(true); - EXPECT_EQ(887756u, ptr->getStatus().getAllocated()); - EXPECT_EQ(656444u, ptr->getStatus().getUsed()); + EXPECT_EQ(347084u, ptr->getStatus().getAllocated()); + EXPECT_EQ(101852u, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testSingle<FloatingPointAttribute, double, float>(ptr, values); } @@ -947,8 +947,8 @@ AttributeTest::testSingle() { AttributePtr ptr = createAttribute("sv-string", Config(BasicType::STRING, CollectionType::SINGLE)); ptr->updateStat(true); - EXPECT_EQ(403552u, ptr->getStatus().getAllocated()); - EXPECT_EQ(328576u, ptr->getStatus().getUsed()); + EXPECT_EQ(133216u, ptr->getStatus().getAllocated()); + EXPECT_EQ(53280u, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testSingle<StringAttribute, string, string>(ptr, values); } @@ -957,8 +957,8 @@ AttributeTest::testSingle() cfg.setFastSearch(true); AttributePtr ptr = createAttribute("sv-fs-string", cfg); ptr->updateStat(true); - EXPECT_EQ(902256u, ptr->getStatus().getAllocated()); - EXPECT_EQ(657088u, ptr->getStatus().getUsed()); + EXPECT_EQ(361584u, ptr->getStatus().getAllocated()); + EXPECT_EQ(105216u, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testSingle<StringAttribute, string, string>(ptr, values); } @@ -1089,8 +1089,8 @@ AttributeTest::testArray() { AttributePtr ptr = createAttribute("a-int32", Config(BasicType::INT32, CollectionType::ARRAY)); ptr->updateStat(true); - EXPECT_EQ(1474480u, ptr->getStatus().getAllocated()); - EXPECT_EQ(1462192u, ptr->getStatus().getUsed()); + EXPECT_EQ(528304u, ptr->getStatus().getAllocated()); + EXPECT_EQ(512576u, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testArray<IntegerAttribute, AttributeVector::largeint_t>(ptr, values); } @@ -1099,8 +1099,8 @@ AttributeTest::testArray() cfg.setFastSearch(true); AttributePtr ptr = createAttribute("flags", cfg); ptr->updateStat(true); - EXPECT_EQ(1474480u, ptr->getStatus().getAllocated()); - EXPECT_EQ(1462192u, ptr->getStatus().getUsed()); + EXPECT_EQ(528304u, ptr->getStatus().getAllocated()); + EXPECT_EQ(512576u, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testArray<IntegerAttribute, AttributeVector::largeint_t>(ptr, values); } @@ -1109,8 +1109,8 @@ AttributeTest::testArray() cfg.setFastSearch(true); AttributePtr ptr = createAttribute("a-fs-int32", cfg); ptr->updateStat(true); - EXPECT_EQ(2371884u, ptr->getStatus().getAllocated()); - EXPECT_EQ(2118656u, ptr->getStatus().getUsed()); + EXPECT_EQ(885036u, ptr->getStatus().getAllocated()); + EXPECT_EQ(614448u, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testArray<IntegerAttribute, AttributeVector::largeint_t>(ptr, values); } @@ -1128,8 +1128,8 @@ AttributeTest::testArray() cfg.setFastSearch(true); AttributePtr ptr = createAttribute("a-fs-float", cfg); ptr->updateStat(true); - EXPECT_EQ(2371884u, ptr->getStatus().getAllocated()); - EXPECT_EQ(2118656u, ptr->getStatus().getUsed()); + EXPECT_EQ(885036u, ptr->getStatus().getAllocated()); + EXPECT_EQ(614448u, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testArray<FloatingPointAttribute, double>(ptr, values); } @@ -1140,8 +1140,8 @@ AttributeTest::testArray() { AttributePtr ptr = createAttribute("a-string", Config(BasicType::STRING, CollectionType::ARRAY)); ptr->updateStat(true); - EXPECT_EQ(1865744u, ptr->getStatus().getAllocated()); - EXPECT_EQ(1790768u, ptr->getStatus().getUsed()); + EXPECT_EQ(649232u, ptr->getStatus().getAllocated()); + EXPECT_EQ(565856u, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testArray<StringAttribute, string>(ptr, values); } @@ -1150,8 +1150,8 @@ AttributeTest::testArray() cfg.setFastSearch(true); AttributePtr ptr = createAttribute("afs-string", cfg); ptr->updateStat(true); - EXPECT_EQ(2386384u, ptr->getStatus().getAllocated()); - EXPECT_EQ(2119300u, ptr->getStatus().getUsed()); + EXPECT_EQ(899536u, ptr->getStatus().getAllocated()); + EXPECT_EQ(617812u, ptr->getStatus().getUsed()); addDocs(ptr, numDocs); testArray<StringAttribute, string>(ptr, values); } diff --git a/searchlib/src/tests/attribute/postinglist/postinglist.cpp b/searchlib/src/tests/attribute/postinglist/postinglist.cpp index 7d2a89b6e5b..39e31b23498 100644 --- a/searchlib/src/tests/attribute/postinglist/postinglist.cpp +++ b/searchlib/src/tests/attribute/postinglist/postinglist.cpp @@ -581,21 +581,15 @@ AttributePostingListTest::doCompactEnumStore(Tree &tree, TreeManager &treeMgr, ValueHandle &valueHandle) { - LOG(info, - "doCompactEnumStore start"); + LOG(info,"doCompactEnumStore start"); Tree::Iterator i = tree.begin(treeMgr); - uint32_t numBuffers = valueHandle.getNumBuffers(); std::vector<uint32_t> toHold; + valueHandle.for_each_active_buffer([&toHold](uint32_t buffer_id, const vespalib::datastore::BufferState &) { + toHold.push_back(buffer_id); + }); - for (uint32_t bufferId = 0; bufferId < numBuffers; ++bufferId) { - vespalib::datastore::BufferState &state = valueHandle.getBufferState(bufferId); - if (state.isActive()) { - toHold.push_back(bufferId); - // Freelists already disabled due to variable sized data - } - } valueHandle.switch_primary_buffer(0, 0u); for (; i.valid(); ++i) diff --git a/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp b/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp index 1b1c1181666..8073fb8d232 100644 --- a/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp +++ b/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp @@ -462,8 +462,8 @@ TEST(MemoryIndexTest, require_that_num_docs_and_doc_id_limit_is_returned) TEST(MemoryIndexTest, require_that_we_understand_the_memory_footprint) { - constexpr size_t BASE_ALLOCATED = 1172040u; - constexpr size_t BASE_USED = 984116u; + constexpr size_t BASE_ALLOCATED = 361032u; + constexpr size_t BASE_USED = 151188u; { MySetup setup; Index index(setup); diff --git a/searchlib/src/tests/predicate/document_features_store_test.cpp b/searchlib/src/tests/predicate/document_features_store_test.cpp index c37fe2739ca..4ac4bdc32f0 100644 --- a/searchlib/src/tests/predicate/document_features_store_test.cpp +++ b/searchlib/src/tests/predicate/document_features_store_test.cpp @@ -165,17 +165,17 @@ TEST("require that both features and ranges are removed by 'remove'") { TEST("require that both features and ranges counts towards memory usage") { DocumentFeaturesStore features_store(10); - EXPECT_EQUAL(328152u, features_store.getMemoryUsage().usedBytes()); + EXPECT_EQUAL(50136u, features_store.getMemoryUsage().usedBytes()); PredicateTreeAnnotations annotations; annotations.features.push_back(PredicateHash::hash64("foo=100-199")); features_store.insert(annotations, doc_id); - EXPECT_EQUAL(328160u, features_store.getMemoryUsage().usedBytes()); + EXPECT_EQUAL(50144u, features_store.getMemoryUsage().usedBytes()); annotations.features.clear(); annotations.range_features.push_back({"foo", 100, 199}); features_store.insert(annotations, doc_id + 1); - EXPECT_EQUAL(328256u, features_store.getMemoryUsage().usedBytes()); + EXPECT_EQUAL(50240u, features_store.getMemoryUsage().usedBytes()); } TEST("require that DocumentFeaturesStore can be serialized") { @@ -205,17 +205,17 @@ TEST("require that serialization cleans up wordstore") { PredicateTreeAnnotations annotations; annotations.range_features.push_back({"foo", 100, 199}); features_store.insert(annotations, doc_id); - EXPECT_EQUAL(328248u, features_store.getMemoryUsage().usedBytes()); + EXPECT_EQUAL(50232u, features_store.getMemoryUsage().usedBytes()); annotations.range_features.push_back({"bar", 100, 199}); features_store.insert(annotations, doc_id + 1); - EXPECT_EQUAL(328636u, features_store.getMemoryUsage().usedBytes()); + EXPECT_EQUAL(50620u, features_store.getMemoryUsage().usedBytes()); features_store.remove(doc_id + 1); - EXPECT_EQUAL(328588u, features_store.getMemoryUsage().usedBytes()); + EXPECT_EQUAL(50572u, features_store.getMemoryUsage().usedBytes()); vespalib::DataBuffer buffer; features_store.serialize(buffer); DocumentFeaturesStore features_store2(buffer); - EXPECT_EQUAL(328248u, features_store2.getMemoryUsage().usedBytes()); + EXPECT_EQUAL(50232u, features_store2.getMemoryUsage().usedBytes()); } diff --git a/searchlib/src/vespa/searchlib/attribute/postingstore.cpp b/searchlib/src/vespa/searchlib/attribute/postingstore.cpp index 2aa05e7fa9f..94720212faf 100644 --- a/searchlib/src/vespa/searchlib/attribute/postingstore.cpp +++ b/searchlib/src/vespa/searchlib/attribute/postingstore.cpp @@ -727,13 +727,12 @@ template <typename DataT> void PostingStore<DataT>::compact_worst_buffers(CompactionSpec compaction_spec, const CompactionStrategy& compaction_strategy) { - auto compacting_buffers = this->start_compact_worst_buffers(compaction_spec, compaction_strategy); bool compact_btree_roots = false; auto filter = compacting_buffers->make_entry_ref_filter(); // Start with looking at buffers being compacted for (uint32_t buffer_id : compacting_buffers->get_buffer_ids()) { - if (isBTree(_store.getBufferState(buffer_id).getTypeId())) { + if (isBTree(_store.getBufferMeta(buffer_id).getTypeId())) { compact_btree_roots = true; } } |