set DocId the correct places and update test according to my understanding of supposed behavior.

2 files changed, 3 insertions, 4 deletions

diff --git a/searchlib/src/tests/queryeval/dot_product/dot_product_test.cpp b/searchlib/src/tests/queryeval/dot_product/dot_product_test.cpp
index 3dcf75a0eab..b3989065f07 100644
--- a/searchlib/src/tests/queryeval/dot_product/dot_product_test.cpp
+++ b/searchlib/src/tests/queryeval/dot_product/dot_product_test.cpp
@@ -143,8 +143,6 @@ TEST_F("test Eager Empty Child", MockFixture(search::endDocId)) {
     MockSearch *mock = f1.mock;
     SearchIterator &search = *f1.search;
     search.initFullRange();
-    EXPECT_EQUAL(search.beginId(), search.getDocId());
-    EXPECT_TRUE(!search.seek(1));
     EXPECT_TRUE(search.isAtEnd());
     EXPECT_EQUAL(0, mock->seekCnt);
 }
@@ -153,7 +151,7 @@ TEST_F("test Eager Matching Child", MockFixture(5)) {
     MockSearch *mock = f1.mock;
     SearchIterator &search = *f1.search;
     search.initFullRange();
-    EXPECT_EQUAL(search.beginId(), search.getDocId());
+    EXPECT_EQUAL(5u, search.getDocId());
     EXPECT_TRUE(!search.seek(3));
     EXPECT_EQUAL(5u, search.getDocId());
     EXPECT_EQUAL(0, mock->seekCnt);
diff --git a/searchlib/src/vespa/searchlib/queryeval/dot_product_search.cpp b/searchlib/src/vespa/searchlib/queryeval/dot_product_search.cpp
index 0a58e9d17e2..cbaa135217c 100644
--- a/searchlib/src/vespa/searchlib/queryeval/dot_product_search.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/dot_product_search.cpp
@@ -120,7 +120,7 @@ public:
     { }
 private:
     void doSeek(uint32_t docid) override {
-        _child->seek(docid);
+        _child->doSeek(docid);
         setDocId(_child->getDocId());
     }
 
@@ -131,6 +131,7 @@ private:
     void initRange(uint32_t beginId, uint32_t endId) override {
         SearchIterator::initRange(beginId, endId);
         _child->initRange(beginId, endId);
+        setDocId(_child->getDocId());
     }
     SearchIterator::UP        _child;
     const TermFieldMatchData &_childTmd;