diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-22 17:04:25 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-22 17:04:25 +0200 |
commit | 5268ffdf82770b92e631b93c68bf7d5c84ab57be (patch) | |
tree | acb2fe89cc5077cccfe37e26c768e1687d9ca52b /searchlib/src | |
parent | 0400c6cccc22e42973a3e481ad1ede0816cb3dbe (diff) |
Init correct range, and also set docidLimit on attribute blueprint.
Diffstat (limited to 'searchlib/src')
-rw-r--r-- | searchlib/src/tests/attribute/searchable/attributeblueprint_test.cpp | 15 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp | 4 |
2 files changed, 7 insertions, 12 deletions
diff --git a/searchlib/src/tests/attribute/searchable/attributeblueprint_test.cpp b/searchlib/src/tests/attribute/searchable/attributeblueprint_test.cpp index ec0fac19154..ebd50f42534 100644 --- a/searchlib/src/tests/attribute/searchable/attributeblueprint_test.cpp +++ b/searchlib/src/tests/attribute/searchable/attributeblueprint_test.cpp @@ -1,28 +1,21 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP("attributeblueprint_test"); #include <vespa/searchcommon/attribute/iattributecontext.h> #include <vespa/searchlib/attribute/attribute_blueprint_factory.h> -#include <vespa/searchlib/attribute/attributeguard.h> #include <vespa/searchlib/attribute/attributecontext.h> #include <vespa/searchlib/attribute/attributevector.h> #include <vespa/searchlib/attribute/extendableattributes.h> #include <vespa/searchlib/attribute/singlenumericattribute.h> #include <vespa/searchlib/attribute/singlenumericattribute.hpp> #include <vespa/searchlib/attribute/singlenumericpostattribute.hpp> -#include <vespa/searchlib/attribute/iattributemanager.h> -#include <vespa/searchlib/fef/matchdata.h> -#include <vespa/searchlib/fef/termfieldmatchdata.h> #include <vespa/searchlib/query/tree/location.h> #include <vespa/searchlib/query/tree/point.h> #include <vespa/searchlib/query/tree/simplequery.h> -#include <vespa/searchlib/query/weight.h> -#include <vespa/searchlib/queryeval/searchiterator.h> #include <vespa/searchlib/queryeval/fake_requestcontext.h> #include <vespa/vespalib/testkit/testapp.h> -#include <memory> -#include <string> + +#include <vespa/log/log.h> +LOG_SETUP("attributeblueprint_test"); using search::AttributeEnumGuard; using search::AttributeGuard; @@ -131,7 +124,7 @@ bool Test::search(const Node &node, IAttributeManager &attribute_manager) { result->fetchPostings(true); SearchIterator::UP iterator = result->createSearch(*md, true); ASSERT_TRUE((bool)iterator); - iterator->initFullRange(); + iterator->initRange(1, result->get_docid_limit()); EXPECT_TRUE(!iterator->seek(1)); return iterator->seek(2); } diff --git a/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp b/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp index 91a6dc87d3b..c103f833176 100644 --- a/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp +++ b/searchlib/src/vespa/searchlib/attribute/attribute_blueprint_factory.cpp @@ -624,7 +624,9 @@ AttributeBlueprintFactory::createBlueprint(const IRequestContext & requestContex } CreateBlueprintVisitor visitor(*this, requestContext, field, *attr); const_cast<Node &>(term).accept(visitor); - return visitor.getResult(); + Blueprint::UP bp = visitor.getResult(); + bp->setDocIdLimit(attr->getNumDocs()); + return bp; } } // namespace search |