Allocate a docsums state for each summary class in streaming search.

3 files changed, 2 insertions, 14 deletions

diff --git a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
index d12223d5cf4..a845a39207f 100644
--- a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
+++ b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
@@ -54,7 +54,8 @@ struct DocsumFixture : IDocsumStore, GetDocsumsStateCallback {
     void getDocsum(Slime &slime) {
         Slime slimeOut;
         SlimeInserter inserter(slimeOut);
-        writer->WriteDocsum(1u, &state, this, inserter);
+        auto rci = writer->resolveClassInfo(state._args.getResultClassName());
+        writer->insertDocsum(rci, 1u, &state, this, inserter);
         vespalib::SmartBuffer buf(4_Ki);
         BinaryFormat::encode(slimeOut, buf);
         EXPECT_GREATER(BinaryFormat::decode(buf.obtain(), slime), 0u);
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp
index 39d4be1aa3b..18371970722 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp
@@ -162,12 +162,4 @@ DynamicDocsumWriter::InitState(const IAttributeManager & attrMan, GetDocsumsStat
     }
 }
 
-
-void
-DynamicDocsumWriter::WriteDocsum(uint32_t docid, GetDocsumsState *state, IDocsumStore *docinfos, Inserter& inserter)
-{
-    ResolveClassInfo rci = resolveClassInfo(state->_args.getResultClassName());
-    insertDocsum(rci, docid, state, docinfos, inserter);
-}
-
 }
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h
index 909be169006..f9c5a5ff7cf 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h
@@ -37,8 +37,6 @@ public:
 
     virtual ~IDocsumWriter() = default;
     virtual void InitState(const search::IAttributeManager & attrMan, GetDocsumsState *state) = 0;
-    virtual void WriteDocsum(uint32_t docid, GetDocsumsState *state,
-                             IDocsumStore *docinfos, Inserter & target) = 0;
     virtual void insertDocsum(const ResolveClassInfo & rci, uint32_t docid, GetDocsumsState *state,
                               IDocsumStore *docinfos, Inserter & target) = 0;
     virtual ResolveClassInfo resolveClassInfo(vespalib::stringref outputClassName) const = 0;
@@ -67,9 +65,6 @@ public:
 
     bool Override(const char *fieldName, std::unique_ptr<DocsumFieldWriter> writer);
     void InitState(const search::IAttributeManager & attrMan, GetDocsumsState *state) override;
-    void WriteDocsum(uint32_t docid, GetDocsumsState *state,
-                     IDocsumStore *docinfos, Inserter & inserter) override;
-
     void insertDocsum(const ResolveClassInfo & outputClassInfo, uint32_t docid, GetDocsumsState *state,
                       IDocsumStore *docinfos, Inserter & inserter) override;