diff options
Diffstat (limited to 'vsm')
-rw-r--r-- | vsm/src/tests/searcher/searcher.cpp | 12 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/vsmquerynoderesult.cpp | 6 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/vsmquerynoderesult.h | 19 |
3 files changed, 6 insertions, 31 deletions
diff --git a/vsm/src/tests/searcher/searcher.cpp b/vsm/src/tests/searcher/searcher.cpp index 5bb47b7d2ae..d1c1cd2060b 100644 --- a/vsm/src/tests/searcher/searcher.cpp +++ b/vsm/src/tests/searcher/searcher.cpp @@ -16,7 +16,7 @@ #include <vespa/document/fieldvalue/fieldvalues.h> using namespace document; -using search::EmptyQueryNodeResult; +using search::QueryNodeResultFactory; using search::QueryTerm; using search::QueryTermList; using namespace vsm; @@ -56,7 +56,7 @@ private: for (size_t i = 0; i < terms.size(); ++i) { ParsedQueryTerm pqt = parseQueryTerm(terms[i]); ParsedTerm pt = parseTerm(pqt.second); - qtv.push_back(QueryTerm(eqnr, pt.first, pqt.first.empty() ? "index" : pqt.first, pt.second)); + qtv.push_back(QueryTerm(eqnr.create(), pt.first, pqt.first.empty() ? "index" : pqt.first, pt.second)); } for (size_t i = 0; i < qtv.size(); ++i) { qtl.push_back(&qtv[i]); @@ -65,7 +65,7 @@ private: public: typedef std::pair<std::string, std::string> ParsedQueryTerm; typedef std::pair<std::string, QueryTerm::SearchTerm> ParsedTerm; - EmptyQueryNodeResult eqnr; + QueryNodeResultFactory eqnr; std::vector<QueryTerm> qtv; QueryTermList qtl; Query(const StringList & terms) : eqnr(), qtv(), qtl() { @@ -268,9 +268,9 @@ getFieldValue(const FloatList & fv) bool assertMatchTermSuffix(const std::string & term, const std::string & word) { - EmptyQueryNodeResult eqnr; - QueryTerm qa(eqnr, term, "index", QueryTerm::WORD); - QueryTerm qb(eqnr, word, "index", QueryTerm::WORD); + QueryNodeResultFactory eqnr; + QueryTerm qa(eqnr.create(), term, "index", QueryTerm::WORD); + QueryTerm qb(eqnr.create(), word, "index", QueryTerm::WORD); const ucs4_t * a; size_t alen = qa.term(a); const ucs4_t * b; diff --git a/vsm/src/vespa/vsm/vsm/vsmquerynoderesult.cpp b/vsm/src/vespa/vsm/vsm/vsmquerynoderesult.cpp deleted file mode 100644 index 98650f41eef..00000000000 --- a/vsm/src/vespa/vsm/vsm/vsmquerynoderesult.cpp +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "vsmquerynoderesult.h" - -namespace vsm { - IMPLEMENT_DUPLICATE(VsmQueryNodeResult); -} diff --git a/vsm/src/vespa/vsm/vsm/vsmquerynoderesult.h b/vsm/src/vespa/vsm/vsm/vsmquerynoderesult.h deleted file mode 100644 index 13cfaedb932..00000000000 --- a/vsm/src/vespa/vsm/vsm/vsmquerynoderesult.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#pragma once - -#include <vespa/searchlib/query/querynoderesultbase.h> - -namespace vsm -{ - -class VsmQueryNodeResult : public search::QueryNodeResultBase -{ - public: - DUPLICATE(VsmQueryNodeResult); - virtual ~VsmQueryNodeResult() { } - virtual bool evaluate() const { return true; } - virtual void reset() { } -}; - -} - |