Remove mustSkip from ResolveClassInfo.

3 files changed, 4 insertions, 6 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
index cb541c2836d..942dac63955 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
@@ -84,7 +84,7 @@ DocsumContext::createSlimeReply()
         if (_request.expired() ) { break; }
         Cursor &docSumC = array.addObject();
         ObjectSymbolInserter inserter(docSumC, docsumSym);
-        if ((docId != search::endDocId) && !rci.mustSkip) {
+        if ((docId != search::endDocId) && rci.outputClass != nullptr) {
             _docsumWriter.insertDocsum(rci, docId, &_docsumState, &_docsumStore, inserter);
         }
         num_ok++;
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)
         { }
     };