Trim down unit test.

Test adding info from multiple posting lists to bit vector.

Make internal merge method private.

Move comment.

4 files changed, 12 insertions, 120 deletions

diff --git a/searchlib/src/tests/attribute/posting_list_merger/posting_list_merger_test.cpp b/searchlib/src/tests/attribute/posting_list_merger/posting_list_merger_test.cpp
index 201bbffbe09..146790ad9a1 100644
--- a/searchlib/src/tests/attribute/posting_list_merger/posting_list_merger_test.cpp
+++ b/searchlib/src/tests/attribute/posting_list_merger/posting_list_merger_test.cpp
@@ -55,95 +55,8 @@ public:
     }
 };
 
-class SimplePostingList
-{
-    std::vector<uint32_t> _entries;
-public:
-    SimplePostingList(std::vector<uint32_t> entries)
-        : _entries(std::move(entries))
-    {
-    }
-    ~SimplePostingList() { }
-
-    template <typename Func>
-    void foreach(Func func) const {
-        for (const auto &posting : _entries) {
-            func(posting, BTreeNoLeafData::_instance);
-        }
-    }
-
-    template <typename Func>
-    void foreach_key(Func func) const {
-        for (const auto &posting : _entries) {
-            func(posting);
-        }
-    }
-};
-
-class AddWeightPostingList : public SimplePostingList
-{
-    int32_t _weight;
-public:
-    AddWeightPostingList(std::vector<uint32_t> entries, int32_t weight)
-        : SimplePostingList(std::move(entries)),
-          _weight(weight)
-    {
-    }
-    ~AddWeightPostingList() { }
-    template <typename Func>
-    void foreach(Func func) const {
-        int32_t weight = _weight;
-        foreach_key([func, weight](uint32_t lid) { func(lid, weight); });
-    }
-};
-
 constexpr uint32_t docIdLimit = 16384;
 
-struct SimpleFixture
-{
-    PostingListMerger<BTreeNoLeafData> _merger;
-
-    SimpleFixture()
-        : _merger(docIdLimit)
-    {
-    }
-
-    ~SimpleFixture() { }
-
-    void reserveArray(uint32_t postingsCount, size_t postingsSize) { _merger.reserveArray(postingsCount, postingsSize); }
-
-    std::vector<uint32_t> asArray() {
-        const auto &llArray = _merger.getArray();
-        std::vector<uint32_t> result;
-        result.reserve(llArray.size());
-        for (auto &entry : llArray) {
-            result.emplace_back(entry._key);
-        }
-        return result;
-    }
-
-    std::vector<uint32_t> bvAsArray() {
-        const auto &bv = *_merger.getBitVector();
-        std::vector<uint32_t> result;
-        uint32_t lid = bv.getNextTrueBit(0);
-        while (lid + 1 < docIdLimit) {
-            result.emplace_back(lid);
-            lid = bv.getNextTrueBit(lid + 1);
-        }
-        return result;
-    }
-
-    void assertArray(std::vector<uint32_t> exp)
-    {
-        EXPECT_EQUAL(exp, asArray());
-    }
-
-    void assertBitVector(std::vector<uint32_t> exp)
-    {
-        EXPECT_EQUAL(exp, bvAsArray());
-    }
-};
-
 struct WeightedFixture
 {
     PostingListMerger<int32_t> _merger;
@@ -189,14 +102,6 @@ struct WeightedFixture
     }
 };
 
-TEST_F("Single simple array", SimpleFixture)
-{
-    f._merger.reserveArray(1, 4);
-    f._merger.addToArray(SimplePostingList({2, 3, 5, 9}));
-    f._merger.merge();
-    TEST_DO(f.assertArray({2, 3, 5, 9}));
-}
-
 TEST_F("Single weighted array", WeightedFixture)
 {
     f._merger.reserveArray(1, 4);
@@ -205,14 +110,6 @@ TEST_F("Single weighted array", WeightedFixture)
     TEST_DO(f.assertArray({{2, 102}, {3, 103}, {5, 105}, {9, 109}}));
 }
 
-TEST_F("Single weighted array with fixed weight", WeightedFixture)
-{
-    f._merger.reserveArray(1, 4);
-    f._merger.addToArray(AddWeightPostingList({2, 3, 5, 9}, 114));
-    f._merger.merge();
-    TEST_DO(f.assertArray({{2, 114}, {3, 114}, {5, 114}, {9, 114}}));
-}
-
 TEST_F("Merge array", WeightedFixture)
 {
     f._merger.reserveArray(2, 8);
@@ -239,16 +136,7 @@ TEST_F("Merge many arrays", WeightedFixture)
     TEST_DO(f.assertArray(res));
 }
 
