diff options
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/matching/fakesearchcontext.h | 3 | ||||
| -rw-r--r-- | searchcorespi/src/vespa/searchcorespi/index/indexcollection.h | 29 |
2 files changed, 9 insertions, 23 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/matching/fakesearchcontext.h b/searchcore/src/vespa/searchcore/proton/matching/fakesearchcontext.h index b17c4cb4f27..cebc837887c 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/fakesearchcontext.h +++ b/searchcore/src/vespa/searchcore/proton/matching/fakesearchcontext.h @@ -5,7 +5,6 @@ #include "isearchcontext.h" #include <vespa/searchcorespi/index/fakeindexsearchable.h> #include <vespa/searchcorespi/index/indexcollection.h> -#include <vespa/searchlib/queryeval/fake_searchable.h> #include <vespa/searchlib/attribute/fixedsourceselector.h> #include <algorithm> #include <map> @@ -27,7 +26,6 @@ private: vespalib::Clock _clock; vespalib::Doom _doom; search::queryeval::ISourceSelector::SP _selector; - search::attribute::IAttributeContext *_attrCtx; IndexCollection::SP _indexes; FakeSearchable _attrSearchable; uint32_t _docIdLimit; @@ -37,7 +35,6 @@ public: : _clock(), _doom(_clock, -1), _selector(new search::FixedSourceSelector(0, "fs", initialNumDocs)), - _attrCtx(NULL), _indexes(new IndexCollection(_selector)), _attrSearchable(), _docIdLimit(initialNumDocs) {} diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexcollection.h b/searchcorespi/src/vespa/searchcorespi/index/indexcollection.h index 596d9201063..730c0376ec7 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexcollection.h +++ b/searchcorespi/src/vespa/searchcorespi/index/indexcollection.h @@ -4,10 +4,6 @@ #include "isearchableindexcollection.h" #include <vespa/searchlib/util/searchable_stats.h> -#include <memory> -#include <set> -#include <utility> -#include <vector> namespace searchcorespi { @@ -21,9 +17,9 @@ class IndexCollection : public ISearchableIndexCollection uint32_t id; IndexSearchable::SP source_wrapper; - SourceWithId(uint32_t id_in, - const IndexSearchable::SP &source_in) - : id(id_in), source_wrapper(source_in) {} + SourceWithId(uint32_t id_in, const IndexSearchable::SP &source_in) + : id(id_in), source_wrapper(source_in) + {} SourceWithId() : id(0), source_wrapper() {} }; @@ -34,8 +30,7 @@ class IndexCollection : public ISearchableIndexCollection public: IndexCollection(const ISourceSelectorSP & selector); - IndexCollection(const ISourceSelectorSP & selector, - const ISearchableIndexCollection &sources); + IndexCollection(const ISourceSelectorSP & selector, const ISearchableIndexCollection &sources); void append(uint32_t id, const IndexSearchable::SP &source) override; void replace(uint32_t id, const IndexSearchable::SP &source) override; @@ -51,22 +46,16 @@ public: // Implements IndexSearchable Blueprint::UP - createBlueprint(const IRequestContext & requestContext, - const FieldSpec &field, - const Node &term) override; + createBlueprint(const IRequestContext & requestContext, const FieldSpec &field, const Node &term) override; Blueprint::UP - createBlueprint(const IRequestContext & requestContext, - const FieldSpecList &fields, - const Node &term) override; + createBlueprint(const IRequestContext & requestContext, const FieldSpecList &fields, const Node &term) override; search::SearchableStats getSearchableStats() const override; search::SerialNum getSerialNum() const override; void accept(IndexSearchableVisitor &visitor) const override; - static ISearchableIndexCollection::UP replaceAndRenumber( - const ISourceSelectorSP & selector, - const ISearchableIndexCollection &fsc, - uint32_t id_diff, - const IndexSearchable::SP &new_source); + static ISearchableIndexCollection::UP + replaceAndRenumber(const ISourceSelectorSP & selector, const ISearchableIndexCollection &fsc, + uint32_t id_diff, const IndexSearchable::SP &new_source); }; } // namespace searchcorespi |