I think aggregation was removed 6 years ago. And that is the newest of features removed in this pull request.

5 files changed, 0 insertions, 93 deletions

diff --git a/searchlib/src/tests/common/packets/packets_test.cpp b/searchlib/src/tests/common/packets/packets_test.cpp
index 344b28a1b42..1ff677aeefa 100644
--- a/searchlib/src/tests/common/packets/packets_test.cpp
+++ b/searchlib/src/tests/common/packets/packets_test.cpp
@@ -327,7 +327,6 @@ TEST("testQueryResultX") {
     src->_activeDocs = 7u;
     uint32_t sortIndex[3] = { 0u, 1u, 3u /* size of data */}; // numDocs + 1
     src->SetSortDataRef(2, sortIndex, "foo");
-    src->SetAggrDataRef("bar", 3u);
     src->SetGroupDataRef("baz", 3u);
     src->AllocateHits(2);
     src->_hits[0]._gid = gid0;
@@ -370,12 +369,6 @@ TEST("testQueryResultX") {
             EXPECT_EQUAL((void*)NULL, ptr->_sortIndex);
             EXPECT_EQUAL((void*)NULL, ptr->_sortData);
         }
-        if (ptr->_features & QRF_AGGRDATA) {
-            EXPECT_EQUAL("bar", std::string(ptr->_aggrData, ptr->_aggrDataLen));
-        } else {
-            EXPECT_EQUAL(0u, ptr->_aggrDataLen);
-            EXPECT_EQUAL((void*)NULL, ptr->_aggrData);
-        }
         if (ptr->_features & QRF_GROUPDATA) {
             EXPECT_EQUAL("baz", std::string(ptr->_groupData, ptr->_groupDataLen));
         } else {
@@ -414,7 +407,6 @@ createAndFill_QUERYX()
     fillProperties(src->_propsVector[0], "foo", 8);
     fillProperties(src->_propsVector[1], "bar", 16);
     src->setSortSpec("sortspec");
-    src->setAggrSpec("aggrspec");
     src->setGroupSpec("groupspec");
     src->setLocation("location");
     src->setStackDump("stackdump");
@@ -448,11 +440,6 @@ verifyQueryX(FS4Packet_QUERYX & queryX, uint32_t features)
     } else {
         EXPECT_EQUAL(0u, queryX._sortSpec.size());
     }
-    if (queryX._features & QF_AGGRSPEC) {
-        EXPECT_EQUAL("aggrspec", queryX._aggrSpec);
-    } else {
-        EXPECT_EQUAL(0u, queryX._aggrSpec.size());
-    }
     if (queryX._features & QF_GROUPSPEC) {
         EXPECT_EQUAL("groupspec", queryX._groupSpec);
     } else {
diff --git a/searchlib/src/tests/engine/searchapi/searchapi_test.cpp b/searchlib/src/tests/engine/searchapi/searchapi_test.cpp
index c7633783db4..ce850c9e1e1 100644
--- a/searchlib/src/tests/engine/searchapi/searchapi_test.cpp
+++ b/searchlib/src/tests/engine/searchapi/searchapi_test.cpp
@@ -74,8 +74,6 @@ Test::convertToRequest()
     src._propsVector[1].setValue(1, "p2v2", strlen("p2v2"));
     src._features |= QF_SORTSPEC;
     src.setSortSpec("sortspec");
-    src._features |= QF_AGGRSPEC;
-    src.setAggrSpec("aggrspec");
     src._features |= QF_GROUPSPEC;
     src.setGroupSpec("groupspec");
     src._features |= QF_SESSIONID;
diff --git a/searchlib/src/vespa/searchlib/common/packets.cpp b/searchlib/src/vespa/searchlib/common/packets.cpp
index edab8b7efcc..8fff68dff4b 100644
--- a/searchlib/src/vespa/searchlib/common/packets.cpp
+++ b/searchlib/src/vespa/searchlib/common/packets.cpp
@@ -927,29 +927,6 @@ FS4Packet_QUERYRESULTX::SetSortDataRef(uint32_t cnt,
 
 
 void
-FS4Packet_QUERYRESULTX::AllocateAggrData(uint32_t len)
-{
-    if (len == 0)
-        return;
-
-    _aggrData = (char *) malloc(len);
-    _aggrDataLen = len;
-}
-
-
-void
-FS4Packet_QUERYRESULTX::SetAggrDataRef(const char *aggrData,
-                                       uint32_t len)
-{
-    if (len == 0)
-        return;
-
-    AllocateAggrData(len);
-    memcpy(_aggrData, aggrData, len);
-}
-
-
-void
 FS4Packet_QUERYRESULTX::AllocateGroupData(uint32_t len)
 {
     if (len == 0)
@@ -993,8 +970,6 @@ FS4Packet_QUERYRESULTX::FS4Packet_QUERYRESULTX()
       _maxRank(0),
       _sortIndex(NULL),
       _sortData(NULL),
-      _aggrDataLen(0),
-      _aggrData(NULL),
       _groupDataLen(0),
       _groupData(NULL),
       _coverageDocs(0),
@@ -1009,7 +984,6 @@ FS4Packet_QUERYRESULTX::~FS4Packet_QUERYRESULTX()
 {
     if (_sortIndex) { delete [] _sortIndex; }
     if (_sortData) { free(_sortData); }
-    if (_aggrData) { free(_aggrData); }
     if (_groupData) { free(_groupData); }
     if (_hits) { delete [] _hits; }
 }
@@ -1031,9 +1005,6 @@ FS4Packet_QUERYRESULTX::GetLength()
     if (((_features & QRF_SORTDATA) != 0) && (_numDocs > 0)) 
         plen += _numDocs * sizeof(uint32_t) + (_sortIndex[_numDocs] - _sortIndex[0]);
 
-    if ((_features & QRF_AGGRDATA) != 0)
-        plen += sizeof(uint32_t) + _aggrDataLen;
-
     if ((_features & QRF_GROUPDATA) != 0)
         plen += sizeof(uint32_t) + _groupDataLen;
 
@@ -1076,11 +1047,6 @@ FS4Packet_QUERYRESULTX::Encode(FNET_DataBuffer *dst)
                             _sortIndex[_numDocs] - idx0);
     }
 
-    if ((_features & QRF_AGGRDATA) != 0) {
-        dst->WriteInt32Fast(_aggrDataLen);
-        dst->WriteBytesFast(_aggrData, _aggrDataLen);
-    }
-
     if ((_features & QRF_GROUPDATA) != 0) {
         dst->WriteInt32Fast(_groupDataLen);
         dst->WriteBytesFast(_groupData, _groupDataLen);
@@ -1153,17 +1119,6 @@ FS4Packet_QUERYRESULTX::Decode(FNET_DataBuffer *src, uint32_t len)
         len -= sortDataLen;
     }
 
-    if ((_features & QRF_AGGRDATA) != 0) {
-        if (len < sizeof(uint32_t)) goto error;
-        _aggrDataLen = src->ReadInt32();
-        len -= sizeof(uint32_t);
-
-        if (len < _aggrDataLen) goto error;
-        AllocateAggrData(_aggrDataLen);
-        src->ReadBytes(_aggrData, _aggrDataLen);
-        len -= _aggrDataLen;
-    }
-
     if ((_features & QRF_GROUPDATA) != 0) {
         if (len < sizeof(uint32_t)) goto error;
         _groupDataLen = src->ReadInt32();
@@ -1246,7 +1201,6 @@ FS4Packet_QUERYRESULTX::toString(uint32_t indent) const
             s += make_string(" }\n");
         }
     }
-    s += make_string("%*s  aggrData      : %d bytes\n", indent, "", _aggrDataLen);
     s += make_string("%*s  groupData     : %d bytes\n", indent, "", _groupDataLen);
     s += make_string("%*s  coverageDocs  : %" PRIu64 "\n", indent, "", _coverageDocs);
     s += make_string("%*s  activeDocs    : %" PRIu64 "\n", indent, "", _activeDocs);
@@ -1274,7 +1228,6 @@ FS4Packet_QUERYX::FS4Packet_QUERYX()
       _ranking(),
       _propsVector(),
       _sortSpec(),
-      _aggrSpec(),
       _groupSpec(),
       _sessionId(),
       _location(),
@@ -1314,9 +1267,6 @@ FS4Packet_QUERYX::GetLength()
     if ((_features & QF_SORTSPEC) != 0)
         plen += sizeof(uint32_t) + _sortSpec.size();
 
-    if ((_features & QF_AGGRSPEC) != 0)
-        plen += sizeof(uint32_t) + _aggrSpec.size();
-
     if ((_features & QF_GROUPSPEC) != 0)
         plen += sizeof(uint32_t) + _groupSpec.size();
 
@@ -1357,11 +1307,6 @@ FS4Packet_QUERYX::Encode(FNET_DataBuffer *dst)
         dst->WriteBytesFast(_sortSpec.c_str(), _sortSpec.size());
     }
 
