Set docid limit early in blueprint subtree.

Cap matching doc count to total doc count.

2 files changed, 4 insertions, 1 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp b/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp
index c03d93b6480..0b2660824c0 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp
@@ -88,6 +88,7 @@ private:
             double w = getWeightFromNode(*node).percent();
             eq->addTerm(build(_requestContext, *node, _context), w / eqw);
         }
+        _result->setDocIdLimit(_context.getDocIdLimit());
         n.setDocumentFrequency(_result->getState().estimate().estHits, _context.getDocIdLimit());
     }
 
@@ -123,6 +124,7 @@ private:
             indexBlueprint = _context.getIndexes().createBlueprint(_requestContext, indexFields, n);
         }
         _result = mixer.mix(std::move(indexBlueprint));
+        _result->setDocIdLimit(_context.getDocIdLimit());
         n.setDocumentFrequency(_result->getState().estimate().estHits, _context.getDocIdLimit());
     }
 
diff --git a/searchcore/src/vespa/searchcore/proton/matching/querynodes.cpp b/searchcore/src/vespa/searchcore/proton/matching/querynodes.cpp
index 60c2e869e79..47a9f3dd43d 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/querynodes.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/querynodes.cpp
@@ -93,7 +93,8 @@ void
 ProtonTermData::setDocumentFrequency(uint32_t estHits, uint32_t docIdLimit)
 {
     if (docIdLimit > 1) {
-        propagate_document_frequency(estHits, docIdLimit - 1);
+        uint32_t total_doc_count = docIdLimit - 1;
+        propagate_document_frequency(std::min(estHits, total_doc_count), total_doc_count);
     } else {
         propagate_document_frequency(0, 1);
     }