diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-05-18 18:31:44 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-05-18 22:54:51 +0000 |
commit | 723f2ae4228a82692831af2682942e701be7aa16 (patch) | |
tree | 8b43562b28f0da99d59c48f093ac013eb1a4a20a /searchlib/src/tests/queryeval/same_element | |
parent | 38e14d3a40775f2e010046ae36cf0505f7b6e5a6 (diff) |
- Handle more than 64k hits in the element vector.
- Avoid computing all vectors in full separately and instead do an incremental inline merge with.
- Also avoid requiring the searchiterator aspect on the wrappers.
Diffstat (limited to 'searchlib/src/tests/queryeval/same_element')
-rw-r--r-- | searchlib/src/tests/queryeval/same_element/same_element_test.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/searchlib/src/tests/queryeval/same_element/same_element_test.cpp b/searchlib/src/tests/queryeval/same_element/same_element_test.cpp index 378e16480b8..db177b98b84 100644 --- a/searchlib/src/tests/queryeval/same_element/same_element_test.cpp +++ b/searchlib/src/tests/queryeval/same_element/same_element_test.cpp @@ -8,12 +8,12 @@ #include <vespa/searchlib/queryeval/same_element_search.h> #include <vespa/searchlib/queryeval/emptysearch.h> #include <vespa/searchcommon/attribute/i_search_context.h> -#include <vespa/searchlib/attribute/elementiterator.h> +#include <vespa/searchlib/attribute/searchcontextelementiterator.h> #include <vespa/vespalib/test/insertion_operators.h> using namespace search::fef; using namespace search::queryeval; -using search::attribute::ElementIterator; +using search::attribute::SearchContextElementIterator; void verify_elements(SameElementSearch &se, uint32_t docid, const std::initializer_list<uint32_t> list) { std::vector<uint32_t> expect(list); @@ -99,11 +99,11 @@ TEST("require that strict iterator seeks to next hit") { auto search = bp->createSearch(*md, true); search->initRange(1, 1000); EXPECT_LESS(search->getDocId(), 1u); - EXPECT_TRUE(!search->seek(1)); + EXPECT_FALSE(search->seek(1)); EXPECT_EQUAL(search->getDocId(), 7u); EXPECT_TRUE(search->seek(9)); EXPECT_EQUAL(search->getDocId(), 9u); - EXPECT_TRUE(!search->seek(10)); + EXPECT_FALSE(search->seek(10)); EXPECT_TRUE(search->isAtEnd()); } @@ -134,8 +134,8 @@ TEST("require that attribute iterators are wrapped for element unpacking") { SameElementSearch *se = dynamic_cast<SameElementSearch*>(search.get()); ASSERT_TRUE(se != nullptr); ASSERT_EQUAL(se->children().size(), 2u); - EXPECT_TRUE(dynamic_cast<ElementIterator*>(se->children()[0].get()) != nullptr); - EXPECT_TRUE(dynamic_cast<ElementIterator*>(se->children()[1].get()) != nullptr); + EXPECT_TRUE(dynamic_cast<SearchContextElementIterator*>(se->children()[0].get()) != nullptr); + EXPECT_TRUE(dynamic_cast<SearchContextElementIterator*>(se->children()[1].get()) != nullptr); } TEST_MAIN() { TEST_RUN_ALL(); } |