summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahooinc.com>2021-10-13 07:37:32 +0000
committerArne H Juul <arnej@yahooinc.com>2021-10-13 10:43:42 +0000
commit9ec8a0c951883b43b09b68b9609efedb74720ebe (patch)
tree8801e0f2653de84bf2212df64e8f625fd729f324 /searchcore
parent9a24ed9a9e9870e6205f947abb4a4313177a3a52 (diff)
remove code path generating binary blobs in DocsumReply
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp36
-rw-r--r--searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h1
2 files changed, 1 insertions, 36 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
index 319b647685b..74e135f021d 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp
@@ -62,37 +62,6 @@ DocsumContext::initState()
}
}
-DocsumReply::UP
-DocsumContext::createReply()
-{
- auto reply = std::make_unique<DocsumReply>();
- search::RawBuf buf(4_Ki);
- _docsumWriter.InitState(_attrMgr, &_docsumState);
- reply->docsums.resize(_docsumState._docsumcnt);
- SymbolTable::UP symbols = std::make_unique<SymbolTable>();
- IDocsumWriter::ResolveClassInfo rci = _docsumWriter.resolveClassInfo(_docsumState._args.getResultClassName(), _docsumStore.getSummaryClassId());
- _docsumState._omit_summary_features = rci.outputClass->omit_summary_features();
- for (uint32_t i = 0; i < _docsumState._docsumcnt; ++i) {
- buf.reset();
- uint32_t docId = _docsumState._docsumbuf[i];
- if (docId != search::endDocId && !rci.mustSkip) {
- Slime slime(Slime::Params(std::move(symbols)));
- vespalib::slime::SlimeInserter inserter(slime);
- if (_request.expired()) {
- inserter.insertString(make_string("Timed out with %" PRId64 "us left.", vespalib::count_us(_request.getTimeLeft())));
- } else {
- _docsumWriter.insertDocsum(rci, docId, &_docsumState, &_docsumStore, slime, inserter);
- }
- uint32_t docsumLen = (slime.get().type().getId() != NIX::ID)
- ? IDocsumWriter::slime2RawBuf(slime, buf)
- : 0;
- reply->docsums[i].setData(buf.GetDrainPos(), docsumLen);
- symbols = Slime::reclaimSymbols(std::move(slime));
- }
- }
- return reply;
-}
-
namespace {
vespalib::Slime::Params
@@ -156,10 +125,7 @@ DocsumContext::DocsumContext(const DocsumRequest & request, IDocsumWriter & docs
DocsumReply::UP
DocsumContext::getDocsums()
{
- if (_request.useRootSlime()) {
- return std::make_unique<DocsumReply>(createSlimeReply());
- }
- return createReply();
+ return std::make_unique<DocsumReply>(createSlimeReply());
}
void
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h
index 8d408bc38b2..958e19f9bed 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.h
@@ -32,7 +32,6 @@ private:
matching::SessionManager & _sessionMgr;
void initState();
- search::engine::DocsumReply::UP createReply();
std::unique_ptr<vespalib::Slime> createSlimeReply();
public: