Remove (SearchResult|DocumentSummary)(Command|Reply) storage and documentapi messages.

9 files changed, 4 insertions, 200 deletions

diff --git a/storage/src/vespa/storage/storageserver/documentapiconverter.cpp b/storage/src/vespa/storage/storageserver/documentapiconverter.cpp
index 9ae6aaf0653..e7eb7a752fb 100644
--- a/storage/src/vespa/storage/storageserver/documentapiconverter.cpp
+++ b/storage/src/vespa/storage/storageserver/documentapiconverter.cpp
@@ -8,11 +8,9 @@
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/storage/common/bucket_resolver.h>
 #include <vespa/storageapi/message/datagram.h>
-#include <vespa/storageapi/message/documentsummary.h>
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/storageapi/message/queryresult.h>
 #include <vespa/storageapi/message/removelocation.h>
-#include <vespa/storageapi/message/searchresult.h>
 #include <vespa/storageapi/message/stat.h>
 #include <vespa/storageapi/message/visitor.h>
 #include <vespa/messagebus/error.h>
@@ -237,24 +235,12 @@ DocumentApiConverter::toDocumentAPI(api::StorageCommand& fromMsg)
         toMsg = std::move(to);
         break;
     }
-    case api::MessageType::SEARCHRESULT_ID:
-    {
-        auto & from(static_cast<api::SearchResultCommand&>(fromMsg));
-        toMsg = std::make_unique<documentapi::SearchResultMessage>(std::move(from));
-        break;
-    }
     case api::MessageType::QUERYRESULT_ID:
     {
         auto & from(static_cast<api::QueryResultCommand&>(fromMsg));
         toMsg = std::make_unique<documentapi::QueryResultMessage>(std::move(from.getSearchResult()), from.getDocumentSummary());
         break;
     }
