diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-09-01 13:38:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-01 13:38:35 +0200 |
commit | 2c6a37b76972de298c40436a02865405ad3d174d (patch) | |
tree | 36c064bcbc3032362bac19b4b01a07e2b93168c8 /searchsummary | |
parent | 4ccd69308921c02e644f6fc3694a999425bdf141 (diff) | |
parent | 99d86ff3a5f614ed6e5c6793b5d35ea79bad68ac (diff) |
Merge pull request #23886 from vespa-engine/toregge/remove-mustskip-from-resolveclassinfo
Remove mustSkip from ResolveClassInfo.
Diffstat (limited to 'searchsummary')
-rw-r--r-- | searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp | 5 | ||||
-rw-r--r-- | searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp index 4eaca4dc36e..39d4be1aa3b 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp @@ -36,15 +36,14 @@ DynamicDocsumWriter::resolveOutputClass(vespalib::stringref summaryClass) const if (oC == nullptr) { Issue::report("Illegal docsum class requested: %s, using empty docsum for documents", vespalib::string(summaryClass).c_str()); - result.mustSkip = true; } else { - result.outputClass = oC; const ResultClass::DynamicInfo *rcInfo = oC->getDynamicInfo(); if (rcInfo->_generateCnt == oC->GetNumEntries()) { LOG_ASSERT(rcInfo->_overrideCnt == rcInfo->_generateCnt); result.allGenerated = true; } } + result.outputClass = oC; return result; } @@ -52,7 +51,7 @@ void DynamicDocsumWriter::insertDocsum(const ResolveClassInfo & rci, uint32_t docid, GetDocsumsState *state, IDocsumStore *docinfos, Inserter& topInserter) { - if (rci.mustSkip || rci.outputClass == nullptr) { + if (rci.outputClass == nullptr) { // Use empty docsum when illegal docsum class has been requested return; } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h index ac0d461ab81..909be169006 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h @@ -27,11 +27,10 @@ class IDocsumWriter public: using Inserter = vespalib::slime::Inserter; struct ResolveClassInfo { - bool mustSkip; bool allGenerated; const ResultClass *outputClass; ResolveClassInfo() - : mustSkip(false), allGenerated(false), + : allGenerated(false), outputClass(nullptr) { } }; |