diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-10-14 15:06:55 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-10-14 15:06:55 +0000 |
| commit | 6c0192b582ff3a2eec8d4518dd69e1e2482dc63e (patch) | |
| tree | 66b7168e20f43d16664c26c45b83ff22ecc69505 /searchlib | |
| parent | 29de7477c85c7d934f9cf7f8208c4661c1b4e4f6 (diff) | |
QF_WARMUP is long gone
Diffstat (limited to 'searchlib')
| -rw-r--r-- | searchlib/src/vespa/searchlib/common/packets.cpp | 7 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/common/transport.h | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/searchlib/src/vespa/searchlib/common/packets.cpp b/searchlib/src/vespa/searchlib/common/packets.cpp index 8fff68dff4b..274188c87f9 100644 --- a/searchlib/src/vespa/searchlib/common/packets.cpp +++ b/searchlib/src/vespa/searchlib/common/packets.cpp @@ -1025,8 +1025,7 @@ FS4Packet_QUERYRESULTX::GetLength() void FS4Packet_QUERYRESULTX::Encode(FNET_DataBuffer *dst) { - // Never provide QF_WARMUP downwards - dst->WriteInt32Fast(_features & ~QF_WARMUP); + dst->WriteInt32Fast(_features); dst->WriteInt32Fast(_offset); dst->WriteInt32Fast(_numDocs); dst->WriteInt64Fast(_totNumDocs); @@ -1451,10 +1450,6 @@ FS4Packet_QUERYX::Decode(FNET_DataBuffer *src, uint32_t len) src->DataToDead(locationLen); } - if ((_features & QF_WARMUP) != 0) { - (void) readUInt32(*src, len, "warmup"); - } - if ((_features & QF_PARSEDQUERY) != 0) { _numStackItems = readUInt32(*src, len, "# querystack items"); diff --git a/searchlib/src/vespa/searchlib/common/transport.h b/searchlib/src/vespa/searchlib/common/transport.h index 1aca0951dd2..dc99b66ec8a 100644 --- a/searchlib/src/vespa/searchlib/common/transport.h +++ b/searchlib/src/vespa/searchlib/common/transport.h @@ -76,7 +76,6 @@ enum query_features { QF_SORTSPEC = 0x00000080, QF_LOCATION = 0x00000800, QF_PROPERTIES = 0x00100000, - QF_WARMUP = 0x00200000, // Deprecated, do not use! QF_GROUPSPEC = 0x00400000, QF_SESSIONID = 0x00800000 }; |