GC unused hasSingleBucketId method.

5 files changed, 4 insertions, 13 deletions

diff --git a/storage/src/vespa/storage/common/bucketmessages.h b/storage/src/vespa/storage/common/bucketmessages.h
index 3b152c60447..836be73862d 100644
--- a/storage/src/vespa/storage/common/bucketmessages.h
+++ b/storage/src/vespa/storage/common/bucketmessages.h
@@ -78,7 +78,6 @@ public:
     ~ReadBucketInfo();
 
     document::Bucket getBucket() const override { return _bucket; }
-    bool hasSingleBucketId() const override { return true; }
 
     std::unique_ptr<api::StorageReply> makeReply() override;
 
@@ -102,7 +101,6 @@ public:
     ~ReadBucketInfoReply();
 
     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;
 };
diff --git a/storage/src/vespa/storage/persistence/messages.h b/storage/src/vespa/storage/persistence/messages.h
index d4888970732..f74a102f3e0 100644
--- a/storage/src/vespa/storage/persistence/messages.h
+++ b/storage/src/vespa/storage/persistence/messages.h
@@ -28,7 +28,6 @@ public:
     std::unique_ptr<api::StorageReply> makeReply() override;
 
     document::Bucket getBucket() const override { return _bucket; }
-    bool hasSingleBucketId() const override { return true; }
 
     spi::IteratorId getIteratorId() const { return _iteratorId; }
     void setIteratorId(spi::IteratorId iteratorId) { _iteratorId = iteratorId; }
@@ -59,7 +58,6 @@ public:
     explicit GetIterReply(GetIterCommand& cmd);
     ~GetIterReply() override;
 
-    bool hasSingleBucketId() const override { return true; }
     document::Bucket getBucket() const override { return _bucket; }
 
     const std::vector<spi::DocEntry::UP>& getEntries() const {
@@ -94,7 +92,6 @@ public:
                           const std::string& fields,
                           spi::IncludedVersions includedVersions);
     ~CreateIteratorCommand() override;
-    bool hasSingleBucketId() const override { return true; }
     document::Bucket getBucket() const override { return _bucket; }
     const spi::Selection& getSelection() const { return _selection; }
     spi::IncludedVersions getIncludedVersions() const { return _includedVersions; }
@@ -127,7 +124,6 @@ public:
     CreateIteratorReply(const CreateIteratorCommand& cmd, spi::IteratorId iteratorId);
     ~CreateIteratorReply() override;
 
-    bool hasSingleBucketId() const override { return true; }
     document::Bucket getBucket() const override { return _bucket; }
 
     spi::IteratorId getIteratorId() const { return _iteratorId; }
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;