diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2018-09-25 14:43:55 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2018-09-25 15:41:09 +0200 |
commit | 7d61a960839ea0400cd2e345997425419ab697f4 (patch) | |
tree | f99fabb2631f7d67b270d1dd928df36494369735 /storage/src | |
parent | 8c58a2f4ed9b873c712c41f7e1f407d078b9a4d4 (diff) |
Remove BatchDocumentUpdateMessage and BatchDocumentUpdateReply from
C++ portion of documentapi.
Remove corresponding document api cross language files.
Remove corresponding storageapi messages.
Diffstat (limited to 'storage/src')
6 files changed, 1 insertions, 69 deletions
diff --git a/storage/src/tests/storageserver/documentapiconvertertest.cpp b/storage/src/tests/storageserver/documentapiconvertertest.cpp index 40d561bd589..a60c048342c 100644 --- a/storage/src/tests/storageserver/documentapiconvertertest.cpp +++ b/storage/src/tests/storageserver/documentapiconvertertest.cpp @@ -115,7 +115,6 @@ struct DocumentApiConverterTest : public CppUnit::TestFixture void testCreateVisitorReplyLastBucket(); void testDestroyVisitor(); void testVisitorInfo(); - void testBatchDocumentUpdate(); void testStatBucket(); void testGetBucketList(); void testRemoveLocation(); @@ -133,7 +132,6 @@ struct DocumentApiConverterTest : public CppUnit::TestFixture CPPUNIT_TEST(testCreateVisitorReplyLastBucket); CPPUNIT_TEST(testDestroyVisitor); CPPUNIT_TEST(testVisitorInfo); - CPPUNIT_TEST(testBatchDocumentUpdate); CPPUNIT_TEST(testStatBucket); CPPUNIT_TEST(testGetBucketList); CPPUNIT_TEST(testRemoveLocation); @@ -321,58 +319,6 @@ DocumentApiConverterTest::testVisitorInfo() } void -DocumentApiConverterTest::testBatchDocumentUpdate() -{ - std::vector<document::DocumentUpdate::SP > updates; - - { - document::DocumentId docId(document::UserDocIdString("userdoc:test:1234:test1")); - auto update = std::make_shared<document::DocumentUpdate>(*_repo, _html_type, docId); - updates.push_back(update); - } - - { - document::DocumentId docId(document::UserDocIdString("userdoc:test:1234:test2")); - auto update = std::make_shared<document::DocumentUpdate>(*_repo, _html_type, docId); - updates.push_back(update); - } - - { - document::DocumentId docId(document::UserDocIdString("userdoc:test:1234:test3")); - auto update = std::make_shared<document::DocumentUpdate>(*_repo, _html_type, docId); - updates.push_back(update); - } - - auto msg = std::make_shared<documentapi::BatchDocumentUpdateMessage>(1234); - for (std::size_t i = 0; i < updates.size(); ++i) { - msg->addUpdate(updates[i]); - } - - auto batchCmd = toStorageAPI<api::BatchDocumentUpdateCommand>(*msg); - CPPUNIT_ASSERT_EQUAL(updates.size(), batchCmd->getUpdates().size()); - for (std::size_t i = 0; i < updates.size(); ++i) { - CPPUNIT_ASSERT_EQUAL(*updates[i], *batchCmd->getUpdates()[i]); - } - - api::BatchDocumentUpdateReply batchReply(*batchCmd); - batchReply.getDocumentsNotFound().resize(3); - batchReply.getDocumentsNotFound()[0] = true; - batchReply.getDocumentsNotFound()[2] = true; - - std::unique_ptr<mbus::Reply> mbusReply = msg->createReply(); - documentapi::BatchDocumentUpdateReply* mbusBatchReply( - dynamic_cast<documentapi::BatchDocumentUpdateReply*>(mbusReply.get())); - CPPUNIT_ASSERT(mbusBatchReply != 0); - - _converter->transferReplyState(batchReply, *mbusReply); - - CPPUNIT_ASSERT_EQUAL(std::size_t(3), mbusBatchReply->getDocumentsNotFound().size()); - CPPUNIT_ASSERT(mbusBatchReply->getDocumentsNotFound()[0] == true); - CPPUNIT_ASSERT(mbusBatchReply->getDocumentsNotFound()[1] == false); - CPPUNIT_ASSERT(mbusBatchReply->getDocumentsNotFound()[2] == true); -} - -void DocumentApiConverterTest::testStatBucket() { documentapi::StatBucketMessage msg(BucketId(123), ""); diff --git a/storage/src/vespa/storage/distributor/distributor.cpp b/storage/src/vespa/storage/distributor/distributor.cpp index 2d490ea9923..13027d95997 100644 --- a/storage/src/vespa/storage/distributor/distributor.cpp +++ b/storage/src/vespa/storage/distributor/distributor.cpp @@ -617,7 +617,6 @@ bool is_client_request(const api::StorageMessage& msg) noexcept { case api::MessageType::UPDATE_ID: case api::MessageType::REMOVELOCATION_ID: case api::MessageType::BATCHPUTREMOVE_ID: // Deprecated - case api::MessageType::BATCHDOCUMENTUPDATE_ID: // Deprecated return true; default: return false; diff --git a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.h b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.h index e3fb6c93a3a..6efce913e70 100644 --- a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.h +++ b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.h @@ -15,7 +15,6 @@ namespace storage { namespace api { class UpdateCommand; -class BatchDocumentUpdateCommand; class CreateBucketReply; } diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp index 3475e3e12ba..2474ac15ca7 100644 --- a/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp +++ b/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp @@ -309,8 +309,7 @@ constexpr std::array<uint32_t, 7> WRITE_FEED_MESSAGE_TYPES {{ api::MessageType::REMOVE_ID, api::MessageType::UPDATE_ID, api::MessageType::REMOVELOCATION_ID, - api::MessageType::BATCHPUTREMOVE_ID, - api::MessageType::BATCHDOCUMENTUPDATE_ID + api::MessageType::BATCHPUTREMOVE_ID }}; } diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp index f9571228ef9..e803b72b25c 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp +++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp @@ -250,7 +250,6 @@ FileStorHandlerImpl::messageMayBeAborted(const api::StorageMessage& msg) case api::MessageType::UPDATE_ID: case api::MessageType::REMOVELOCATION_ID: case api::MessageType::BATCHPUTREMOVE_ID: - case api::MessageType::BATCHDOCUMENTUPDATE_ID: case api::MessageType::SETBUCKETSTATE_ID: return true; default: diff --git a/storage/src/vespa/storage/storageserver/documentapiconverter.cpp b/storage/src/vespa/storage/storageserver/documentapiconverter.cpp index 00bc395b536..99923b1c495 100644 --- a/storage/src/vespa/storage/storageserver/documentapiconverter.cpp +++ b/storage/src/vespa/storage/storageserver/documentapiconverter.cpp @@ -100,12 +100,6 @@ DocumentApiConverter::toStorageAPI(documentapi::DocumentMessage& fromMsg) toMsg = std::make_unique<api::DestroyVisitorCommand>(from.getInstanceId()); break; } - case DocumentProtocol::MESSAGE_BATCHDOCUMENTUPDATE: - { - documentapi::BatchDocumentUpdateMessage& from(static_cast<documentapi::BatchDocumentUpdateMessage&>(fromMsg)); - toMsg = std::make_unique<api::BatchDocumentUpdateCommand>(from.getUpdates()); - break; - } case DocumentProtocol::MESSAGE_STATBUCKET: { documentapi::StatBucketMessage& from(static_cast<documentapi::StatBucketMessage&>(fromMsg)); @@ -377,10 +371,6 @@ DocumentApiConverter::transferReplyState(api::StorageReply& fromMsg, mbus::Reply documentapi::CreateVisitorReply& to(static_cast<documentapi::CreateVisitorReply&>(toMsg)); to.setLastBucket(from.getLastBucket()); to.setVisitorStatistics(from.getVisitorStatistics()); - } else if (toMsg.getType() == DocumentProtocol::REPLY_BATCHDOCUMENTUPDATE) { - api::BatchDocumentUpdateReply& from(static_cast<api::BatchDocumentUpdateReply&>(fromMsg)); - documentapi::BatchDocumentUpdateReply& to(static_cast<documentapi::BatchDocumentUpdateReply&>(toMsg)); - to.getDocumentsNotFound() = from.getDocumentsNotFound(); } } |