diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-18 12:38:05 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-18 12:43:15 +0000 |
commit | 63ae63e1751179b30858936126506cefb40c0f22 (patch) | |
tree | ff3d0579e4f647a23a285c8f7381d5f97b9a4e07 /storageapi/src | |
parent | 364efda89acd2dc2d6525aae3630707c72d0cb1e (diff) |
GC unused hasSingleBucketId method.
Diffstat (limited to 'storageapi/src')
3 files changed, 4 insertions, 7 deletions
diff --git a/storageapi/src/vespa/storageapi/messageapi/bucketcommand.h b/storageapi/src/vespa/storageapi/messageapi/bucketcommand.h index c098bc53751..a308c23d047 100644 --- a/storageapi/src/vespa/storageapi/messageapi/bucketcommand.h +++ b/storageapi/src/vespa/storageapi/messageapi/bucketcommand.h @@ -28,7 +28,6 @@ public: bool hasBeenRemapped() const { return (_originalBucket.getRawId() != 0); } const document::BucketId& getOriginalBucketId() const { return _originalBucket; } void print(std::ostream& out, bool verbose, const std::string& indent) const override; - bool hasSingleBucketId() const override { return true; } }; } diff --git a/storageapi/src/vespa/storageapi/messageapi/bucketreply.h b/storageapi/src/vespa/storageapi/messageapi/bucketreply.h index 9fe04dfe47d..7a00befc913 100644 --- a/storageapi/src/vespa/storageapi/messageapi/bucketreply.h +++ b/storageapi/src/vespa/storageapi/messageapi/bucketreply.h @@ -30,7 +30,6 @@ public: DECLARE_POINTER_TYPEDEFS(BucketReply); document::Bucket getBucket() const override { return _bucket; } - bool hasSingleBucketId() const override { return true; } bool hasBeenRemapped() const { return (_originalBucket.getRawId() != 0); } const document::BucketId& getOriginalBucketId() const { return _originalBucket; } diff --git a/storageapi/src/vespa/storageapi/messageapi/storagemessage.h b/storageapi/src/vespa/storageapi/messageapi/storagemessage.h index acf651d8816..610e7e179b4 100644 --- a/storageapi/src/vespa/storageapi/messageapi/storagemessage.h +++ b/storageapi/src/vespa/storageapi/messageapi/storagemessage.h @@ -37,8 +37,8 @@ namespace vespalib { class asciistream; } public: \ DECLARE_POINTER_TYPEDEFS(reply) \ private: \ - bool callHandler(MessageHandler& h, \ - const std::shared_ptr<StorageMessage>& m) const override \ + bool callHandler(storage::api::MessageHandler& h, \ + const std::shared_ptr<storage::api::StorageMessage>& m) const override \ { \ return h.callback(std::static_pointer_cast<reply>(m)); \ } @@ -46,7 +46,7 @@ private: \ /** Commands also has a command to implement to create the reply. */ #define DECLARE_STORAGECOMMAND(command, callback) \ public: \ - std::unique_ptr<StorageReply> makeReply() override; \ + std::unique_ptr<storage::api::StorageReply> makeReply() override; \ DECLARE_STORAGEREPLY(command, callback) /** This macro implements common stuff for all storage messages. */ @@ -62,7 +62,7 @@ public: \ std::unique_ptr<storage::api::StorageReply> \ storage::api::command::makeReply() \ { \ - return std::unique_ptr<storage::api::StorageReply>(new reply(*this)); \ + return std::make_unique<reply>(*this); \ } namespace storage::api { @@ -446,7 +446,6 @@ public: virtual document::Bucket getBucket() const { return getDummyBucket(); } document::BucketId getBucketId() const noexcept { return getBucket().getBucketId(); } - virtual bool hasSingleBucketId() const { return false; } virtual LockingRequirements lockingRequirements() const noexcept { // Safe default: assume exclusive locking is required. return LockingRequirements::Exclusive; |