summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-02-23 00:38:09 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2017-02-23 00:38:09 +0100
commitf19434c6f797ba778dafee8ede22f8ce69bff0e7 (patch)
tree6ba7fb911ef646d85cc78710eb385c9d427e8bd6
parent163ba724c52eb4d7364baa85cbd55c82f6594cad (diff)
Remove unused code.
-rw-r--r--searchlib/src/vespa/searchlib/query/querynoderesultbase.h2
-rw-r--r--searchlib/src/vespa/searchlib/query/queryterm.cpp4
-rw-r--r--streamingvisitors/src/vespa/searchvisitor/querytermdata.h2
3 files changed, 2 insertions, 6 deletions
diff --git a/searchlib/src/vespa/searchlib/query/querynoderesultbase.h b/searchlib/src/vespa/searchlib/query/querynoderesultbase.h
index d52b32ff5ac..c0d47f0f11d 100644
--- a/searchlib/src/vespa/searchlib/query/querynoderesultbase.h
+++ b/searchlib/src/vespa/searchlib/query/querynoderesultbase.h
@@ -13,8 +13,6 @@ namespace search {
class QueryNodeResultBase : public vespalib::Cloneable
{
public:
- virtual bool evaluate() const = 0;
- virtual void reset() = 0;
};
class QueryNodeResultFactory {
diff --git a/searchlib/src/vespa/searchlib/query/queryterm.cpp b/searchlib/src/vespa/searchlib/query/queryterm.cpp
index 1a0e49ce769..7a794630929 100644
--- a/searchlib/src/vespa/searchlib/query/queryterm.cpp
+++ b/searchlib/src/vespa/searchlib/query/queryterm.cpp
@@ -284,8 +284,8 @@ void QueryTerm::getPhrases(QueryNodeRefList & tl) { (void) tl; }
void QueryTerm::getPhrases(ConstQueryNodeRefList & tl) const { (void) tl; }
void QueryTerm::getLeafs(QueryTermList & tl) { tl.push_back(this); }
void QueryTerm::getLeafs(ConstQueryTermList & tl) const { tl.push_back(this); }
-bool QueryTerm::evaluate() const { return !_hitList.empty() && _result->evaluate(); }
-void QueryTerm::reset() { _hitList.clear(); _result->reset(); }
+bool QueryTerm::evaluate() const { return !_hitList.empty(); }
+void QueryTerm::reset() { _hitList.clear(); }
const HitList & QueryTerm::evaluateHits(HitList &) const { return _hitList; }
void QueryTerm::resizeFieldId(size_t fieldNo)
diff --git a/streamingvisitors/src/vespa/searchvisitor/querytermdata.h b/streamingvisitors/src/vespa/searchvisitor/querytermdata.h
index 5f54146ede1..dfe3080808c 100644
--- a/streamingvisitors/src/vespa/searchvisitor/querytermdata.h
+++ b/streamingvisitors/src/vespa/searchvisitor/querytermdata.h
@@ -17,8 +17,6 @@ private:
search::fef::SimpleTermData _termData;
public:
QueryTermData * clone() const override { return new QueryTermData(); }
- bool evaluate() const override { return true; }
- void reset() override { }
search::fef::SimpleTermData &getTermData() { return _termData; }
};