-    if ((_features & QF_AGGRSPEC) != 0) {
-        dst->WriteInt32Fast(_aggrSpec.size());
-        dst->WriteBytesFast(_aggrSpec.c_str(), _aggrSpec.size());
-    }
-
     if ((_features & QF_GROUPSPEC) != 0) {
         dst->WriteInt32Fast(_groupSpec.size());
         dst->WriteBytesFast(_groupSpec.c_str(), _groupSpec.size());
@@ -1483,14 +1428,6 @@ FS4Packet_QUERYX::Decode(FNET_DataBuffer *src, uint32_t len)
         src->DataToDead(sortSpecLen);
     }
 
-    if ((_features & QF_AGGRSPEC) != 0) {
-        uint32_t aggrSpecLen = readUInt32(*src, len, "aggrspec length");
-
-        VERIFY_LEN(aggrSpecLen, "aggrspec string");
-        setAggrSpec(stringref(src->GetData(), aggrSpecLen));
-        src->DataToDead(aggrSpecLen);
-    }
-
     if ((_features & QF_GROUPSPEC) != 0) {
         uint32_t groupSpecLen = readUInt32(*src, len, "groupspec length");
 
@@ -1548,7 +1485,6 @@ FS4Packet_QUERYX::toString(uint32_t indent) const
         s += _propsVector[i].toString(indent + 2);
     }
     s += make_string("%*s  sortspec    : %s\n", indent, "", _sortSpec.c_str());
