diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-02-08 10:40:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-08 10:40:34 +0100 |
| commit | 79d5e8385243796cec598368fb2fe410afff9518 (patch) | |
| tree | 57c2c175c810afc12ffcc2d55711c5d18eefed27 /searchlib | |
| parent | 6aadb56c082d1cb98f69152afb7c313ef214ce46 (diff) | |
| parent | 425b893bc422eea13b2f222bb7cd9c855b1e0a57 (diff) | |
Merge pull request #4963 from vespa-engine/balder/followup-on-coverage
Balder/followup on coverage
Diffstat (limited to 'searchlib')
| -rw-r--r-- | searchlib/src/vespa/searchlib/common/packets.cpp | 11 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/engine/packetconverter.cpp | 1 |
2 files changed, 5 insertions, 7 deletions
diff --git a/searchlib/src/vespa/searchlib/common/packets.cpp b/searchlib/src/vespa/searchlib/common/packets.cpp index 04da47aa76b..4bb11acaabb 100644 --- a/searchlib/src/vespa/searchlib/common/packets.cpp +++ b/searchlib/src/vespa/searchlib/common/packets.cpp @@ -908,7 +908,7 @@ FS4Packet_QUERYRESULTX::FS4Packet_QUERYRESULTX() _distributionKey(0), _nodesQueried(0), _nodesReplied(0), - _features(0), + _features(QRF_COVERAGE | QRF_EXTENDED_COVERAGE), _offset(0), _numDocs(0), _totNumDocs(0), @@ -944,9 +944,9 @@ FS4Packet_QUERYRESULTX::GetLength() _numDocs * (sizeof(document::GlobalId) + sizeof(search::HitRank)); plen += sizeof(uint32_t); - plen += (_features & QRF_COVERAGE_NODES) ? 2 * sizeof(uint16_t) : 0; - plen += (_features & QRF_MLD) ? _numDocs * 2 * sizeof(uint32_t) : 0; - plen += (_features & QRF_GROUPDATA) ? sizeof(uint32_t) + _groupDataLen : 0; + plen += (_features & QRF_COVERAGE_NODES) ? (2 * sizeof(uint16_t)) : 0; + plen += (_features & QRF_MLD) ? (_numDocs * 2 * sizeof(uint32_t)) : 0; + plen += (_features & QRF_GROUPDATA) ? (sizeof(uint32_t) + _groupDataLen) : 0; plen += 3 * sizeof(uint64_t) + sizeof(uint32_t); if (((_features & QRF_SORTDATA) != 0) && (_numDocs > 0)) @@ -988,8 +988,7 @@ FS4Packet_QUERYRESULTX::Encode(FNET_DataBuffer *dst) for (uint32_t i = 1; i <= _numDocs; i++) { dst->WriteInt32Fast(_sortIndex[i] - idx0); } - dst->WriteBytesFast(_sortData + idx0, - _sortIndex[_numDocs] - idx0); + dst->WriteBytesFast(_sortData + idx0, _sortIndex[_numDocs] - idx0); } if ((_features & QRF_GROUPDATA) != 0) { diff --git a/searchlib/src/vespa/searchlib/engine/packetconverter.cpp b/searchlib/src/vespa/searchlib/engine/packetconverter.cpp index 5b7b6ef8265..2ebbb9bf89c 100644 --- a/searchlib/src/vespa/searchlib/engine/packetconverter.cpp +++ b/searchlib/src/vespa/searchlib/engine/packetconverter.cpp @@ -117,7 +117,6 @@ PacketConverter::fromSearchReply(const SearchReply &reply, QUERYRESULTX &packet) packet.AllocateGroupData(reply.groupResult.size()); memcpy(packet._groupData, &(reply.groupResult[0]), reply.groupResult.size()); } - packet._features |= QRF_COVERAGE | QRF_EXTENDED_COVERAGE; packet._coverageDocs = reply.coverage.getCovered(); packet._activeDocs = reply.coverage.getActive(); packet._soonActiveDocs = reply.coverage.getSoonActive(); |