Maintain the cached bitCount to avoid cost query time.

3 files changed, 18 insertions, 18 deletions

diff --git a/searchlib/src/tests/bitvector/bitvectorbenchmark.cpp b/searchlib/src/tests/bitvector/bitvectorbenchmark.cpp
index ed681d9021b..a9df188d417 100644
--- a/searchlib/src/tests/bitvector/bitvectorbenchmark.cpp
+++ b/searchlib/src/tests/bitvector/bitvectorbenchmark.cpp
@@ -51,10 +51,10 @@ void BitVectorBenchmark::init(size_t n)
     BitVector *b(BitVector::create(n).release());
     srand(1);
     for(size_t i(0), j(0); i < n; i += rand()%10, j++) {
-        a->flip(i);
+        a->flipBit(i);
     }
     for(size_t i(0), j(0); i < n; i += rand()%10, j++) {
-        b->flip(i);
+        b->flipBit(i);
     }
     a->invalidateCachedCount();
     b->invalidateCachedCount();
diff --git a/searchlib/src/tests/common/bitvector/bitvector_test.cpp b/searchlib/src/tests/common/bitvector/bitvector_test.cpp
index 4cbe96c74b5..d720b105671 100644
--- a/searchlib/src/tests/common/bitvector/bitvector_test.cpp
+++ b/searchlib/src/tests/common/bitvector/bitvector_test.cpp
@@ -268,21 +268,21 @@ TEST("requireThatSequentialOperationsOnPartialWorks")
     p1.invalidateCachedCount();
     EXPECT_TRUE(p1.hasTrueBits());
     EXPECT_EQUAL(1u, p1.countTrueBits());
-    p1.slowSetBit(718);
-    p1.slowSetBit(739);
-    p1.slowSetBit(871);
-    p1.slowSetBit(903);
+    p1.setBitAndMaintainCount(718);
+    p1.setBitAndMaintainCount(739);
+    p1.setBitAndMaintainCount(871);
+    p1.setBitAndMaintainCount(903);
     EXPECT_EQUAL(5u, p1.countTrueBits());
     EXPECT_TRUE(assertBV("[718,719,739,871,903]", p1));
 
     PartialBitVector p2(717,919);
     EXPECT_FALSE(p1 == p2);
-    p2.slowSetBit(719);
-    p2.slowSetBit(718);
-    p2.slowSetBit(739);
-    p2.slowSetBit(871);
+    p2.setBitAndMaintainCount(719);
+    p2.setBitAndMaintainCount(718);
+    p2.setBitAndMaintainCount(739);
+    p2.setBitAndMaintainCount(871);
     EXPECT_FALSE(p1 == p2);
-    p2.slowSetBit(903);
+    p2.setBitAndMaintainCount(903);
     EXPECT_TRUE(p1 == p2);
 
     AllocatedBitVector full(1000);
@@ -422,10 +422,10 @@ TEST("requireThatSetWorks")
     EXPECT_EQUAL(4u, v1.countTrueBits());
     EXPECT_TRUE(assertBV("[7,39,80,103]", v1));
 
-    v1.slowSetBit(39);
+    v1.setBitAndMaintainCount(39);
     EXPECT_EQUAL(4u, v1.countTrueBits());
     EXPECT_TRUE(assertBV("[7,39,80,103]", v1));
-    v1.slowSetBit(57);
+    v1.setBitAndMaintainCount(57);
     EXPECT_EQUAL(5u, v1.countTrueBits());
     EXPECT_TRUE(assertBV("[7,39,57,80,103]", v1));
 }
diff --git a/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp b/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp
index 0a3c3788c98..cc31fcec4d4 100644
--- a/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp
+++ b/searchlib/src/tests/docstore/document_store_visitor/document_store_visitor_test.cpp
@@ -127,7 +127,7 @@ MyVisitor::visit(uint32_t lid, const std::shared_ptr<Document> &doc)
     assert(lid < _docIdLimit);
     Document::UP expDoc(makeDoc(_repo, lid, _before));
     EXPECT_TRUE(*expDoc == *doc);
-    _valid->slowSetBit(lid);
+    _valid->setBitAndMaintainCount(lid);
 }
 
 
@@ -136,7 +136,7 @@ MyVisitor::visit(uint32_t lid)
 {
     ++_visitRmCount;
     assert(lid < _docIdLimit);
-    _valid->slowClearBit(lid);
+    _valid->clearBitAndMaintainCount(lid);
 }
 
 
@@ -158,7 +158,7 @@ MyRewriteVisitor::visit(uint32_t lid, const std::shared_ptr<Document> &doc)
     assert(lid < _docIdLimit);
     Document::UP expDoc(makeDoc(_repo, lid, _before));
     EXPECT_TRUE(*expDoc == *doc);
-    _valid->slowSetBit(lid);
+    _valid->setBitAndMaintainCount(lid);
     doc->set("extra", "foo");
 }
 
@@ -297,7 +297,7 @@ Fixture::put(const Document &doc, uint32_t lid)
     ++_syncToken;
     assert(lid < _docIdLimit);
     _store->write(_syncToken, lid, doc);
-    _valid->slowSetBit(lid);
+    _valid->setBitAndMaintainCount(lid);
 }
 
 
@@ -307,7 +307,7 @@ Fixture::remove(uint32_t lid)
     ++_syncToken;
     assert(lid < _docIdLimit);
     _store->remove(_syncToken, lid);
-    _valid->slowClearBit(lid);
+    _valid->clearBitAndMaintainCount(lid);
 }