make new bitvector when growing

1 files changed, 41 insertions, 41 deletions

diff --git a/searchlib/src/tests/common/bitvector/bitvector_test.cpp b/searchlib/src/tests/common/bitvector/bitvector_test.cpp
index a9850756ac6..79af28d20be 100644
--- a/searchlib/src/tests/common/bitvector/bitvector_test.cpp
+++ b/searchlib/src/tests/common/bitvector/bitvector_test.cpp
@@ -604,55 +604,55 @@ TEST("requireThatGrowWorks")
 {
     vespalib::GenerationHolder g;
     GrowableBitVector v(200, 200, g);
-    EXPECT_EQUAL(0u, v.countTrueBits());
+    EXPECT_EQUAL(0u, v.writer().countTrueBits());
     
-    v.setBitAndMaintainCount(7);
-    v.setBitAndMaintainCount(39);
-    v.setBitAndMaintainCount(71);
-    v.setBitAndMaintainCount(103);
-    EXPECT_EQUAL(4u, v.countTrueBits());
-
-    EXPECT_EQUAL(200u, v.size());
-    EXPECT_EQUAL(1023u, v.capacity()); 
-    EXPECT_TRUE(assertBV("[7,39,71,103]", v));
-    EXPECT_EQUAL(4u, v.countTrueBits());
+    v.writer().setBitAndMaintainCount(7);
+    v.writer().setBitAndMaintainCount(39);
+    v.writer().setBitAndMaintainCount(71);
+    v.writer().setBitAndMaintainCount(103);
+    EXPECT_EQUAL(4u, v.writer().countTrueBits());
+
+    EXPECT_EQUAL(200u, v.reader().size());
+    EXPECT_EQUAL(1023u, v.writer().capacity()); 
+    EXPECT_TRUE(assertBV("[7,39,71,103]", v.reader()));
+    EXPECT_EQUAL(4u, v.writer().countTrueBits());
     EXPECT_TRUE(v.reserve(1024));
-    EXPECT_EQUAL(200u, v.size()); 
-    EXPECT_EQUAL(2047u, v.capacity()); 
-    EXPECT_TRUE(assertBV("[7,39,71,103]", v));
-    EXPECT_EQUAL(4u, v.countTrueBits());
+    EXPECT_EQUAL(200u, v.reader().size()); 
+    EXPECT_EQUAL(2047u, v.writer().capacity()); 
+    EXPECT_TRUE(assertBV("[7,39,71,103]", v.reader()));
+    EXPECT_EQUAL(4u, v.writer().countTrueBits());
     EXPECT_FALSE(v.extend(202));
-    EXPECT_EQUAL(202u, v.size()); 
-    EXPECT_EQUAL(2047u, v.capacity()); 
-    EXPECT_TRUE(assertBV("[7,39,71,103]", v));
-    EXPECT_EQUAL(4u, v.countTrueBits());
+    EXPECT_EQUAL(202u, v.reader().size()); 
+    EXPECT_EQUAL(2047u, v.writer().capacity()); 
+    EXPECT_TRUE(assertBV("[7,39,71,103]", v.reader()));
+    EXPECT_EQUAL(4u, v.writer().countTrueBits());
     EXPECT_FALSE(v.shrink(200));
-    EXPECT_EQUAL(200u, v.size()); 
-    EXPECT_EQUAL(2047u, v.capacity()); 
-    EXPECT_TRUE(assertBV("[7,39,71,103]", v));
-    EXPECT_EQUAL(4u, v.countTrueBits());
+    EXPECT_EQUAL(200u, v.reader().size()); 
+    EXPECT_EQUAL(2047u, v.writer().capacity()); 
+    EXPECT_TRUE(assertBV("[7,39,71,103]", v.reader()));
+    EXPECT_EQUAL(4u, v.writer().countTrueBits());
     EXPECT_FALSE(v.reserve(2047));
-    EXPECT_EQUAL(200u, v.size()); 
-    EXPECT_EQUAL(2047u, v.capacity()); 
-    EXPECT_TRUE(assertBV("[7,39,71,103]", v));
-    EXPECT_EQUAL(4u, v.countTrueBits());
+    EXPECT_EQUAL(200u, v.reader().size()); 
+    EXPECT_EQUAL(2047u, v.writer().capacity()); 
+    EXPECT_TRUE(assertBV("[7,39,71,103]", v.reader()));
+    EXPECT_EQUAL(4u, v.writer().countTrueBits());
     EXPECT_FALSE(v.shrink(202));
-    EXPECT_EQUAL(202u, v.size()); 
-    EXPECT_EQUAL(2047u, v.capacity()); 
-    EXPECT_TRUE(assertBV("[7,39,71,103]", v));
-    EXPECT_EQUAL(4u, v.countTrueBits());
+    EXPECT_EQUAL(202u, v.reader().size()); 
+    EXPECT_EQUAL(2047u, v.writer().capacity()); 
+    EXPECT_TRUE(assertBV("[7,39,71,103]", v.reader()));
+    EXPECT_EQUAL(4u, v.writer().countTrueBits());
 
     EXPECT_FALSE(v.shrink(100));
-    EXPECT_EQUAL(100u, v.size()); 
-    EXPECT_EQUAL(2047u, v.capacity()); 
-    EXPECT_TRUE(assertBV("[7,39,71]", v));
-    EXPECT_EQUAL(3u, v.countTrueBits());
+    EXPECT_EQUAL(100u, v.reader().size()); 
+    EXPECT_EQUAL(2047u, v.writer().capacity()); 
+    EXPECT_TRUE(assertBV("[7,39,71]", v.reader()));
+    EXPECT_EQUAL(3u, v.writer().countTrueBits());
 
-    v.invalidateCachedCount();
+    v.writer().invalidateCachedCount();
     EXPECT_TRUE(v.reserve(3100));
-    EXPECT_EQUAL(100u, v.size());
-    EXPECT_EQUAL(4095u, v.capacity());
-    EXPECT_EQUAL(3u, v.countTrueBits());
+    EXPECT_EQUAL(100u, v.reader().size());
+    EXPECT_EQUAL(4095u, v.writer().capacity());
+    EXPECT_EQUAL(3u, v.writer().countTrueBits());
 
     g.transferHoldLists(1);
     g.trimHoldLists(2);
@@ -666,7 +666,7 @@ TEST("require that growable bit vectors keeps memory allocator")
     vespalib::GenerationHolder g;
     GrowableBitVector v(200, 200, g, &init_alloc);
     EXPECT_EQUAL(AllocStats(1, 0), stats);
-    v.resize(1);
+    v.writer().resize(1); // DO NOT TRY THIS AT HOME
     EXPECT_EQUAL(AllocStats(2, 1), stats);
     v.reserve(2000);
     EXPECT_EQUAL(AllocStats(3, 1), stats);
@@ -674,7 +674,7 @@ TEST("require that growable bit vectors keeps memory allocator")
     EXPECT_EQUAL(AllocStats(4, 1), stats);
     v.shrink(200);
     EXPECT_EQUAL(AllocStats(4, 1), stats);
-    v.resize(1);
+    v.writer().resize(1); // DO NOT TRY THIS AT HOME
     EXPECT_EQUAL(AllocStats(5, 2), stats);
     g.transferHoldLists(1);
     g.trimHoldLists(2);