-    case api::MessageType::DOCUMENTSUMMARY_ID:
-    {
-        auto & from(static_cast<api::DocumentSummaryCommand&>(fromMsg));
-        toMsg = std::make_unique<documentapi::DocumentSummaryMessage>(from);
-        break;
-    }
     case api::MessageType::MAPVISITOR_ID:
     {
         auto & from(static_cast<api::MapVisitorCommand&>(fromMsg));
diff --git a/storage/src/vespa/storageapi/message/CMakeLists.txt b/storage/src/vespa/storageapi/message/CMakeLists.txt
index 2a761921dff..2728b5b51ad 100644
--- a/storage/src/vespa/storageapi/message/CMakeLists.txt
+++ b/storage/src/vespa/storageapi/message/CMakeLists.txt
@@ -6,9 +6,7 @@ vespa_add_library(storageapi_message OBJECT
     bucket.cpp
     visitor.cpp
     state.cpp
-    searchresult.cpp
     bucketsplitting.cpp
-    documentsummary.cpp
     stat.cpp
     removelocation.cpp
     queryresult.cpp
diff --git a/storage/src/vespa/storageapi/message/documentsummary.cpp b/storage/src/vespa/storageapi/message/documentsummary.cpp
deleted file mode 100644
index 6909b4d223c..00000000000
--- a/storage/src/vespa/storageapi/message/documentsummary.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include "documentsummary.h"
-#include <ostream>
-
-namespace storage {
-namespace api {
-
-IMPLEMENT_COMMAND(DocumentSummaryCommand, DocumentSummaryReply)
-IMPLEMENT_REPLY(DocumentSummaryReply)
-
-DocumentSummaryCommand::DocumentSummaryCommand()
-    : StorageCommand(MessageType::DOCUMENTSUMMARY),
-      DocumentSummary()
-{ }
-
-void
-DocumentSummaryCommand::print(std::ostream& out, bool verbose,
-                              const std::string& indent) const
-{
-    out << "DocumentSummary(" << getSummaryCount() << " summaries)";
-    if (verbose) {
-        out << " : ";
-        StorageCommand::print(out, verbose, indent);
-    }
-}
-
-DocumentSummaryReply::DocumentSummaryReply(const DocumentSummaryCommand& cmd)
-    : StorageReply(cmd)
-{ }
-
-void
-DocumentSummaryReply::print(std::ostream& out, bool verbose,
-                            const std::string& indent) const
-{
-    out << "DocumentSummaryReply()";
-    if (verbose) {
-        out << " : ";
-        StorageReply::print(out, verbose, indent);
-    }
-}
-
-} // api
-} // storage
diff --git a/storage/src/vespa/storageapi/message/documentsummary.h b/storage/src/vespa/storageapi/message/documentsummary.h
deleted file mode 100644
index 5e2c1af3cfd..00000000000
--- a/storage/src/vespa/storageapi/message/documentsummary.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-
-#include "visitor.h"
-#include <vespa/vdslib/container/documentsummary.h>
-
-namespace storage {
-namespace api {
-
-/**
- * @class DocumentSummaryCommand
- * @ingroup message
- *
- * @brief The result of a searchvisitor.
- */
-class DocumentSummaryCommand : public StorageCommand,
-                               public vdslib::DocumentSummary
-{
-public:
-    explicit DocumentSummaryCommand();
-    void print(std::ostream& out, bool verbose, const std::string& indent) const override;
-    DECLARE_STORAGECOMMAND(DocumentSummaryCommand, onDocumentSummary)
-};
-
-/**
- * @class DocumentSummaryReply
- * @ingroup message
- *
- * @brief Response to a document summary command.
- */
-class DocumentSummaryReply : public StorageReply {
-public:
-    explicit DocumentSummaryReply(const DocumentSummaryCommand& command);
-    void print(std::ostream& out, bool verbose, const std::string& indent) const override;
-    DECLARE_STORAGEREPLY(DocumentSummaryReply, onDocumentSummaryReply)
-};
-
-} // api
-} // storage
diff --git a/storage/src/vespa/storageapi/message/searchresult.cpp b/storage/src/vespa/storageapi/message/searchresult.cpp
deleted file mode 100644
index b2cf04b0410..00000000000
--- a/storage/src/vespa/storageapi/message/searchresult.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "searchresult.h"
-#include <ostream>
-
-using vdslib::SearchResult;
-
-namespace storage {
-namespace api {
-
-IMPLEMENT_COMMAND(SearchResultCommand, SearchResultReply)
-IMPLEMENT_REPLY(SearchResultReply)
-
-SearchResultCommand::SearchResultCommand()
-    : StorageCommand(MessageType::SEARCHRESULT),
-      SearchResult()
-{
-}
-
-void
-SearchResultCommand::print(std::ostream& out, bool verbose,
-                           const std::string& indent) const
-{
-    out << "SearchResultCommand(" << getHitCount() << " hits)";
-    if (verbose) {
-        out << " : ";
-        StorageCommand::print(out, verbose, indent);
-    }
-}
-
-SearchResultReply::SearchResultReply(const SearchResultCommand& cmd)
-    : StorageReply(cmd)
-{ }
-
-void
-SearchResultReply::print(std::ostream& out, bool verbose,
-                         const std::string& indent) const
-{
-    out << "SearchResultReply()";
-    if (verbose) {
-        out << " : ";
-        StorageReply::print(out, verbose, indent);
-    }
-}
-
-} // api
-} // storage
diff --git a/storage/src/vespa/storageapi/message/searchresult.h b/storage/src/vespa/storageapi/message/searchresult.h
deleted file mode 100644
index b12fa5e1613..00000000000
--- a/storage/src/vespa/storageapi/message/searchresult.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-
-#include "visitor.h"
-#include <vespa/vdslib/container/searchresult.h>
-
-namespace storage::api {
-
-/**
- * @class SearchResultCommand
- * @ingroup message
- *
- * @brief The result of a searchvisitor.
- */
-class SearchResultCommand : public StorageCommand, public vdslib::SearchResult {
-public:
-    SearchResultCommand();
-    void print(std::ostream& out, bool verbose, const std::string& indent) const override;
-    DECLARE_STORAGECOMMAND(SearchResultCommand, onSearchResult)
-};
-
-/**
- * @class SearchResultReply
- * @ingroup message
- *
- * @brief Response to a search result command.
- */
-class SearchResultReply : public StorageReply {
-public:
-    explicit SearchResultReply(const SearchResultCommand& command);
-    void print(std::ostream& out, bool verbose, const std::string& indent) const override;
-    DECLARE_STORAGEREPLY(SearchResultReply, onSearchResultReply)
-};
-
-}
diff --git a/storage/src/vespa/storageapi/messageapi/messagehandler.h b/storage/src/vespa/storageapi/messageapi/messagehandler.h
index 9ba8542e9db..fa362d5380f 100644
--- a/storage/src/vespa/storageapi/messageapi/messagehandler.h
+++ b/storage/src/vespa/storageapi/messageapi/messagehandler.h
@@ -29,8 +29,6 @@ class CreateVisitorCommand; // Create a new visitor
 class DestroyVisitorCommand; // Destroy a running visitor
 class VisitorInfoCommand; // Sends visitor info to visitor controller
 class MapVisitorCommand;
-class SearchResultCommand;
-class DocumentSummaryCommand;
 class QueryResultCommand;
 
 class InternalCommand;
@@ -67,8 +65,6 @@ class CreateVisitorReply;
 class DestroyVisitorReply;
 class VisitorInfoReply;
 class MapVisitorReply;
-class SearchResultReply;
-class DocumentSummaryReply;
 class QueryResultReply;
 
 class InternalReply;
@@ -137,12 +133,8 @@ public:
     virtual bool onVisitorInfoReply(const std::shared_ptr<api::VisitorInfoReply>&) { return false; }
     virtual bool onMapVisitor(const std::shared_ptr<api::MapVisitorCommand>&) { return false; }
     virtual bool onMapVisitorReply(const std::shared_ptr<api::MapVisitorReply>&) { return false; }
-    virtual bool onSearchResult(const std::shared_ptr<api::SearchResultCommand>&) { return false; }
-    virtual bool onSearchResultReply(const std::shared_ptr<api::SearchResultReply>&) { return false; }
     virtual bool onQueryResult(const std::shared_ptr<api::QueryResultCommand>&) { return false; }
     virtual bool onQueryResultReply(const std::shared_ptr<api::QueryResultReply>&) { return false; }
-    virtual bool onDocumentSummary(const std::shared_ptr<api::DocumentSummaryCommand>&) { return false; }
-    virtual bool onDocumentSummaryReply(const std::shared_ptr<api::DocumentSummaryReply>&) { return false; }
     virtual bool onEmptyBuckets(const std::shared_ptr<api::EmptyBucketsCommand>&) { return false; }
     virtual bool onEmptyBucketsReply(const std::shared_ptr<api::EmptyBucketsReply>&) { return false; }
     virtual bool onInternal(const std::shared_ptr<api::InternalCommand>&) { return false; }
diff --git a/storage/src/vespa/storageapi/messageapi/storagemessage.cpp b/storage/src/vespa/storageapi/messageapi/storagemessage.cpp
index b1d68fd77e3..c72ece80476 100644
--- a/storage/src/vespa/storageapi/messageapi/storagemessage.cpp
+++ b/storage/src/vespa/storageapi/messageapi/storagemessage.cpp
@@ -76,10 +76,6 @@ const MessageType MessageType::APPLYBUCKETDIFF("ApplyBucketDiff", APPLYBUCKETDIF
 const MessageType MessageType::APPLYBUCKETDIFF_REPLY("ApplyBucketDiff reply", APPLYBUCKETDIFF_REPLY_ID, &MessageType::APPLYBUCKETDIFF);
 const MessageType MessageType::VISITOR_INFO("VisitorInfo", VISITOR_INFO_ID);
 const MessageType MessageType::VISITOR_INFO_REPLY("VisitorInfo reply", VISITOR_INFO_REPLY_ID, &MessageType::VISITOR_INFO);
-const MessageType MessageType::SEARCHRESULT("SearchResult", SEARCHRESULT_ID);
-const MessageType MessageType::SEARCHRESULT_REPLY("SearchResult reply", SEARCHRESULT_REPLY_ID, &MessageType::SEARCHRESULT);
-const MessageType MessageType::DOCUMENTSUMMARY("DocumentSummary", DOCUMENTSUMMARY_ID);
-const MessageType MessageType::DOCUMENTSUMMARY_REPLY("DocumentSummary reply", DOCUMENTSUMMARY_REPLY_ID, &MessageType::DOCUMENTSUMMARY);
 const MessageType MessageType::MAPVISITOR("Mapvisitor", MAPVISITOR_ID);
 const MessageType MessageType::MAPVISITOR_REPLY("Mapvisitor reply", MAPVISITOR_REPLY_ID, &MessageType::MAPVISITOR);
 const MessageType MessageType::SPLITBUCKET("SplitBucket", SPLITBUCKET_ID);
diff --git a/storage/src/vespa/storageapi/messageapi/storagemessage.h b/storage/src/vespa/storageapi/messageapi/storagemessage.h
index 282f110646d..4649781c1e5 100644
--- a/storage/src/vespa/storageapi/messageapi/storagemessage.h
+++ b/storage/src/vespa/storageapi/messageapi/storagemessage.h
@@ -122,14 +122,14 @@ public:
         DOCBLOCK_REPLY_ID = 59,
         VISITOR_INFO_ID = 60,
         VISITOR_INFO_REPLY_ID = 61,
-        SEARCHRESULT_ID = 64,
-        SEARCHRESULT_REPLY_ID = 65,
+        // SEARCHRESULT_ID = 64,
+        // SEARCHRESULT_REPLY_ID = 65,
         SPLITBUCKET_ID = 66,
         SPLITBUCKET_REPLY_ID = 67,
         JOINBUCKETS_ID = 68,
         JOINBUCKETS_REPLY_ID = 69,
-        DOCUMENTSUMMARY_ID = 72,
-        DOCUMENTSUMMARY_REPLY_ID = 73,
+        // DOCUMENTSUMMARY_ID = 72,
+        // DOCUMENTSUMMARY_REPLY_ID = 73,
         MAPVISITOR_ID = 74,
         MAPVISITOR_REPLY_ID = 75,
         STATBUCKET_ID = 76,
@@ -208,14 +208,10 @@ public:
     static const MessageType APPLYBUCKETDIFF_REPLY;
     static const MessageType VISITOR_INFO;
     static const MessageType VISITOR_INFO_REPLY;
-    static const MessageType SEARCHRESULT;
-    static const MessageType SEARCHRESULT_REPLY;
     static const MessageType SPLITBUCKET;
     static const MessageType SPLITBUCKET_REPLY;
     static const MessageType JOINBUCKETS;
     static const MessageType JOINBUCKETS_REPLY;
-    static const MessageType DOCUMENTSUMMARY;
-    static const MessageType DOCUMENTSUMMARY_REPLY;
     static const MessageType MAPVISITOR;
     static const MessageType MAPVISITOR_REPLY;
     static const MessageType STATBUCKET;