-TEST_F("Single simple bitvector", SimpleFixture)
-{
-    f._merger.allocBitVector();
-    f._merger.addToBitVector(SimplePostingList({2, 3, 5, 9}));
-    f._merger.merge();
-    TEST_DO(f.assertBitVector({2, 3, 5, 9}));
-}
-
-
-TEST_F("Single weighted bitvector", WeightedFixture)
+TEST_F("Merge single array into bitvector", WeightedFixture)
 {
     f._merger.allocBitVector();
     f._merger.addToBitVector(WeightedPostingList({{ 2, 102}, {3, 103}, { 5, 105}, {9, 109}}));
@@ -256,12 +144,13 @@ TEST_F("Single weighted bitvector", WeightedFixture)
     TEST_DO(f.assertBitVector({2, 3, 5, 9}));
 }
 
-TEST_F("Single weighted bitvector with fixed weight", WeightedFixture)
+TEST_F("Merge multiple arrays into bitvector", WeightedFixture)
 {
     f._merger.allocBitVector();
-    f._merger.addToBitVector(AddWeightPostingList({2, 3, 5, 9}, 114));
+    f._merger.addToBitVector(WeightedPostingList({{ 2, 102}, {3, 103}, { 5, 105}, {9, 109}}));
+    f._merger.addToBitVector(WeightedPostingList({{ 6, 106}, {8, 108}, { 14, 114}, {17, 117}}));
     f._merger.merge();
-    TEST_DO(f.assertBitVector({2, 3, 5, 9}));
+    TEST_DO(f.assertBitVector({2, 3, 5, 6, 8, 9, 14, 17}));
 }
 
 TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/vespa/searchlib/attribute/posting_list_merger.h b/searchlib/src/vespa/searchlib/attribute/posting_list_merger.h
index ad5f44f32b2..6d240d2149b 100644
--- a/searchlib/src/vespa/searchlib/attribute/posting_list_merger.h
+++ b/searchlib/src/vespa/searchlib/attribute/posting_list_merger.h
@@ -25,6 +25,7 @@ class PostingListMerger
     uint32_t       _docIdLimit;
     bool           _arrayValid;
 
+    PostingVector &merge(PostingVector &v, PostingVector &temp, const StartVector &startPos) __attribute__((noinline));
 public:
     PostingListMerger(uint32_t docIdLimit);
 
@@ -33,7 +34,6 @@ public:
     void reserveArray(uint32_t postingsCount, size_t postingsSize);
     void allocBitVector();
     void merge();
-    PostingVector &merge(PostingVector &v, PostingVector &temp, const StartVector &startPos) __attribute__((noinline));
     bool hasArray() const { return _arrayValid; }
     bool hasBitVector() const { return static_cast<bool>(_bitVector); }
     bool emptyArray() const { return _array.empty(); }
diff --git a/searchlib/src/vespa/searchlib/btree/btree_key_data.h b/searchlib/src/vespa/searchlib/btree/btree_key_data.h
index 20d319e4d9a..737651b755d 100644
--- a/searchlib/src/vespa/searchlib/btree/btree_key_data.h
+++ b/searchlib/src/vespa/searchlib/btree/btree_key_data.h
@@ -9,9 +9,7 @@ namespace search::btree {
 /**
  * Empty class to use as DataT template parameter for BTree classes to
  * indicate that leaf nodes have no data (similar to std::set having less
- * information than std::map).  Use of this class triggers the below
- * partial specialization of BTreeNodeDataWrap to prevent unneeded
- * storage overhead.
+ * information than std::map).
  */
 class BTreeNoLeafData
 {
diff --git a/searchlib/src/vespa/searchlib/btree/btreenode.h b/searchlib/src/vespa/searchlib/btree/btreenode.h
index efe5a2b0c4c..d0f5d3a0ee2 100644
--- a/searchlib/src/vespa/searchlib/btree/btreenode.h
+++ b/searchlib/src/vespa/searchlib/btree/btreenode.h
@@ -77,6 +77,11 @@ public:
 };
 
 
+/**
+ * Use of BTreeNoLeafData class triggers the below partial
+ * specialization of BTreeNodeDataWrap to prevent unneeded storage
+ * overhead.
+ */
 template <class DataT, uint32_t NumSlots>
 class BTreeNodeDataWrap
 {