diff options
author | Tor Egge <Tor.Egge@oath.com> | 2017-10-18 12:36:24 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@oath.com> | 2017-10-18 12:36:24 +0000 |
commit | 00673fd58679212a69a5f51ff255a90c2fff9271 (patch) | |
tree | b75044ce6c4c2d5bf759ee024b55c95b07cc57f3 /storageapi | |
parent | 8530d49ee9f6e4e6cf613d59bc454d39082046b3 (diff) |
Remove DocBlockCommand and DocBlockReply from storage api.
Diffstat (limited to 'storageapi')
-rw-r--r-- | storageapi/src/vespa/storageapi/message/datagram.cpp | 45 | ||||
-rw-r--r-- | storageapi/src/vespa/storageapi/message/datagram.h | 47 | ||||
-rw-r--r-- | storageapi/src/vespa/storageapi/messageapi/messagehandler.h | 8 |
3 files changed, 0 insertions, 100 deletions
diff --git a/storageapi/src/vespa/storageapi/message/datagram.cpp b/storageapi/src/vespa/storageapi/message/datagram.cpp index c2fc347c597..4967c1fd82d 100644 --- a/storageapi/src/vespa/storageapi/message/datagram.cpp +++ b/storageapi/src/vespa/storageapi/message/datagram.cpp @@ -7,8 +7,6 @@ using document::BucketSpace; namespace storage { namespace api { -IMPLEMENT_COMMAND(DocBlockCommand, DocBlockReply) -IMPLEMENT_REPLY(DocBlockReply) IMPLEMENT_COMMAND(MapVisitorCommand, MapVisitorReply) IMPLEMENT_REPLY(MapVisitorReply) IMPLEMENT_COMMAND(DocumentListCommand, DocumentListReply) @@ -16,49 +14,6 @@ IMPLEMENT_REPLY(DocumentListReply) IMPLEMENT_COMMAND(EmptyBucketsCommand, EmptyBucketsReply) IMPLEMENT_REPLY(EmptyBucketsReply) -DocBlockCommand::DocBlockCommand(const document::BucketId& bucketId, - const vdslib::DocumentList& block, - const std::shared_ptr<void>& buffer) - : StorageCommand(MessageType::DOCBLOCK), - _bucket(BucketSpace::placeHolder(), bucketId), - _docBlock(block), - _buffer(buffer), - _keepTimeStamps(false) -{ -} - -DocBlockCommand::~DocBlockCommand() {} - -void -DocBlockCommand::print(std::ostream& out, bool verbose, - const std::string& indent) const -{ - out << "DocBlockCommand(" - << "size " << _docBlock.getBufferSize() << ", used space " - << (_docBlock.getBufferSize() - _docBlock.countFree()) << ", doccount " - << _docBlock.size() << ")"; - if (verbose) { - out << " : "; - StorageCommand::print(out, verbose, indent); - } -} - -DocBlockReply::DocBlockReply(const DocBlockCommand& cmd) - : StorageReply(cmd) -{ -} - -void -DocBlockReply::print(std::ostream& out, bool verbose, - const std::string& indent) const -{ - out << "DocBlockReply()"; - if (verbose) { - out << " : "; - StorageReply::print(out, verbose, indent); - } -} - MapVisitorCommand::MapVisitorCommand() : StorageCommand(MessageType::MAPVISITOR) { diff --git a/storageapi/src/vespa/storageapi/message/datagram.h b/storageapi/src/vespa/storageapi/message/datagram.h index 272ba72364e..32f9bea6a95 100644 --- a/storageapi/src/vespa/storageapi/message/datagram.h +++ b/storageapi/src/vespa/storageapi/message/datagram.h @@ -10,53 +10,6 @@ namespace storage::api { /** - * @class DocBlockCommand - * @ingroup message - * - * @brief Sends a docblock to a visitor or subscriber. - */ -class DocBlockCommand : public StorageCommand { - document::Bucket _bucket; - vdslib::DocumentList _docBlock; - std::shared_ptr<void> _buffer; // Owns data in docblock - bool _keepTimeStamps; // Used for recovery/synchronization where we want to - // keep the timestamps of the origin. - -public: - DocBlockCommand(const document::BucketId& bucketId, - const vdslib::DocumentList& block, - const std::shared_ptr<void>& buffer); - ~DocBlockCommand(); - - vdslib::DocumentList& getDocumentBlock() - { assert(_docBlock.getBufferSize() > 0); return _docBlock; } - const vdslib::DocumentList& getDocumentBlock() const - { assert(_docBlock.getBufferSize() > 0); return _docBlock; } - void setDocumentBlock(vdslib::DocumentList& block) { _docBlock = block; } - - document::Bucket getBucket() const override { return _bucket; } - bool hasSingleBucketId() const override { return true; } - void print(std::ostream& out, bool verbose, const std::string& indent) const override; - bool keepTimeStamps() const { return _keepTimeStamps; } - void keepTimeStamps(bool keepTime) { _keepTimeStamps = keepTime; } - - DECLARE_STORAGECOMMAND(DocBlockCommand, onDocBlock) -}; - -/** - * @class DocBlockReply - * @ingroup message - * - * @brief Confirm that a given docblock have been received. - */ -class DocBlockReply : public StorageReply { -public: - explicit DocBlockReply(const DocBlockCommand&); - void print(std::ostream& out, bool verbose, const std::string& indent) const override; - DECLARE_STORAGEREPLY(DocBlockReply, onDocBlockReply) -}; - -/** * @class MapStorageCommand * @ingroup message * diff --git a/storageapi/src/vespa/storageapi/messageapi/messagehandler.h b/storageapi/src/vespa/storageapi/messageapi/messagehandler.h index 8f571ff0f40..1b9c423e78b 100644 --- a/storageapi/src/vespa/storageapi/messageapi/messagehandler.h +++ b/storageapi/src/vespa/storageapi/messageapi/messagehandler.h @@ -32,7 +32,6 @@ class BatchDocumentUpdateCommand; class CreateVisitorCommand; // Create a new visitor class DestroyVisitorCommand; // Destroy a running visitor class VisitorInfoCommand; // Sends visitor info to visitor controller -class DocBlockCommand; // A block of documents visited class MapVisitorCommand; class SearchResultCommand; class DocumentSummaryCommand; @@ -73,7 +72,6 @@ class BatchDocumentUpdateReply; class CreateVisitorReply; class DestroyVisitorReply; class VisitorInfoReply; -class DocBlockReply; class MapVisitorReply; class SearchResultReply; class DocumentSummaryReply; @@ -188,12 +186,6 @@ public: virtual bool onVisitorInfoReply( const std::shared_ptr<api::VisitorInfoReply>&) { return false; } - virtual bool onDocBlock( - const std::shared_ptr<api::DocBlockCommand>&) - { return false; } - virtual bool onDocBlockReply( - const std::shared_ptr<api::DocBlockReply>&) - { return false; } virtual bool onMapVisitor( const std::shared_ptr<api::MapVisitorCommand>&) { return false; } |