diff options
| author | Tor Egge <Tor.Egge@online.no> | 2022-08-26 14:53:03 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2022-08-26 14:53:03 +0200 |
| commit | fc697cd7eb9d75fc18034c3b6def0d06eb3c86b7 (patch) | |
| tree | 04809cd1b691c9e479b8cf4113a63cee2ccde725 /searchcore | |
| parent | 6abaff9335b2f9fc36f121becce93fa792cb97f5 (diff) | |
Use smart pointers in search::docsummary::DynamicDocsumWriter.
Diffstat (limited to 'searchcore')
3 files changed, 3 insertions, 3 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/isummarymanager.h b/searchcore/src/vespa/searchcore/proton/docsummary/isummarymanager.h index bf064a707fe..e3c4705104f 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/isummarymanager.h +++ b/searchcore/src/vespa/searchcore/proton/docsummary/isummarymanager.h @@ -34,7 +34,7 @@ public: virtual ~ISummarySetup() {} virtual search::docsummary::IDocsumWriter &getDocsumWriter() const = 0; - virtual search::docsummary::ResultConfig &getResultConfig() = 0; + virtual const search::docsummary::ResultConfig &getResultConfig() = 0; virtual search::docsummary::IDocsumStore::UP createDocsumStore() = 0; // Inherit doc from IDocsumEnvironment diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp index 34960d9707d..18c84038f9b 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp @@ -102,7 +102,7 @@ SummarySetup(const vespalib::string & baseDir, const SummaryConfig & summaryCfg, } _juniperConfig = std::make_unique<juniper::Juniper>(&_juniperProps, _wordFolder.get()); - _docsumWriter = std::make_unique<DynamicDocsumWriter>(resultConfig.release(), nullptr); + _docsumWriter = std::make_unique<DynamicDocsumWriter>(std::move(resultConfig), std::unique_ptr<KeywordExtractor>()); DynamicDocsumConfig dynCfg(this, _docsumWriter.get()); dynCfg.configure(summarymapCfg); } diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h index 36808acd86c..0fd45bb28fb 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h +++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.h @@ -39,7 +39,7 @@ public: std::shared_ptr<const document::DocumentTypeRepo> repo); search::docsummary::IDocsumWriter & getDocsumWriter() const override { return *_docsumWriter; } - search::docsummary::ResultConfig & getResultConfig() override { return *_docsumWriter->GetResultConfig(); } + const search::docsummary::ResultConfig & getResultConfig() override { return *_docsumWriter->GetResultConfig(); } search::docsummary::IDocsumStore::UP createDocsumStore() override; |