diff options
author | Tor Brede Vekterli <vekterli@yahoo-inc.com> | 2017-06-22 13:04:16 +0000 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@yahoo-inc.com> | 2017-06-22 15:09:44 +0200 |
commit | 28751a893face0ff29392fbf58a86f7de9b7600a (patch) | |
tree | 6f6633d8612c5b0f5b4e0e8dd237fcc943afddb1 /documentapi | |
parent | 4fffbbfe68797a4f62b07fcfc451042130db081d (diff) |
Remove sequencing for read-only operations in C++
Diffstat (limited to 'documentapi')
7 files changed, 19 insertions, 43 deletions
diff --git a/documentapi/src/tests/messagebus/messagebus_test.cpp b/documentapi/src/tests/messagebus/messagebus_test.cpp index 48476755ff7..7cad7356c8e 100644 --- a/documentapi/src/tests/messagebus/messagebus_test.cpp +++ b/documentapi/src/tests/messagebus/messagebus_test.cpp @@ -25,6 +25,9 @@ public: private: void testMessage(); void testProtocol(); + void get_document_message_is_not_sequenced(); + void stat_bucket_message_is_not_sequenced(); + void get_bucket_list_message_is_not_sequenced(); }; TEST_APPHOOK(Test); @@ -38,6 +41,9 @@ Test::Main() testMessage(); TEST_FLUSH(); testProtocol(); TEST_FLUSH(); + get_document_message_is_not_sequenced(); TEST_FLUSH(); + stat_bucket_message_is_not_sequenced(); TEST_FLUSH(); + get_bucket_list_message_is_not_sequenced(); TEST_FLUSH(); TEST_DONE(); } @@ -102,4 +108,17 @@ void Test::testProtocol() { EXPECT_TRUE(policy.get() == NULL); } +void Test::get_document_message_is_not_sequenced() { + GetDocumentMessage message(document::DocumentId("id:foo:bar::baz")); + EXPECT_FALSE(message.hasSequenceId()); +} + +void Test::stat_bucket_message_is_not_sequenced() { + StatBucketMessage message(document::BucketId(16, 1), ""); + EXPECT_FALSE(message.hasSequenceId()); +} +void Test::get_bucket_list_message_is_not_sequenced() { + GetBucketListMessage message(document::BucketId(16, 1)); + EXPECT_FALSE(message.hasSequenceId()); +} diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.cpp index 0fe95165540..71bb750a5aa 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.cpp @@ -26,18 +26,6 @@ GetBucketListMessage::doCreateReply() const return DocumentReply::UP(new GetBucketListReply()); } -bool -GetBucketListMessage::hasSequenceId() const -{ - return true; -} - -uint64_t -GetBucketListMessage::getSequenceId() const -{ - return _bucketId.getRawId(); -} - uint32_t GetBucketListMessage::getType() const { diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.h index c8af48f9b1f..350f36cc708 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.h @@ -40,8 +40,6 @@ public: * @param id The bucket id to set. */ void setBucketId(const document::BucketId& id) { _bucketId = id; } - bool hasSequenceId() const override; - uint64_t getSequenceId() const override; uint32_t getType() const override; string toString() const override { return "getbucketlistmessage"; } }; diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.cpp index 2e0159fd5f3..53b1abc8dcb 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.cpp @@ -36,18 +36,6 @@ GetDocumentMessage::doCreateReply() const return DocumentReply::UP(new GetDocumentReply()); } -bool -GetDocumentMessage::hasSequenceId() const -{ - return true; -} - -uint64_t -GetDocumentMessage::getSequenceId() const -{ - return *reinterpret_cast<const uint64_t*>(_documentId.getGlobalId().get()); -} - uint32_t GetDocumentMessage::getType() const { diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.h index 835ad9cd0b2..09ba8306b61 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.h @@ -86,8 +86,6 @@ public: */ const string& getFieldSet() const { return _fieldSet; } - bool hasSequenceId() const override; - uint64_t getSequenceId() const override; uint32_t getType() const override; string toString() const override { return "getdocumentmessage"; } }; diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.cpp index 4d47a1db8c6..4208c9974bc 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.cpp @@ -26,18 +26,6 @@ StatBucketMessage::doCreateReply() const return DocumentReply::UP(new StatBucketReply()); } -bool -StatBucketMessage::hasSequenceId() const -{ - return true; -} - -uint64_t -StatBucketMessage::getSequenceId() const -{ - return _bucket.getRawId(); -} - uint32_t StatBucketMessage::getType() const { diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h index 99e6ac83bb6..74e908f4a85 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h @@ -57,9 +57,6 @@ public: * @param value The selection string to set. */ void setDocumentSelection(const string &value) { _documentSelection = value; }; - - bool hasSequenceId() const override; - uint64_t getSequenceId() const override; uint32_t getType() const override; string toString() const override { return "statbucketmessage"; } }; |