Revert "Balder/do not use your own docidlimit"

6 files changed, 20 insertions, 12 deletions

diff --git a/searchlib/src/tests/attribute/bitvector/bitvector_test.cpp b/searchlib/src/tests/attribute/bitvector/bitvector_test.cpp
index c00ab1270e3..7ff9c59bc09 100644
--- a/searchlib/src/tests/attribute/bitvector/bitvector_test.cpp
+++ b/searchlib/src/tests/attribute/bitvector/bitvector_test.cpp
@@ -412,7 +412,7 @@ BitVectorTest::checkSearch(AttributePtr v,
                            bool checkStride)
 {
     (void) checkStride;
-    sb->initRange(1, v->getCommittedDocIdLimit());
+    sb->initFullRange();
     sb->seek(1u);
     uint32_t docId = sb->getDocId();
     uint32_t lastDocId = 0;
@@ -497,7 +497,7 @@ BitVectorTest::test(BasicType bt,
         if (!enableOnlyBitVector) {
             checkSearch(v, std::move(dwsi), md, 2, 1022, 205, !filter, true);
         } else {
-            dwsi->initRange(1, v->getCommittedDocIdLimit());
+            dwsi->initFullRange();
             EXPECT_TRUE(dwsi->isAtEnd());
         }
     }
diff --git a/searchlib/src/tests/attribute/imported_attribute_vector/imported_attribute_vector_test.cpp b/searchlib/src/tests/attribute/imported_attribute_vector/imported_attribute_vector_test.cpp
index 332892aeaea..3688e3f8d0f 100644
--- a/searchlib/src/tests/attribute/imported_attribute_vector/imported_attribute_vector_test.cpp
+++ b/searchlib/src/tests/attribute/imported_attribute_vector/imported_attribute_vector_test.cpp
@@ -232,7 +232,6 @@ TEST_F("createSearchContext() returns an imported search context", SingleStringA
     // Iterator specifics are tested in imported_search_context_test, so just make sure
     // we get the expected iterator functionality. In this case, a non-strict iterator.
     auto iter = ctx->createIterator(&match, false);
-    iter->initRange(1, f.imported_attr->getNumDocs());
     EXPECT_FALSE(iter->seek(DocId(1)));
     EXPECT_FALSE(iter->seek(DocId(2)));
     EXPECT_FALSE(iter->seek(DocId(3)));
diff --git a/searchlib/src/tests/attribute/imported_search_context/imported_search_context_test.cpp b/searchlib/src/tests/attribute/imported_search_context/imported_search_context_test.cpp
index 5811ca9cc4d..c0b36dc1441 100644
--- a/searchlib/src/tests/attribute/imported_search_context/imported_search_context_test.cpp
+++ b/searchlib/src/tests/attribute/imported_search_context/imported_search_context_test.cpp
@@ -5,7 +5,8 @@
 #include <vespa/searchlib/fef/termfieldmatchdata.h>
 #include <vespa/searchcommon/attribute/search_context_params.h>
 
-namespace search::attribute {
+namespace search {
+namespace attribute {
 
 using fef::TermFieldMatchData;
 using vespalib::Trinary;
@@ -21,7 +22,7 @@ struct Fixture : ImportedAttributeFixture {
             bool strict) {
         auto iter = ctx.createIterator(&match, strict);
         assert(iter.get() != nullptr);
-        iter->initRange(DocId(1), reference_attr->getNumDocs());
+        iter->initRange(DocId(1), reference_attr->getNumDocs() + 1);
         return iter;
     }
 
@@ -332,6 +333,7 @@ TEST_F("queryTerm() returns term context was created with", WsetValueFixture) {
     EXPECT_EQUAL(std::string("helloworld"), std::string(ctx->queryTerm().getTerm()));
 }
 
-}
+} // attribute
+} // search
 
 TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/tests/attribute/searchable/attribute_searchable_adapter_test.cpp b/searchlib/src/tests/attribute/searchable/attribute_searchable_adapter_test.cpp
index a6e06af1b71..903807d2b0b 100644
--- a/searchlib/src/tests/attribute/searchable/attribute_searchable_adapter_test.cpp
+++ b/searchlib/src/tests/attribute/searchable/attribute_searchable_adapter_test.cpp
@@ -203,7 +203,7 @@ Result do_search(IAttributeManager &attribute_manager, const Node &node, bool st
     bp->fetchPostings(strict);
     SearchIterator::UP iterator = bp->createSearch(*match_data, strict);
     ASSERT_TRUE(iterator.get() != nullptr);
-    iterator->initRange(1, num_docs);
+    iterator->initFullRange();
     extract_posting_info(result, iterator->getPostingInfo());
     extract_wand_params(result, dynamic_cast<ParallelWeakAndSearch*>(iterator.get()));
     result.iterator_dump = iterator->asString();
diff --git a/searchlib/src/tests/attribute/searchable/attribute_weighted_set_blueprint_test.cpp b/searchlib/src/tests/attribute/searchable/attribute_weighted_set_blueprint_test.cpp
index c22807f8bf5..6fa87741f1d 100644
--- a/searchlib/src/tests/attribute/searchable/attribute_weighted_set_blueprint_test.cpp
+++ b/searchlib/src/tests/attribute/searchable/attribute_weighted_set_blueprint_test.cpp
@@ -3,6 +3,7 @@
 
 #include <vespa/searchlib/attribute/attribute_blueprint_factory.h>
 #include <vespa/searchlib/attribute/attribute_weighted_set_blueprint.h>
+#include <vespa/searchlib/attribute/iattributemanager.h>
 #include <vespa/searchlib/attribute/attributecontext.h>
 #include <vespa/searchlib/attribute/attributevector.h>
 #include <vespa/searchlib/attribute/extendableattributes.h>
@@ -10,12 +11,18 @@
 #include <vespa/searchlib/attribute/attributefactory.h>
 #include <vespa/searchlib/fef/fef.h>
 #include <vespa/searchlib/query/tree/simplequery.h>
+#include <vespa/searchlib/queryeval/field_spec.h>
+#include <vespa/searchlib/queryeval/searchiterator.h>
+#include <vespa/searchlib/queryeval/blueprint.h>
 #include <vespa/searchlib/queryeval/fake_result.h>
 #include <vespa/searchlib/queryeval/weighted_set_term_search.h>
 #include <vespa/searchlib/queryeval/fake_requestcontext.h>
-
+#include <memory>
+#include <string>
+#include <map>
 
 #include <vespa/searchlib/attribute/enumstore.hpp>
+#include <vespa/searchlib/attribute/singlestringattribute.h>
 
 using namespace search;
 using namespace search::query;
@@ -162,7 +169,7 @@ struct WS {
         bp->fetchPostings(strict);
         SearchIterator::UP sb = bp->createSearch(*md, strict);
         FakeResult result;
-        sb->initRange(1, 10);
+        sb->initFullRange();
         for (uint32_t docId = 1; docId < 10; ++docId) {
             if (sb->seek(docId)) {
                 sb->unpack(docId);
diff --git a/searchlib/src/tests/attribute/searchcontext/searchcontext.cpp b/searchlib/src/tests/attribute/searchcontext/searchcontext.cpp
index 20e5b592501..a79c35632be 100644
--- a/searchlib/src/tests/attribute/searchcontext/searchcontext.cpp
+++ b/searchlib/src/tests/attribute/searchcontext/searchcontext.cpp
@@ -432,7 +432,7 @@ ResultSetPtr
 SearchContextTest::performSearch(SearchIterator & sb, uint32_t numDocs)
 {
     HitCollector hc(numDocs, numDocs, 0);
-    sb.initRange(1, numDocs);
+    sb.initFullRange();
     // assume strict toplevel search object located at start
     for (sb.seek(1u); ! sb.isAtEnd(); sb.seek(sb.getDocId() + 1)) {
         hc.addHit(sb.getDocId(), 0.0);
@@ -723,7 +723,7 @@ SearchContextTest::testStrictSearchIterator(SearchContext & threeHits,
     { // search for value with 3 hits
         threeHits.fetchPostings(true);
         SearchBasePtr sb = threeHits.createIterator(&dummy, true);
-        sb->initRange(1, threeHits.attribute().getCommittedDocIdLimit());
+        sb->initFullRange();
         EXPECT_TRUE(typeTester.matches(*sb));
         EXPECT_TRUE(sb->getDocId() == sb->beginId() ||
                     sb->getDocId() == 1u);
@@ -744,7 +744,7 @@ SearchContextTest::testStrictSearchIterator(SearchContext & threeHits,
     { // search for value with no hits
         noHits.fetchPostings(true);
         SearchBasePtr sb = noHits.createIterator(&dummy, true);
-        sb->initRange(1, noHits.attribute().getCommittedDocIdLimit());
+        sb->initFullRange();
         ASSERT_TRUE(typeTester.matches(*sb));
         EXPECT_TRUE(sb->getDocId() == sb->beginId() ||
                    sb->isAtEnd());