diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-11-24 12:54:51 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-11-24 13:05:22 +0000 |
commit | f9efcfa2cdb7df2af7ab35609a6776f8f2d7f477 (patch) | |
tree | c64eebcd865077a433868e758e6a3c57c841b0e1 /storageapi/src/tests | |
parent | 23940966c79d9977e3d7ba4939037f90058a5b50 (diff) |
Remove load type from StorageMessage
Diffstat (limited to 'storageapi/src/tests')
-rw-r--r-- | storageapi/src/tests/mbusprot/storageprotocoltest.cpp | 24 | ||||
-rw-r--r-- | storageapi/src/tests/messageapi/storage_message_address_test.cpp | 3 |
2 files changed, 19 insertions, 8 deletions
diff --git a/storageapi/src/tests/mbusprot/storageprotocoltest.cpp b/storageapi/src/tests/mbusprot/storageprotocoltest.cpp index 9fd2c96f27e..c2ebffb23e8 100644 --- a/storageapi/src/tests/mbusprot/storageprotocoltest.cpp +++ b/storageapi/src/tests/mbusprot/storageprotocoltest.cpp @@ -16,9 +16,7 @@ #include <vespa/document/test/make_document_bucket.h> #include <vespa/document/test/make_bucket_space.h> #include <vespa/vespalib/util/growablebytebuffer.h> -#include <vespa/vespalib/objects/nbostream.h> -#include <iomanip> #include <sstream> #include <vespa/vespalib/gtest/gtest.h> @@ -162,11 +160,9 @@ StorageProtocolTest::copyReply(const std::shared_ptr<Reply>& m) TEST_P(StorageProtocolTest, put) { auto cmd = std::make_shared<PutCommand>(_bucket, _testDoc, 14); cmd->setUpdateTimestamp(Timestamp(13)); - cmd->setLoadType(_loadTypes["foo"]); auto cmd2 = copyCommand(cmd); EXPECT_EQ(_bucket, cmd2->getBucket()); EXPECT_EQ(*_testDoc, *cmd2->getDocument()); - EXPECT_EQ(vespalib::string("foo"), cmd2->getLoadType().getName()); EXPECT_EQ(Timestamp(14), cmd2->getTimestamp()); EXPECT_EQ(Timestamp(13), cmd2->getUpdateTimestamp()); @@ -221,12 +217,10 @@ TEST_P(StorageProtocolTest, request_metadata_is_propagated) { auto cmd = std::make_shared<PutCommand>(_bucket, _testDoc, 14); cmd->forceMsgId(12345); cmd->setPriority(50); - cmd->setLoadType(_loadTypes["foo"]); cmd->setSourceIndex(321); auto cmd2 = copyCommand(cmd); EXPECT_EQ(12345, cmd2->getMsgId()); EXPECT_EQ(50, cmd2->getPriority()); - EXPECT_EQ(_loadTypes["foo"].getId(), cmd2->getLoadType().getId()); EXPECT_EQ(321, cmd2->getSourceIndex()); } @@ -821,4 +815,22 @@ TEST_P(StorageProtocolTest, serialized_size_is_used_to_set_approx_size_of_storag } } +TEST_P(StorageProtocolTest, track_memory_footprint_for_some_messages) { + EXPECT_EQ(136u, sizeof(StorageReply)); + EXPECT_EQ(160u, sizeof(BucketReply)); + EXPECT_EQ(192u, sizeof(BucketInfoReply)); + EXPECT_EQ(336u, sizeof(PutReply)); + EXPECT_EQ(320u, sizeof(UpdateReply)); + EXPECT_EQ(312u, sizeof(RemoveReply)); + EXPECT_EQ(400u, sizeof(GetReply)); + EXPECT_EQ(80u, sizeof(StorageCommand)); + EXPECT_EQ(104u, sizeof(BucketCommand)); + EXPECT_EQ(104u, sizeof(BucketInfoCommand)); + EXPECT_EQ(112u, sizeof(TestAndSetCommand)); + EXPECT_EQ(144u, sizeof(PutCommand)); + EXPECT_EQ(144u, sizeof(UpdateCommand)); + EXPECT_EQ(224u, sizeof(RemoveCommand)); + EXPECT_EQ(288u, sizeof(GetCommand)); +} + } // storage::api diff --git a/storageapi/src/tests/messageapi/storage_message_address_test.cpp b/storageapi/src/tests/messageapi/storage_message_address_test.cpp index 9db282c98eb..55adcf46c0d 100644 --- a/storageapi/src/tests/messageapi/storage_message_address_test.cpp +++ b/storageapi/src/tests/messageapi/storage_message_address_test.cpp @@ -33,8 +33,7 @@ TEST(StorageMessageAddressTest, storage_hash_covers_all_expected_fields) { hash_of("foo", lib::NodeType::STORAGE, 1)); EXPECT_EQ(112u, sizeof(StorageMessageAddress)); - EXPECT_EQ(144u, sizeof(StorageMessage)); - EXPECT_EQ(80u, sizeof(documentapi::LoadType)); + EXPECT_EQ(64u, sizeof(StorageMessage)); EXPECT_EQ(16u, sizeof(mbus::Trace)); } |