diff options
| author | Geir Storli <geirst@oath.com> | 2017-11-21 14:18:58 +0000 |
|---|---|---|
| committer | Geir Storli <geirst@oath.com> | 2017-11-22 12:09:09 +0000 |
| commit | b4f4418cee4f6fca48c1148cab8dac65ca74d8d9 (patch) | |
| tree | f8e06a22657205cb1c35a763afe996b6f33ec578 /storage | |
| parent | dc7744b33f8266b3dcd92c74650d842d1f13947a (diff) | |
Add named bucket space to GetBucketListMessage.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/tests/storageserver/documentapiconvertertest.cpp | 12 | ||||
| -rw-r--r-- | storage/src/vespa/storage/storageserver/documentapiconverter.cpp | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/storage/src/tests/storageserver/documentapiconvertertest.cpp b/storage/src/tests/storageserver/documentapiconvertertest.cpp index da0852eb298..c55e91a5f87 100644 --- a/storage/src/tests/storageserver/documentapiconvertertest.cpp +++ b/storage/src/tests/storageserver/documentapiconvertertest.cpp @@ -107,6 +107,7 @@ struct DocumentApiConverterTest : public CppUnit::TestFixture void testMultiOperation(); void testBatchDocumentUpdate(); void testStatBucket(); + void testGetBucketList(); CPPUNIT_TEST_SUITE(DocumentApiConverterTest); CPPUNIT_TEST(testPut); @@ -123,6 +124,7 @@ struct DocumentApiConverterTest : public CppUnit::TestFixture CPPUNIT_TEST(testMultiOperation); CPPUNIT_TEST(testBatchDocumentUpdate); CPPUNIT_TEST(testStatBucket); + CPPUNIT_TEST(testGetBucketList); CPPUNIT_TEST_SUITE_END(); }; @@ -490,4 +492,14 @@ DocumentApiConverterTest::testStatBucket() CPPUNIT_ASSERT_EQUAL(defaultSpaceName, mbusMsg->getBucketSpace()); } +void +DocumentApiConverterTest::testGetBucketList() +{ + documentapi::GetBucketListMessage msg(BucketId(123)); + msg.setBucketSpace(defaultSpaceName); + + auto cmd = toStorageAPI<api::GetBucketListCommand>(msg); + CPPUNIT_ASSERT_EQUAL(Bucket(defaultBucketSpace, BucketId(123)), cmd->getBucket()); +} + } diff --git a/storage/src/vespa/storage/storageserver/documentapiconverter.cpp b/storage/src/vespa/storage/storageserver/documentapiconverter.cpp index 165c144ef9c..95c35ce988e 100644 --- a/storage/src/vespa/storage/storageserver/documentapiconverter.cpp +++ b/storage/src/vespa/storage/storageserver/documentapiconverter.cpp @@ -125,7 +125,8 @@ DocumentApiConverter::toStorageAPI(documentapi::DocumentMessage& fromMsg, case DocumentProtocol::MESSAGE_GETBUCKETLIST: { documentapi::GetBucketListMessage& from(static_cast<documentapi::GetBucketListMessage&>(fromMsg)); - toMsg = std::make_unique<api::GetBucketListCommand>(from.getBucket()); + document::Bucket bucket(_bucketResolver.bucketSpaceFromName(from.getBucketSpace()), from.getBucketId()); + toMsg = std::make_unique<api::GetBucketListCommand>(bucket); break; } case DocumentProtocol::MESSAGE_VISITORINFO: |