diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-01-03 10:17:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-03 10:17:52 +0100 |
commit | 48c8e7ea5ae757fda8480ce3d045711f22adc9f2 (patch) | |
tree | 6ff7626bc1ee78ae4d0361a6572b6eb16b61ba4e /searchcorespi | |
parent | 4bbac8adbf1d9e0f112f950323e5ca08eb6ba658 (diff) | |
parent | 5a89acb50b5c67b97f4039cf972808a6505ebd81 (diff) |
Merge pull request #11635 from vespa-engine/revert-11619-balder/add-executeinfo
Revert "Balder/add executeinfo"
Diffstat (limited to 'searchcorespi')
-rw-r--r-- | searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.cpp | 11 | ||||
-rw-r--r-- | searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.h | 16 |
2 files changed, 11 insertions, 16 deletions
diff --git a/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.cpp b/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.cpp index 98e44ff8e44..39f6a489908 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.cpp +++ b/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.cpp @@ -219,21 +219,12 @@ WarmupIndexCollection::getSearchableSP(uint32_t i) const return _next->getSearchableSP(i); } -WarmupIndexCollection::WarmupTask::WarmupTask(std::unique_ptr<MatchData> md, WarmupIndexCollection & warmup) - : _warmup(warmup), - _matchData(std::move(md)), - _bluePrint(), - _requestContext() -{ } - -WarmupIndexCollection::WarmupTask::~WarmupTask() = default; - void WarmupIndexCollection::WarmupTask::run() { if (_warmup._warmupEndTime != vespalib::steady_time()) { LOG(debug, "Warming up %s", _bluePrint->asString().c_str()); - _bluePrint->fetchPostings(search::queryeval::ExecuteInfo::TRUE); + _bluePrint->fetchPostings(true); SearchIterator::UP it(_bluePrint->createSearch(*_matchData, true)); it->initFullRange(); for (uint32_t docId = it->seekFirst(1); !it->isAtEnd(); docId = it->seekNext(docId+1)) { diff --git a/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.h b/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.h index fb36807b8e4..571353574c1 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.h +++ b/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.h @@ -70,8 +70,12 @@ private: typedef vespalib::Executor::Task Task; class WarmupTask : public Task { public: - WarmupTask(std::unique_ptr<MatchData> md, WarmupIndexCollection & warmup); - ~WarmupTask() override; + WarmupTask(MatchData::UP md, WarmupIndexCollection & warmup) : + _warmup(warmup), + _matchData(std::move(md)), + _bluePrint(), + _requestContext() + { } WarmupTask &createBlueprint(const FieldSpec &field, const Node &term) { _bluePrint = _warmup.createBlueprint(_requestContext, field, term); return *this; @@ -82,10 +86,10 @@ private: } private: void run() override; - WarmupIndexCollection & _warmup; - std::unique_ptr<MatchData> _matchData; - Blueprint::UP _bluePrint; - FakeRequestContext _requestContext; + WarmupIndexCollection & _warmup; + MatchData::UP _matchData; + Blueprint::UP _bluePrint; + FakeRequestContext _requestContext; }; void fireWarmup(Task::UP task); |