diff options
author | Arne H Juul <arnej@yahooinc.com> | 2021-10-14 14:12:44 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2021-10-14 14:12:44 +0000 |
commit | e28a07fab5f83fd06f84bee95f20f457738b7ddb (patch) | |
tree | 1444ff8a098f71af59770d23886c876acdd6566d /searchcore/src | |
parent | df689ff589e185f51dec5a6cfa70e4009ebc176a (diff) |
more useful DocsumReply
Diffstat (limited to 'searchcore/src')
4 files changed, 5 insertions, 8 deletions
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp index 1584cf4cd02..fca5e4dfbda 100644 --- a/searchcore/src/tests/proton/docsummary/docsummary.cpp +++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp @@ -344,7 +344,7 @@ bool assertSlime(const std::string &exp, const DocsumReply &reply) { vespalib::Slime expSlime; size_t used = JsonFormat::decode(exp, expSlime); EXPECT_TRUE(used > 0); - ASSERT_TRUE(reply.hasSlime()); + ASSERT_TRUE(reply.hasResults()); return (EXPECT_EQUAL(expSlime, reply.slime())); } diff --git a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp index ca4f2329c19..b59aaf33908 100644 --- a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp +++ b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp @@ -135,7 +135,7 @@ void assertSlime(const std::string &exp, const DocsumReply &reply) { vespalib::Slime expSlime; size_t used = JsonFormat::decode(exp, expSlime); EXPECT_TRUE(used > 0); - ASSERT_TRUE(reply.hasSlime()); + ASSERT_TRUE(reply.hasResults()); EXPECT_EQUAL(expSlime, reply.slime()); } @@ -160,7 +160,7 @@ TEST("requireThatGetDocsumsExecute") { DocsumRequest::Source request(createRequest()); DocsumReply::UP reply = engine.getDocsums(std::move(request), client); EXPECT_TRUE(reply); - EXPECT_FALSE(reply->hasSlime()); + EXPECT_FALSE(reply->hasResults()); } } diff --git a/searchcore/src/vespa/searchcore/proton/summaryengine/docsum_by_slime.cpp b/searchcore/src/vespa/searchcore/proton/summaryengine/docsum_by_slime.cpp index 3c8e5715a28..1860f3ab989 100644 --- a/searchcore/src/vespa/searchcore/proton/summaryengine/docsum_by_slime.cpp +++ b/searchcore/src/vespa/searchcore/proton/summaryengine/docsum_by_slime.cpp @@ -93,7 +93,7 @@ vespalib::Slime::UP DocsumBySlime::getDocsums(const Inspector & req) { DocsumReply::UP reply = _docsumServer.getDocsums(slimeToRequest(req)); - if (reply && reply->hasSlime()) { + if (reply && reply->hasResults()) { return reply->releaseSlime(); } else { LOG(warning, "got <null> docsum reply from back-end"); diff --git a/searchcore/src/vespa/searchcore/proton/summaryengine/summaryengine.cpp b/searchcore/src/vespa/searchcore/proton/summaryengine/summaryengine.cpp index 0e01ee68cea..8a4ac98643d 100644 --- a/searchcore/src/vespa/searchcore/proton/summaryengine/summaryengine.cpp +++ b/searchcore/src/vespa/searchcore/proton/summaryengine/summaryengine.cpp @@ -145,10 +145,7 @@ SummaryEngine::getDocsums(DocsumRequest::UP req) } updateDocsumMetrics(vespalib::to_s(req->getTimeUsed()), getNumDocs(*reply)); } - reply->setRequest(std::move(req)); - reply->setIssues(std::move(my_issues)); - - return reply; + return std::make_unique<DocsumReply>(reply->releaseSlime(), std::move(req), std::move(my_issues)); } void |