-    s += make_string("%*s  aggrspec    : %s\n", indent, "", _aggrSpec.c_str());
     s += make_string("%*s  groupspec   : (%d bytes)\n", indent, "", (int)_groupSpec.size());
     s += make_string("%*s  sessionId   : (%d bytes)\n", indent, "", (int)_sessionId.size());
     s += make_string("%*s  location    : %s\n", indent, "", _location.c_str());
diff --git a/searchlib/src/vespa/searchlib/common/packets.h b/searchlib/src/vespa/searchlib/common/packets.h
index 021248585a0..53cc4aa5f67 100644
--- a/searchlib/src/vespa/searchlib/common/packets.h
+++ b/searchlib/src/vespa/searchlib/common/packets.h
@@ -21,7 +21,6 @@ using vespalib::string;
 enum fnet_feature_masks {
     FNET_QRF_SUPPORTED_MASK = (QRF_MLD |
                                QRF_SORTDATA |
-                               QRF_AGGRDATA |
                                QRF_COVERAGE |
                                QRF_GROUPDATA |
                                QRF_PROPERTIES),
@@ -29,7 +28,6 @@ enum fnet_feature_masks {
     FNET_QF_SUPPORTED_MASK  = (QF_PARSEDQUERY |
                                QF_RANKP |
                                QF_SORTSPEC |
-                               QF_AGGRSPEC |
                                QF_LOCATION |
                                QF_PROPERTIES |
                                QF_GROUPSPEC |
@@ -382,8 +380,6 @@ public:
     search::HitRank _maxRank;
     uint32_t *_sortIndex;    // if QRF_SORTDATA
     char     *_sortData;     // if QRF_SORTDATA
-    uint32_t _aggrDataLen;   // if QRF_AGGRDATA
-    char    *_aggrData;      // if QRF_AGGRDATA
     uint32_t _groupDataLen;  // if QRF_GROUPDATA
     char    *_groupData;     // if QRF_GROUPDATA
     uint64_t _coverageDocs;  // if QRF_COVERAGE
@@ -411,8 +407,6 @@ public:
     void AllocateSortIndex(uint32_t cnt);
     void AllocateSortData(uint32_t len);
     void SetSortDataRef(uint32_t cnt, uint32_t *sortIndex, const char *sortData);
-    void AllocateAggrData(uint32_t len);
-    void SetAggrDataRef(const char *aggrData, uint32_t len);
     void AllocateGroupData(uint32_t len);
     void SetGroupDataRef(const char *groupData, uint32_t len);
     void AllocateHits(uint32_t cnt);
@@ -446,7 +440,6 @@ public:
     string    _ranking;       // if QF_RANKP
     PropsVector _propsVector; // if QF_PROPERTIES
     string    _sortSpec;      // if QF_SORTSPEC
-    string    _aggrSpec;      // if QF_AGGRSPEC
     string    _groupSpec;     // if QF_GROUPSPEC
     string    _sessionId;     // if QF_SESSIONID
     string    _location;      // if QF_LOCATION
@@ -456,7 +449,6 @@ public:
 
     void setRanking(const vespalib::stringref &ranking) { _ranking = ranking; }
     void setSortSpec(const vespalib::stringref &spec) { _sortSpec = spec; }
-    void setAggrSpec(const vespalib::stringref &spec) { _aggrSpec = spec; }
     void setGroupSpec(const vespalib::stringref &spec) { _groupSpec = spec; }
     void setSessionId(const vespalib::stringref &sid) { _sessionId = sid; }
     void setLocation(const vespalib::stringref &loc) { _location = loc; }
diff --git a/searchlib/src/vespa/searchlib/common/transport.h b/searchlib/src/vespa/searchlib/common/transport.h
index 345cfade50c..215f910bfb7 100644
--- a/searchlib/src/vespa/searchlib/common/transport.h
+++ b/searchlib/src/vespa/searchlib/common/transport.h
@@ -53,7 +53,6 @@ enum queryflags {
 enum queryresult_features {
     QRF_MLD                   = 0x00000001,
     QRF_SORTDATA              = 0x00000010,
-    QRF_AGGRDATA              = 0x00000020,
     QRF_COVERAGE              = 0x00000040,
     QRF_GROUPDATA             = 0x00000200,
     QRF_PROPERTIES            = 0x00000400
@@ -77,7 +76,6 @@ enum query_features {
     QF_PARSEDQUERY            = 0x00000002,
     QF_RANKP                  = 0x00000004,
     QF_SORTSPEC               = 0x00000080,
-    QF_AGGRSPEC               = 0x00000100,
     QF_LOCATION               = 0x00000800,
     QF_PROPERTIES             = 0x00100000,
     QF_WARMUP		      = 0x00200000, // Deprecated, do not use!
@@ -189,8 +187,6 @@ enum packetcode {
 			 *      uint32_t docstamp,
                          *      uint32_t[numDocs] sortIndex   - if QRF_SORTDATA
                          *      char[sidx[n - 1]] sortData    - if QRF_SORTDATA
-                         *      uint32_t          aggrDataLen - if QRF_AGGRDATA
-                         *      char[aggrDataLen] aggrData    - if QRF_AGGRDATA
                          *      uint32_t           groupDataLen - if QRF_GROUPDATA
                          *      char[groupDataLen] groupData    - if QRF_GROUPDATA
                          *      uint64_t coverageDocs  - if QRF_COVERAGE
@@ -224,8 +220,6 @@ enum packetcode {
                                  *      }
                                  *      uint32_t sortSpecLen         - if QF_SORTSPEC
                                  *      char[sortSpecLen] sortSpec   - if QF_SORTSPEC
-                                 *      uint32_t aggrSpecLen         - if QF_AGGRSPEC
-                                 *      char[aggrSpecLen] aggrSpec   - if QF_AGGRSPEC
                                  *      uint32_t groupSpecLen         - if QF_GROUPSPEC
                                  *      char[groupSpecLen] groupSpec  - if QF_GROUPSPEC
                                  *      uint32_t locationLen         - if QF_LOCATION