summaryrefslogtreecommitdiffstats
path: root/searchsummary
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2024-02-05 15:03:19 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2024-02-05 15:03:19 +0000
commit19c39fc777a89ce8d9f3b71becfc93debab923ea (patch)
tree7d1df8af037a4503ff41eff466dad9b650441ff4 /searchsummary
parenta30640c1aed5cbe03b0e992936d39ca0263e93d4 (diff)
Use reference instead of pointer.
Diffstat (limited to 'searchsummary')
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.cpp10
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.h4
3 files changed, 8 insertions, 8 deletions
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp
index 7baeccbe8cb..5dcfda64e1e 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/dynamicteaserdfw.cpp
@@ -39,7 +39,7 @@ DynamicTeaserDFW::insert_juniper_field(uint32_t docid, vespalib::stringref input
if (!query) {
JuniperQueryAdapter iq(_query_term_filter.get(),
state._args.getStackDump(),
- &state._args.highlightTerms());
+ state._args.highlightTerms());
query = _juniper->CreateQueryHandle(iq, nullptr);
}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.cpp
index 11bf664b767..1131b94d09a 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.cpp
@@ -11,7 +11,7 @@
namespace search::docsummary {
JuniperQueryAdapter::JuniperQueryAdapter(const IQueryTermFilter *query_term_filter, vespalib::stringref buf,
- const search::fef::Properties *highlightTerms)
+ const search::fef::Properties & highlightTerms)
: _query_term_filter(query_term_filter),
_buf(buf),
_highlightTerms(highlightTerms)
@@ -42,7 +42,7 @@ JuniperQueryAdapter::Traverse(juniper::IQueryVisitor *v) const
search::SimpleQueryStackDumpIterator iterator(_buf);
JuniperDFWQueryItem item(&iterator);
- if (_highlightTerms->numKeys() > 0) {
+ if (_highlightTerms.numKeys() > 0) {
v->VisitAND(&item, 2);
}
while (rc && iterator.next()) {
@@ -144,11 +144,11 @@ JuniperQueryAdapter::Traverse(juniper::IQueryVisitor *v) const
}
}
- if (_highlightTerms->numKeys() > 1) {
- v->VisitAND(&item, _highlightTerms->numKeys());
+ if (_highlightTerms.numKeys() > 1) {
+ v->VisitAND(&item, _highlightTerms.numKeys());
}
JuniperDFWTermVisitor tv(v);
- _highlightTerms->visitProperties(tv);
+ _highlightTerms.visitProperties(tv);
return rc;
}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.h b/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.h
index 04cf512a6a6..2d67ff77db9 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.h
@@ -21,13 +21,13 @@ class JuniperQueryAdapter : public juniper::IQuery
private:
const IQueryTermFilter *_query_term_filter;
const vespalib::stringref _buf;
- const search::fef::Properties *_highlightTerms;
+ const search::fef::Properties & _highlightTerms;
public:
JuniperQueryAdapter(const JuniperQueryAdapter&) = delete;
JuniperQueryAdapter operator= (const JuniperQueryAdapter&) = delete;
JuniperQueryAdapter(const IQueryTermFilter *query_term_filter, vespalib::stringref buf,
- const search::fef::Properties *highlightTerms = nullptr);
+ const search::fef::Properties & highlightTerms);
~JuniperQueryAdapter() override;
bool skipItem(search::SimpleQueryStackDumpIterator *iterator) const;
bool Traverse(juniper::IQueryVisitor *v) const override;