diff options
4 files changed, 12 insertions, 19 deletions
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/writedocumentreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/writedocumentreply.h index f8c5c6335d5..678fd24333d 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/writedocumentreply.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/writedocumentreply.h @@ -23,9 +23,7 @@ public: * Returns a unique VDS timestamp so that visiting up to and including that * timestamp will return a state including this operation but not any * operations sent to the same distributor after it. For PUT/UPDATE/REMOVE - * operations this timestamp will be the timestamp of the operation, while - * for MULTIOPERATION, the timestamp will be the highest one generated by - * it. + * operations this timestamp will be the timestamp of the operation. * * @return Returns the modification timestamp. */ diff --git a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp index d4b749772a2..95642ac6215 100644 --- a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp +++ b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp @@ -234,8 +234,7 @@ makeAbortCmd(const Container& buckets) void OperationAbortingTest::testAbortMessageClearsRelevantQueuedOperations() { - uint32_t queueBarrierThreads = 2; - setupDisks(1, queueBarrierThreads); + setupDisks(1, 2); TestFileStorComponents c(*this, "testAbortMessageClearsRelevantQueuedOperations"); document::BucketId bucket(16, 1); createBucket(bucket); diff --git a/storage/src/vespa/storage/persistence/messages.cpp b/storage/src/vespa/storage/persistence/messages.cpp index 720371a68f1..f38d3d0fac3 100644 --- a/storage/src/vespa/storage/persistence/messages.cpp +++ b/storage/src/vespa/storage/persistence/messages.cpp @@ -16,7 +16,7 @@ GetIterCommand::GetIterCommand(const document::Bucket &bucket, { } -GetIterCommand::~GetIterCommand() { } +GetIterCommand::~GetIterCommand() = default; void GetIterCommand::print(std::ostream& out, bool verbose, const std::string& indent) const { @@ -39,7 +39,7 @@ GetIterReply::GetIterReply(GetIterCommand& cmd) _completed(false) { } -GetIterReply::~GetIterReply() { } +GetIterReply::~GetIterReply() = default; void GetIterReply::print(std::ostream& out, bool verbose, const std::string& indent) const { @@ -63,7 +63,7 @@ CreateIteratorCommand::CreateIteratorCommand(const document::Bucket &bucket, _readConsistency(spi::ReadConsistency::STRONG) { } -CreateIteratorCommand::~CreateIteratorCommand() { } +CreateIteratorCommand::~CreateIteratorCommand() = default; void CreateIteratorCommand::print(std::ostream& out, bool, const std::string &) const { @@ -82,7 +82,7 @@ CreateIteratorReply::CreateIteratorReply(const CreateIteratorCommand& cmd, spi:: _iteratorId(iteratorId) { } -CreateIteratorReply::~CreateIteratorReply() { } +CreateIteratorReply::~CreateIteratorReply() = default; void CreateIteratorReply::print(std::ostream& out, bool, const std::string &) const { @@ -94,7 +94,7 @@ DestroyIteratorCommand::DestroyIteratorCommand(spi::IteratorId iteratorId) _iteratorId(iteratorId) { } -DestroyIteratorCommand::~DestroyIteratorCommand() { } +DestroyIteratorCommand::~DestroyIteratorCommand() = default; void DestroyIteratorCommand::print(std::ostream& out, bool, const std::string &) const { @@ -106,7 +106,7 @@ DestroyIteratorReply::DestroyIteratorReply(const DestroyIteratorCommand& cmd) _iteratorId(cmd.getIteratorId()) { } -DestroyIteratorReply::~DestroyIteratorReply() { } +DestroyIteratorReply::~DestroyIteratorReply() = default; void DestroyIteratorReply::print(std::ostream& out, bool, const std::string &) const { @@ -123,7 +123,7 @@ RecheckBucketInfoCommand::RecheckBucketInfoCommand(const document::Bucket& bucke _bucket(bucket) { } -RecheckBucketInfoCommand::~RecheckBucketInfoCommand() { } +RecheckBucketInfoCommand::~RecheckBucketInfoCommand() = default; void RecheckBucketInfoCommand::print(std::ostream& out, bool, const std::string &) const { @@ -135,7 +135,7 @@ RecheckBucketInfoReply::RecheckBucketInfoReply(const RecheckBucketInfoCommand& c _bucket(cmd.getBucket()) { } -RecheckBucketInfoReply::~RecheckBucketInfoReply() { } +RecheckBucketInfoReply::~RecheckBucketInfoReply() = default; void RecheckBucketInfoReply::print(std::ostream& out, bool, const std::string &) const { @@ -152,7 +152,7 @@ AbortBucketOperationsCommand::AbortBucketOperationsCommand(std::unique_ptr<Abort _predicate(std::move(predicate)) { } -AbortBucketOperationsCommand::~AbortBucketOperationsCommand() { } +AbortBucketOperationsCommand::~AbortBucketOperationsCommand() = default; void @@ -164,7 +164,7 @@ AbortBucketOperationsReply::AbortBucketOperationsReply(const AbortBucketOperatio : api::InternalReply(ID, cmd) { } -AbortBucketOperationsReply::~AbortBucketOperationsReply() { } +AbortBucketOperationsReply::~AbortBucketOperationsReply() = default; void AbortBucketOperationsReply::print(std::ostream& out, bool, const std::string &) const { diff --git a/storageapi/src/vespa/storageapi/messageapi/storagemessage.h b/storageapi/src/vespa/storageapi/messageapi/storagemessage.h index 46f00127202..ff53c222521 100644 --- a/storageapi/src/vespa/storageapi/messageapi/storagemessage.h +++ b/storageapi/src/vespa/storageapi/messageapi/storagemessage.h @@ -128,8 +128,6 @@ public: SPLITBUCKET_REPLY_ID = 67, JOINBUCKETS_ID = 68, JOINBUCKETS_REPLY_ID = 69, - //MULTIOPERATION_ID = 70, - //MULTIOPERATION_REPLY_ID = 71, DOCUMENTSUMMARY_ID = 72, DOCUMENTSUMMARY_REPLY_ID = 73, MAPVISITOR_ID = 74, @@ -216,8 +214,6 @@ public: static const MessageType SPLITBUCKET_REPLY; static const MessageType JOINBUCKETS; static const MessageType JOINBUCKETS_REPLY; - static const MessageType MULTIOPERATION; - static const MessageType MULTIOPERATION_REPLY; static const MessageType DOCUMENTSUMMARY; static const MessageType DOCUMENTSUMMARY_REPLY; static const MessageType MAPVISITOR; |