summaryrefslogtreecommitdiffstats
path: root/vsm
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-02-23 00:08:21 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2017-02-23 00:08:21 +0100
commit163ba724c52eb4d7364baa85cbd55c82f6594cad (patch)
tree1c71d2ab02455d7df09cd918b61adceae55fe559 /vsm
parent53f09660891181825dbd3364c63b0da304a21968 (diff)
Avoid creating objects not needed.
Diffstat (limited to 'vsm')
-rw-r--r--vsm/src/tests/searcher/searcher.cpp12
1 files changed, 6 insertions, 6 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;