diff options
| author | Henning Baldersheim <balder@oath.com> | 2018-06-06 13:29:40 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@oath.com> | 2018-06-06 13:29:40 +0200 |
| commit | 5e0b60a643e5b42091dcf137b8c1d5ba3352a382 (patch) | |
| tree | 35154501ef9adcef112e56b89842cc62f206617b | |
| parent | ae20ddec12c463d1bbcc7817a8751c7aac355f38 (diff) | |
Also check evaluate() in addition to evaluateHits and invert the check.
| -rw-r--r-- | searchlib/src/tests/query/query-old.cpp | 4 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/query/query.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/searchlib/src/tests/query/query-old.cpp b/searchlib/src/tests/query/query-old.cpp index 2cab4447935..f3731b1ec72 100644 --- a/searchlib/src/tests/query/query-old.cpp +++ b/searchlib/src/tests/query/query-old.cpp @@ -408,6 +408,7 @@ TEST("testPhraseEvaluate") { EXPECT_EQUAL(p->getFieldInfo(2).getHitCount(), 0u); EXPECT_EQUAL(p->getFieldInfo(3).getHitOffset(), 2u); EXPECT_EQUAL(p->getFieldInfo(3).getHitCount(), 1u); + EXPECT_TRUE(p->evaluate()); } TEST("testHit") { @@ -705,7 +706,6 @@ TEST("testSameElementEvaluate") { terms[2]->add(16, 2, 5, 160); terms[2]->add(17, 2, 6, 170); HitList hits; - sameElem->evaluateHits(hits); EXPECT_EQUAL(4u, hits.size()); EXPECT_EQUAL(0u, hits[0].wordpos()); @@ -727,7 +727,7 @@ TEST("testSameElementEvaluate") { EXPECT_EQUAL(2u, hits[3].context()); EXPECT_EQUAL(5u, hits[3].elemId()); EXPECT_EQUAL(160, hits[3].weight()); - + EXPECT_TRUE(sameElem->evaluate()); } diff --git a/searchlib/src/vespa/searchlib/query/query.cpp b/searchlib/src/vespa/searchlib/query/query.cpp index 659e48a0662..d34d98bf100 100644 --- a/searchlib/src/vespa/searchlib/query/query.cpp +++ b/searchlib/src/vespa/searchlib/query/query.cpp @@ -148,7 +148,7 @@ bool EquivQueryNode::evaluate() const bool SameElementQueryNode::evaluate() const { HitList hl; - return evaluateHits(hl).empty(); + return ! evaluateHits(hl).empty(); } const HitList & @@ -198,7 +198,7 @@ SameElementQueryNode::evaluateHits(HitList & hl) const bool PhraseQueryNode::evaluate() const { HitList hl; - return evaluateHits(hl).empty(); + return ! evaluateHits(hl).empty(); } void PhraseQueryNode::getPhrases(QueryNodeRefList & tl) { tl.push_back(this); } |