diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-10-02 13:33:45 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-10-02 13:41:54 +0200 |
commit | 94f88a9d7726bdb4f1c60efbca46dcd3c919c769 (patch) | |
tree | a81ff3a24d7aa77653485f7c87b0c3aa7602be4a /vsm | |
parent | 131eceb70230554ce9225dbfeb0af57bca80c083 (diff) |
Change signature of fill_matching_elements to take a const reference to
StructFieldMapper.
Diffstat (limited to 'vsm')
-rw-r--r-- | vsm/src/vespa/vsm/vsm/docsumconfig.cpp | 4 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/docsumconfig.h | 2 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/vsm-adapter.cpp | 2 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/vsm-adapter.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vsm/src/vespa/vsm/vsm/docsumconfig.cpp b/vsm/src/vespa/vsm/vsm/docsumconfig.cpp index ab89f4d460f..f3d9710c93c 100644 --- a/vsm/src/vespa/vsm/vsm/docsumconfig.cpp +++ b/vsm/src/vespa/vsm/vsm/docsumconfig.cpp @@ -9,7 +9,7 @@ using search::docsummary::EmptyDFW; namespace vsm { IDocsumFieldWriter::UP -DynamicDocsumConfig::createFieldWriter(const string & fieldName, const string & overrideName, const string & argument, bool & rc) +DynamicDocsumConfig::createFieldWriter(const string & fieldName, const string & overrideName, const string & argument, bool & rc, std::shared_ptr<search::StructFieldMapper> struct_field_mapper) { IDocsumFieldWriter::UP fieldWriter; if ((overrideName == "staticrank") || @@ -27,7 +27,7 @@ DynamicDocsumConfig::createFieldWriter(const string & fieldName, const string & (overrideName == "geopos")) { rc = true; } else { - fieldWriter = search::docsummary::DynamicDocsumConfig::createFieldWriter(fieldName, overrideName, argument, rc); + fieldWriter = search::docsummary::DynamicDocsumConfig::createFieldWriter(fieldName, overrideName, argument, rc, struct_field_mapper); } return fieldWriter; } diff --git a/vsm/src/vespa/vsm/vsm/docsumconfig.h b/vsm/src/vespa/vsm/vsm/docsumconfig.h index b6a3db45472..351e2523526 100644 --- a/vsm/src/vespa/vsm/vsm/docsumconfig.h +++ b/vsm/src/vespa/vsm/vsm/docsumconfig.h @@ -14,7 +14,7 @@ public: private: std::unique_ptr<search::docsummary::IDocsumFieldWriter> createFieldWriter(const string & fieldName, const string & overrideName, - const string & cf, bool & rc) override; + const string & cf, bool & rc, std::shared_ptr<search::StructFieldMapper> struct_field_mapper) override; }; } diff --git a/vsm/src/vespa/vsm/vsm/vsm-adapter.cpp b/vsm/src/vespa/vsm/vsm/vsm-adapter.cpp index 8a480419aa5..d161130687e 100644 --- a/vsm/src/vespa/vsm/vsm/vsm-adapter.cpp +++ b/vsm/src/vespa/vsm/vsm/vsm-adapter.cpp @@ -48,7 +48,7 @@ void GetDocsumsStateCallback::FillDocumentLocations(GetDocsumsState *state, IDoc } std::unique_ptr<MatchingElements> -GetDocsumsStateCallback::fill_matching_elements() +GetDocsumsStateCallback::fill_matching_elements(const search::StructFieldMapper &) { return std::make_unique<MatchingElements>(); } diff --git a/vsm/src/vespa/vsm/vsm/vsm-adapter.h b/vsm/src/vespa/vsm/vsm/vsm-adapter.h index 2a5b1e1d47c..6f67f9eb90c 100644 --- a/vsm/src/vespa/vsm/vsm/vsm-adapter.h +++ b/vsm/src/vespa/vsm/vsm/vsm-adapter.h @@ -39,7 +39,7 @@ public: void FillRankFeatures(GetDocsumsState * state, IDocsumEnvironment * env) override; void ParseLocation(GetDocsumsState * state) override; virtual void FillDocumentLocations(GetDocsumsState * state, IDocsumEnvironment * env); - virtual std::unique_ptr<search::MatchingElements> fill_matching_elements() override; + virtual std::unique_ptr<search::MatchingElements> fill_matching_elements(const search::StructFieldMapper &) override; void setSummaryFeatures(const search::FeatureSet::SP & sf) { _summaryFeatures = sf; } void setRankFeatures(const search::FeatureSet::SP & rf) { _rankFeatures = rf; } ~GetDocsumsStateCallback(); |