diff options
| -rw-r--r-- | searchcommon/src/vespa/searchcommon/attribute/i_search_context.h (renamed from searchlib/src/vespa/searchlib/attribute/isearchcontext.h) | 4 | ||||
| -rw-r--r-- | searchcommon/src/vespa/searchcommon/common/range.h (renamed from searchlib/src/vespa/searchlib/common/range.h) | 0 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/attribute/attribute_weighted_set_blueprint.cpp | 2 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/attribute/attributevector.h | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/isearchcontext.h b/searchcommon/src/vespa/searchcommon/attribute/i_search_context.h index b59b09050c1..bb6dfe0daf6 100644 --- a/searchlib/src/vespa/searchlib/attribute/isearchcontext.h +++ b/searchcommon/src/vespa/searchcommon/attribute/i_search_context.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/searchlib/common/range.h> +#include <vespa/searchcommon/common/range.h> namespace search { @@ -34,8 +34,6 @@ namespace attribute { * unpacking data for a hit * * @param strict whether the iterator should be strict or not - * - * @param useBitVector whether bitvectors should be used when available **/ virtual std::unique_ptr<queryeval::SearchIterator> createIterator(fef::TermFieldMatchData *matchData, bool strict) = 0; diff --git a/searchlib/src/vespa/searchlib/common/range.h b/searchcommon/src/vespa/searchcommon/common/range.h index f33630daaf4..f33630daaf4 100644 --- a/searchlib/src/vespa/searchlib/common/range.h +++ b/searchcommon/src/vespa/searchcommon/common/range.h diff --git a/searchlib/src/vespa/searchlib/attribute/attribute_weighted_set_blueprint.cpp b/searchlib/src/vespa/searchlib/attribute/attribute_weighted_set_blueprint.cpp index bfdabe8121d..aeccad63cf6 100644 --- a/searchlib/src/vespa/searchlib/attribute/attribute_weighted_set_blueprint.cpp +++ b/searchlib/src/vespa/searchlib/attribute/attribute_weighted_set_blueprint.cpp @@ -1,7 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "attribute_weighted_set_blueprint.h" -#include "isearchcontext.h" +#include <vespa/searchcommon/attribute/i_search_context.h> #include <vespa/searchlib/queryeval/weighted_set_term_search.h> #include <vespa/searchlib/query/queryterm.h> #include <vespa/searchlib/common/bitvector.h> diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.h b/searchlib/src/vespa/searchlib/attribute/attributevector.h index 496b6cdfbf5..e2f1dee567f 100644 --- a/searchlib/src/vespa/searchlib/attribute/attributevector.h +++ b/searchlib/src/vespa/searchlib/attribute/attributevector.h @@ -5,16 +5,16 @@ #include "address_space_usage.h" #include "iattributesavetarget.h" #include "changevector.h" -#include "isearchcontext.h" #include <vespa/fastlib/text/normwordfolder.h> #include <vespa/searchcommon/attribute/config.h> +#include <vespa/searchcommon/attribute/i_search_context.h> #include <vespa/searchcommon/attribute/iattributevector.h> #include <vespa/searchcommon/attribute/status.h> +#include <vespa/searchcommon/common/range.h> #include <vespa/searchcommon/common/undefinedvalues.h> #include <vespa/searchlib/common/address_space.h> #include <vespa/searchlib/common/i_compactable_lid_space.h> #include <vespa/searchlib/common/identifiable.h> -#include <vespa/searchlib/common/range.h> #include <vespa/searchlib/common/rcuvector.h> #include <vespa/searchlib/queryeval/searchiterator.h> #include <vespa/vespalib/objects/identifiable.h> |