Remove unused FS4Packet_CLEARCACHES

4 files changed, 2 insertions, 73 deletions

diff --git a/searchlib/src/tests/common/packets/packets_test.cpp b/searchlib/src/tests/common/packets/packets_test.cpp
index 1a4a109b2aa..d4f762960bc 100644
--- a/searchlib/src/tests/common/packets/packets_test.cpp
+++ b/searchlib/src/tests/common/packets/packets_test.cpp
@@ -306,22 +306,6 @@ TEST("testMonitorResultX") {
     }
 }
 
-TEST("testClearCaches") {
-    FS4Packet_CLEARCACHES *src = dynamic_cast<FS4Packet_CLEARCACHES*>(FS4PacketFactory::CreateFS4Packet(PCODE_CLEARCACHES));
-    ASSERT_TRUE(src != NULL);
-
-    std::vector<FNET_Packet*> lst { src, testEncodeDecode(*src) };
-
-    for (FNET_Packet * packet : lst) {
-        FS4Packet_CLEARCACHES *ptr = dynamic_cast<FS4Packet_CLEARCACHES*>(packet);
-        ASSERT_TRUE(ptr != NULL);
-        EXPECT_EQUAL((uint32_t)PCODE_CLEARCACHES, ptr->GetPCODE());
-        EXPECT_EQUAL(0u, ptr->GetLength());
-
-        delete ptr;
-    }
-}
-
 TEST("testQueryResultX") {
     FS4Packet_QUERYRESULTX *src = dynamic_cast<FS4Packet_QUERYRESULTX*>(FS4PacketFactory::CreateFS4Packet(PCODE_QUERYRESULTX));
     ASSERT_TRUE(src != NULL);
diff --git a/searchlib/src/vespa/searchlib/common/packets.cpp b/searchlib/src/vespa/searchlib/common/packets.cpp
index 3bbc4298217..f8b2768794f 100644
--- a/searchlib/src/vespa/searchlib/common/packets.cpp
+++ b/searchlib/src/vespa/searchlib/common/packets.cpp
@@ -957,47 +957,6 @@ FS4Packet_MONITORRESULTX::toString(uint32_t indent) const
 
 //============================================================
 
-FS4Packet_CLEARCACHES::FS4Packet_CLEARCACHES()
-    : FS4Packet()
-{
-}
-
-
-FS4Packet_CLEARCACHES::~FS4Packet_CLEARCACHES()
-{
-}
-
-
-uint32_t
-FS4Packet_CLEARCACHES::GetLength()
-{
-    return 0;
-}
-
-
-void
-FS4Packet_CLEARCACHES::Encode(FNET_DataBuffer *dst)
-{
-    (void) dst;
-}
-
-
-bool
-FS4Packet_CLEARCACHES::Decode(FNET_DataBuffer *src, uint32_t len)
-{
-    src->DataToDead(len);
-    return (len == 0);
-}
-
-
-vespalib::string
-FS4Packet_CLEARCACHES::toString(uint32_t indent) const
-{
-    return make_string("%*sFS4Packet_CLEARCACHES {}\n", indent, "");
-}
-
-//============================================================
-
 void
 FS4Packet_QUERYRESULTX::AllocateSortIndex(uint32_t cnt)
 {
diff --git a/searchlib/src/vespa/searchlib/common/packets.h b/searchlib/src/vespa/searchlib/common/packets.h
index 7494b6b33c9..9497624ede4 100644
--- a/searchlib/src/vespa/searchlib/common/packets.h
+++ b/searchlib/src/vespa/searchlib/common/packets.h
@@ -374,20 +374,6 @@ public:
 
 //==========================================================================
 
-class FS4Packet_CLEARCACHES : public FS4Packet
-{
-public:
-    FS4Packet_CLEARCACHES();
-    ~FS4Packet_CLEARCACHES();
-    uint32_t GetPCODE() override { return PCODE_CLEARCACHES; }
-    uint32_t GetLength() override;
-    void Encode(FNET_DataBuffer *dst) override;
-    bool Decode(FNET_DataBuffer *src, uint32_t len) override;
-    vespalib::string toString(uint32_t indent) const override;
-};
-
-//==========================================================================
-
 class FS4Packet_QUERYRESULTX : public FS4Packet
 {
 private:
diff --git a/searchlib/src/vespa/searchlib/common/transport.h b/searchlib/src/vespa/searchlib/common/transport.h
index eb102d7da81..bdbc4c23f10 100644
--- a/searchlib/src/vespa/searchlib/common/transport.h
+++ b/searchlib/src/vespa/searchlib/common/transport.h
@@ -228,8 +228,7 @@ enum packetcode {
                              *	total number of partitions,
                              *	active partitions
                              */
-    PCODE_CLEARCACHES = 211,	/* ..fdispatch -> ..fdispatch.  No packet data/ NotUsed
-			 */
+    PCODE_CLEARCACHES_NOTUSED = 211,
     PCODE_QUERY2_NOTUSED = 212,
     PCODE_PARSEDQUERY2 = 213,	/* ..fdispatch  -> ..fsearch.	PacketData:
 			 *0	{uint32_t queryId,}	- only in new format!
@@ -254,6 +253,7 @@ enum packetcode {
                         */
     PCODE_MLD_QUERYRESULT2_NOTUSED = 214,
     PCODE_MLD_GETDOCSUMS2_NOTUSED = 215,
+    PCODE_QUEUELEN_NOTUSED = 216,
 
     PCODE_QUERYRESULTX = 217,	/*
 			 *      {uint32_t queryId,}    - only if persistent