From bdae7fb511e1d369089578bd0307044905d2bbb6 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Mon, 28 Jun 2021 09:33:42 +0000 Subject: GC unused members from SearchReply --- searchcore/src/tests/proton/docsummary/docsummary.cpp | 4 ---- searchcore/src/tests/proton/summaryengine/summaryengine.cpp | 2 -- searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp | 1 - searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp | 1 - searchcore/src/vespa/searchcore/proton/server/searchview.cpp | 2 +- 5 files changed, 1 insertion(+), 9 deletions(-) (limited to 'searchcore') diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp index 8dae53abf50..5c803b96a5d 100644 --- a/searchcore/src/tests/proton/docsummary/docsummary.cpp +++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp @@ -551,13 +551,10 @@ TEST("requireThatDocsumRequestIsProcessed") DocsumReply::UP rep = dc._ddb->getDocsums(req); EXPECT_EQUAL(3u, rep->docsums.size()); - EXPECT_EQUAL(2u, rep->docsums[0].docid); EXPECT_EQUAL(gid2, rep->docsums[0].gid); EXPECT_TRUE(assertSlime("{a:20}", *rep, 0, false)); - EXPECT_EQUAL(4u, rep->docsums[1].docid); EXPECT_EQUAL(gid4, rep->docsums[1].gid); EXPECT_TRUE(assertSlime("{a:40}", *rep, 1, false)); - EXPECT_EQUAL(search::endDocId, rep->docsums[2].docid); EXPECT_EQUAL(gid9, rep->docsums[2].gid); EXPECT_TRUE(rep->docsums[2].data.get() == nullptr); } @@ -1062,7 +1059,6 @@ TEST("requireThatPositionsAreUsed") // uint32_t rclass = 5; EXPECT_EQUAL(1u, rep->docsums.size()); - EXPECT_EQUAL(1u, rep->docsums[0].docid); EXPECT_EQUAL(gid1, rep->docsums[0].gid); EXPECT_TRUE(assertSlime("{sp2:'1047758'" ",sp2x:{x:1002, y:1003, latlong:'N0.001003;E0.001002'}" diff --git a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp index f5f2cc7a2a5..ccf6cf2fbfa 100644 --- a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp +++ b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp @@ -66,7 +66,6 @@ public: for (size_t i = 0; i < request.hits.size(); i++) { const DocsumRequest::Hit &h = request.hits[i]; DocsumReply::Docsum docsum; - docsum.docid = 10 + i; docsum.gid = h.gid; docsum.setData(_reply.data(), _reply.size()); retval->docsums.push_back(docsum); @@ -140,7 +139,6 @@ TEST("requireThatGetDocsumsExecute") { reply = client.getReply(10000); EXPECT_TRUE(reply); EXPECT_EQUAL(1u, reply->docsums.size()); - EXPECT_EQUAL(10u, reply->docsums[0].docid); EXPECT_EQUAL(GlobalId("aaaaaaaaaaaa"), reply->docsums[0].gid); EXPECT_EQUAL("myreply", std::string(reply->docsums[0].data.c_str(), reply->docsums[0].data.size())); } diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp index 4263b26dc6b..c0b5bcab791 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp +++ b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp @@ -74,7 +74,6 @@ DocsumContext::createReply() for (uint32_t i = 0; i < _docsumState._docsumcnt; ++i) { buf.reset(); uint32_t docId = _docsumState._docsumbuf[i]; - reply->docsums[i].docid = docId; if (docId != search::endDocId && !rci.mustSkip) { Slime slime(Slime::Params(std::move(symbols))); vespalib::slime::SlimeInserter inserter(slime); diff --git a/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp b/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp index 41052978997..28fda7428c0 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/result_processor.cpp @@ -124,7 +124,6 @@ ResultProcessor::makeReply(PartialResultUP full_result) } uint32_t hitOffset = _offset; uint32_t hitcnt = (result.size() > hitOffset) ? (result.size() - hitOffset) : 0; - r.offset = hitOffset; r.totalHitCount = result.totalHits(); r.hits.resize(hitcnt); document::GlobalId gid; diff --git a/searchcore/src/vespa/searchcore/proton/server/searchview.cpp b/searchcore/src/vespa/searchcore/proton/server/searchview.cpp index 36d873d9948..69657ff91ff 100644 --- a/searchcore/src/vespa/searchcore/proton/server/searchview.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/searchview.cpp @@ -85,7 +85,7 @@ convertLidsToGids(DocsumReply &reply, const DocsumRequest &request) const DocsumRequest::Hit & h = request.hits[i]; DocsumReply::Docsum & d = reply.docsums[i]; d.gid = h.gid; - LOG(spam, "convertLidToGid(DocsumReply): docsum[%zu]: lid(%u) -> gid(%s)", i, d.docid, d.gid.toString().c_str()); + LOG(spam, "convertLidToGid(DocsumReply): docsum[%zu]: lid(%u) -> gid(%s)", i, h.docid, d.gid.toString().c_str()); } } -- cgit v1.2.3