diff options
11 files changed, 18 insertions, 64 deletions
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()); } } diff --git a/searchlib/src/vespa/searchlib/engine/docsumreply.h b/searchlib/src/vespa/searchlib/engine/docsumreply.h index 0150b1eda3d..9e9acd0e498 100644 --- a/searchlib/src/vespa/searchlib/engine/docsumreply.h +++ b/searchlib/src/vespa/searchlib/engine/docsumreply.h @@ -18,13 +18,12 @@ struct DocsumReply using Blob = vespalib::MallocPtr; struct Docsum { - uint32_t docid; document::GlobalId gid; Blob data; - Docsum() noexcept : docid(0), gid(), data(0) {} - Docsum(document::GlobalId gid_) noexcept : docid(0), gid(gid_), data(0) { } - Docsum(document::GlobalId gid_, const char *buf, uint32_t len) noexcept : docid(0), gid(gid_), data(len) { + Docsum() noexcept : gid(), data(0) {} + Docsum(document::GlobalId gid_) noexcept : gid(gid_), data(0) { } + Docsum(document::GlobalId gid_, const char *buf, uint32_t len) noexcept : gid(gid_), data(len) { memcpy(data.str(), buf, len); } Docsum & setData(const char *buf, uint32_t len) { diff --git a/searchlib/src/vespa/searchlib/engine/docsumrequest.cpp b/searchlib/src/vespa/searchlib/engine/docsumrequest.cpp index 31ee88d3d69..69e3e721f8e 100644 --- a/searchlib/src/vespa/searchlib/engine/docsumrequest.cpp +++ b/searchlib/src/vespa/searchlib/engine/docsumrequest.cpp @@ -14,7 +14,6 @@ DocsumRequest::DocsumRequest(bool useRootSlime_) DocsumRequest::DocsumRequest(RelativeTime relativeTime, bool useRootSlime_) : Request(std::move(relativeTime)), - _flags(0u), resultClassName(), _useRootSlime(useRootSlime_), hits() diff --git a/searchlib/src/vespa/searchlib/engine/docsumrequest.h b/searchlib/src/vespa/searchlib/engine/docsumrequest.h index 4849fda8629..b34eebea0e9 100644 --- a/searchlib/src/vespa/searchlib/engine/docsumrequest.h +++ b/searchlib/src/vespa/searchlib/engine/docsumrequest.h @@ -19,16 +19,14 @@ public: class Hit { public: - Hit() noexcept : gid(), docid(0), path(0) {} - Hit(const document::GlobalId & gid_) noexcept : gid(gid_), docid(0), path(0) {} + Hit() noexcept : gid(), docid(0) {} + Hit(const document::GlobalId & gid_) noexcept : gid(gid_), docid(0) {} document::GlobalId gid; mutable uint32_t docid; // converted in backend - uint32_t path; // wide }; public: - uint32_t _flags; vespalib::string resultClassName; private: const bool _useRootSlime; diff --git a/searchlib/src/vespa/searchlib/engine/searchreply.cpp b/searchlib/src/vespa/searchlib/engine/searchreply.cpp index 7fc0ac81289..f5dfe5762cc 100644 --- a/searchlib/src/vespa/searchlib/engine/searchreply.cpp +++ b/searchlib/src/vespa/searchlib/engine/searchreply.cpp @@ -5,35 +5,27 @@ namespace search::engine { SearchReply::SearchReply() - : valid(true), - offset(0), - _distributionKey(0), + : _distributionKey(0), totalHitCount(0), - maxRank(0), sortIndex(), sortData(), groupResult(), coverage(), - useWideHits(false), hits(), request() { } SearchReply::~SearchReply() = default; -SearchReply::SearchReply(const SearchReply &rhs) : - valid (rhs.valid), - offset (rhs.offset), - _distributionKey (rhs._distributionKey), - totalHitCount(rhs.totalHitCount), - maxRank (rhs.maxRank), - sortIndex (rhs.sortIndex), - sortData (rhs.sortData), - groupResult (rhs.groupResult), - coverage (rhs.coverage), - useWideHits (rhs.useWideHits), - hits (rhs.hits), - request() // NB not copied +SearchReply::SearchReply(const SearchReply &rhs) + : _distributionKey (rhs._distributionKey), + totalHitCount(rhs.totalHitCount), + sortIndex (rhs.sortIndex), + sortData (rhs.sortData), + groupResult (rhs.groupResult), + coverage (rhs.coverage), + hits (rhs.hits), + request() // NB not copied { } } diff --git a/searchlib/src/vespa/searchlib/engine/searchreply.h b/searchlib/src/vespa/searchlib/engine/searchreply.h index 531f94d2b6f..f4999d79ada 100644 --- a/searchlib/src/vespa/searchlib/engine/searchreply.h +++ b/searchlib/src/vespa/searchlib/engine/searchreply.h @@ -18,14 +18,9 @@ public: class Hit { public: - Hit() noexcept : gid(), metric(0), path(0), _distributionKey(0) {} - void setDistributionKey(uint32_t key) { _distributionKey = key; } - uint32_t getDistributionKey() const { return _distributionKey; } + Hit() noexcept : gid(), metric(0) {} document::GlobalId gid; search::HitRank metric; - uint32_t path; // wide - private: - int32_t _distributionKey; // wide }; class Coverage { @@ -65,21 +60,14 @@ public: uint16_t _nodesReplied; }; - // set to false to indicate 'talk to the hand' behavior - bool valid; - - // normal results - uint32_t offset; private: - uint32_t _distributionKey; + uint32_t _distributionKey; public: uint64_t totalHitCount; - search::HitRank maxRank; std::vector<uint32_t> sortIndex; std::vector<char> sortData; vespalib::Array<char> groupResult; Coverage coverage; - bool useWideHits; std::vector<Hit> hits; PropertiesMap propertiesMap; diff --git a/searchlib/src/vespa/searchlib/engine/tracereply.h b/searchlib/src/vespa/searchlib/engine/tracereply.h deleted file mode 100644 index 32de6e6e6eb..00000000000 --- a/searchlib/src/vespa/searchlib/engine/tracereply.h +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#pragma once - -#include "propertiesmap.h" - -namespace search::engine { - -struct TraceReply -{ - PropertiesMap propertiesMap; -}; - -} - |