QFLAG_REPORT_QUEUELEN is not used, nor does it work, nor is it very likely that it will work.

4 files changed, 0 insertions, 19 deletions

diff --git a/searchlib/src/vespa/searchlib/common/transport.h b/searchlib/src/vespa/searchlib/common/transport.h
index 887a75ff1a1..c14cc50e533 100644
--- a/searchlib/src/vespa/searchlib/common/transport.h
+++ b/searchlib/src/vespa/searchlib/common/transport.h
@@ -19,8 +19,6 @@ namespace fs4transport
  * now use this 32-bit number to send 32 flags. The currently defined flags
  * are as follows:
  * <ul>
- *  <li><b>QFLAG_REPORT_QUEUELEN</b>: Send an extra queue length packet before
- *                                query result packets.</li>
  *  <li><b>QFLAG_ESTIMATE</b>: Indicates that the  query is performed to get
  *                             an estimate of the total number of hits</li>
  *  <li><b>QFLAG_DUMP_FEATURES</b>: Dump detailed ranking information. Note that
@@ -33,7 +31,6 @@ namespace fs4transport
  * </ul>
  **/
 enum queryflags {
-    QFLAG_REPORT_QUEUELEN      = 0x00000008,
     QFLAG_ESTIMATE             = 0x00000080,
     QFLAG_DROP_SORTDATA        = 0x00004000,
     QFLAG_NO_RESULTCACHE       = 0x00010000,
diff --git a/searchlib/src/vespa/searchlib/engine/searchreply.cpp b/searchlib/src/vespa/searchlib/engine/searchreply.cpp
index 2bf24cda6fe..52a4431a239 100644
--- a/searchlib/src/vespa/searchlib/engine/searchreply.cpp
+++ b/searchlib/src/vespa/searchlib/engine/searchreply.cpp
@@ -23,8 +23,6 @@ SearchReply::SearchReply()
       hits(),
       errorCode(0),
       errorMessage(),
-      useQueueLen(false),
-      queueLen(0),
       request()
 {
 }
@@ -44,8 +42,6 @@ SearchReply::SearchReply(const SearchReply &rhs)
     hits         (rhs.hits),
     errorCode    (rhs.errorCode),
     errorMessage (rhs.errorMessage),
-    useQueueLen  (rhs.useQueueLen),
-    queueLen     (rhs.queueLen),
     request() // NB not copied
 {
 }
diff --git a/searchlib/src/vespa/searchlib/engine/searchreply.h b/searchlib/src/vespa/searchlib/engine/searchreply.h
index dd2c3bfaea4..8a5fc7e2a2b 100644
--- a/searchlib/src/vespa/searchlib/engine/searchreply.h
+++ b/searchlib/src/vespa/searchlib/engine/searchreply.h
@@ -66,9 +66,6 @@ public:
     uint32_t              errorCode;
     vespalib::string      errorMessage;
 
-    // piggyback monitoring
-    bool                  useQueueLen;
-    uint32_t              queueLen;
     SearchRequest::UP     request;
 
     SearchReply();
diff --git a/searchlib/src/vespa/searchlib/engine/transportserver.cpp b/searchlib/src/vespa/searchlib/engine/transportserver.cpp
index cdde798b579..85cd5406ee4 100644
--- a/searchlib/src/vespa/searchlib/engine/transportserver.cpp
+++ b/searchlib/src/vespa/searchlib/engine/transportserver.cpp
@@ -32,15 +32,6 @@ TransportServer::SearchHandler::searchDone(SearchReply::UP reply)
     if (reply.get() != 0) {
         const SearchReply &r = *reply;
         if (r.valid) {
-            if (r.useQueueLen) {
-                PacketConverter::QUEUELEN *p = new PacketConverter::QUEUELEN();
-                p->_queueLen = r.queueLen;
-                p->_dispatchers = clientCnt;
-                if (shouldLog(DEBUG_SEARCH)) {
-                    logPacket("outgoing packet", p, 0, channel->GetConnection());
-                }
-                channel->GetConnection()->PostPacket(p, FNET_NOID);
-            }
             if (r.errorCode == 0) {
                 PacketConverter::QUERYRESULTX *p = new PacketConverter::QUERYRESULTX();
                 PacketConverter::fromSearchReply(r, *p);