diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2018-09-25 20:36:27 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2018-09-26 10:56:21 +0200 |
commit | 71d2c3bbc23fa48028bebb2c117de596baee6cd2 (patch) | |
tree | 96645dabf9e43227739f05c6cad3f8d4a57e030f /storage | |
parent | f5f85f535e6117d3d38011ce4196e64a7f8bfe24 (diff) |
Remove BatchPutRemove command from storageapi.
Diffstat (limited to 'storage')
12 files changed, 5 insertions, 27 deletions
diff --git a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp index ea2cc00c642..f4b80f7961c 100644 --- a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp +++ b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp @@ -11,7 +11,6 @@ #include <vespa/storage/distributor/externaloperationhandler.h> #include <vespa/storageapi/message/persistence.h> #include <vespa/storage/distributor/operations/external/twophaseupdateoperation.h> -#include <vespa/storageapi/message/batch.h> #include <tests/distributor/distributortestutil.h> #include <vespa/document/test/make_document_bucket.h> #include <vespa/storage/distributor/distributor.h> diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp index 369e820f987..61c55248370 100644 --- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp +++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp @@ -12,12 +12,12 @@ #include <vespa/storage/persistence/filestorage/filestormanager.h> #include <vespa/storage/persistence/filestorage/modifiedbucketchecker.h> #include <vespa/document/update/assignvalueupdate.h> +#include <vespa/document/update/documentupdate.h> #include <vespa/document/select/parser.h> #include <vespa/vdslib/state/random.h> #include <vespa/storageapi/message/bucketsplitting.h> #include <vespa/persistence/dummyimpl/dummypersistence.h> #include <vespa/persistence/spi/test.h> -#include <vespa/storageapi/message/batch.h> #include <vespa/config/common/exceptions.h> #include <vespa/fastos/file.h> diff --git a/storage/src/tests/storageserver/documentapiconvertertest.cpp b/storage/src/tests/storageserver/documentapiconvertertest.cpp index a60c048342c..7f8b1b8f34a 100644 --- a/storage/src/tests/storageserver/documentapiconvertertest.cpp +++ b/storage/src/tests/storageserver/documentapiconvertertest.cpp @@ -8,11 +8,11 @@ #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/select/parser.h> #include <vespa/document/test/make_document_bucket.h> +#include <vespa/document/update/documentupdate.h> #include <vespa/documentapi/documentapi.h> #include <vespa/messagebus/emptyreply.h> #include <vespa/storage/common/bucket_resolver.h> #include <vespa/storage/storageserver/documentapiconverter.h> -#include <vespa/storageapi/message/batch.h> #include <vespa/storageapi/message/datagram.h> #include <vespa/storageapi/message/persistence.h> #include <vespa/storageapi/message/removelocation.h> diff --git a/storage/src/vespa/storage/common/messagebucket.cpp b/storage/src/vespa/storage/common/messagebucket.cpp index ecbad310a58..4a6f638262d 100644 --- a/storage/src/vespa/storage/common/messagebucket.cpp +++ b/storage/src/vespa/storage/common/messagebucket.cpp @@ -9,7 +9,6 @@ #include <vespa/storageapi/message/removelocation.h> #include <vespa/storage/persistence/messages.h> #include <vespa/storageapi/message/stat.h> -#include <vespa/storageapi/message/batch.h> #include <vespa/vespalib/util/exceptions.h> @@ -31,8 +30,6 @@ getStorageMessageBucket(const api::StorageMessage& msg) return static_cast<const api::RevertCommand&>(msg).getBucket(); case api::MessageType::STATBUCKET_ID: return static_cast<const api::StatBucketCommand&>(msg).getBucket(); - case api::MessageType::BATCHPUTREMOVE_ID: - return static_cast<const api::BatchPutRemoveCommand&>(msg).getBucket(); case api::MessageType::REMOVELOCATION_ID: return static_cast<const api::RemoveLocationCommand&>(msg).getBucket(); case api::MessageType::CREATEBUCKET_ID: diff --git a/storage/src/vespa/storage/distributor/distributor.cpp b/storage/src/vespa/storage/distributor/distributor.cpp index 13027d95997..1664dd0d9a1 100644 --- a/storage/src/vespa/storage/distributor/distributor.cpp +++ b/storage/src/vespa/storage/distributor/distributor.cpp @@ -616,7 +616,6 @@ bool is_client_request(const api::StorageMessage& msg) noexcept { case api::MessageType::STATBUCKET_ID: case api::MessageType::UPDATE_ID: case api::MessageType::REMOVELOCATION_ID: - case api::MessageType::BATCHPUTREMOVE_ID: // Deprecated return true; default: return false; diff --git a/storage/src/vespa/storage/distributor/externaloperationhandler.cpp b/storage/src/vespa/storage/distributor/externaloperationhandler.cpp index bb8c2b0608a..2d27b91f3e3 100644 --- a/storage/src/vespa/storage/distributor/externaloperationhandler.cpp +++ b/storage/src/vespa/storage/distributor/externaloperationhandler.cpp @@ -15,7 +15,6 @@ #include <vespa/document/util/stringutil.h> #include <vespa/storageapi/message/persistence.h> #include <vespa/storageapi/message/removelocation.h> -#include <vespa/storageapi/message/batch.h> #include <vespa/storageapi/message/stat.h> #include "distributor_bucket_space_repo.h" #include "distributor_bucket_space.h" diff --git a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp index 0b0fc05763f..c652f787b2e 100644 --- a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp +++ b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp @@ -6,8 +6,8 @@ #include "updateoperation.h" #include <vespa/storage/distributor/distributor_bucket_space.h> #include <vespa/storageapi/message/persistence.h> -#include <vespa/storageapi/message/batch.h> #include <vespa/document/datatype/documenttype.h> +#include <vespa/document/fieldvalue/document.h> #include <vespa/document/select/parser.h> #include <vespa/vespalib/stllike/hash_map.hpp> diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp index 2474ac15ca7..784ea7253b6 100644 --- a/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp +++ b/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp @@ -308,8 +308,7 @@ constexpr std::array<uint32_t, 7> WRITE_FEED_MESSAGE_TYPES {{ api::MessageType::PUT_ID, api::MessageType::REMOVE_ID, api::MessageType::UPDATE_ID, - api::MessageType::REMOVELOCATION_ID, - api::MessageType::BATCHPUTREMOVE_ID + api::MessageType::REMOVELOCATION_ID }}; } diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp index e803b72b25c..3ccb35ef5a7 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp +++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp @@ -12,7 +12,6 @@ #include <vespa/storage/common/messagebucket.h> #include <vespa/storage/persistence/messages.h> #include <vespa/storageapi/message/stat.h> -#include <vespa/storageapi/message/batch.h> #include <vespa/vespalib/stllike/hash_map.hpp> #include <vespa/vespalib/util/exceptions.h> @@ -249,7 +248,6 @@ FileStorHandlerImpl::messageMayBeAborted(const api::StorageMessage& msg) case api::MessageType::JOINBUCKETS_ID: case api::MessageType::UPDATE_ID: case api::MessageType::REMOVELOCATION_ID: - case api::MessageType::BATCHPUTREMOVE_ID: case api::MessageType::SETBUCKETSTATE_ID: return true; default: @@ -586,7 +584,6 @@ FileStorHandlerImpl::remapMessage(api::StorageMessage& msg, const document::Buck break; } case api::MessageType::STAT_ID: - case api::MessageType::BATCHPUTREMOVE_ID: case api::MessageType::REVERT_ID: case api::MessageType::REMOVELOCATION_ID: case api::MessageType::SETBUCKETSTATE_ID: diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp index bf0244255c1..e7323d07480 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp +++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp @@ -11,7 +11,6 @@ #include <vespa/storage/config/config-stor-server.h> #include <vespa/storage/persistence/bucketownershipnotifier.h> #include <vespa/storage/persistence/persistencethread.h> -#include <vespa/storageapi/message/batch.h> #include <vespa/storageapi/message/bucketsplitting.h> #include <vespa/storageapi/message/state.h> #include <vespa/vespalib/stllike/hash_map.hpp> @@ -325,16 +324,6 @@ FileStorManager::onRevert(const shared_ptr<api::RevertCommand>& cmd) } bool -FileStorManager::onBatchPutRemove(const std::shared_ptr<api::BatchPutRemoveCommand>& cmd) -{ - StorBucketDatabase::WrappedEntry entry(mapOperationToBucketAndDisk(*cmd, 0)); - if (entry.exist()) { - handlePersistenceMessage(cmd, entry->disk); - } - return true; -} - -bool FileStorManager::onRemoveLocation(const std::shared_ptr<api::RemoveLocationCommand>& cmd) { StorBucketDatabase::WrappedEntry entry(mapOperationToDisk(*cmd, cmd->getBucket())); diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.h b/storage/src/vespa/storage/persistence/filestorage/filestormanager.h index 4bf2c1049cf..5c52e6c6a23 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.h +++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.h @@ -151,7 +151,6 @@ private: bool onGet(const std::shared_ptr<api::GetCommand>&) override; bool onRemove(const std::shared_ptr<api::RemoveCommand>&) override; bool onRevert(const std::shared_ptr<api::RevertCommand>&) override; - bool onBatchPutRemove(const std::shared_ptr<api::BatchPutRemoveCommand>&) override; bool onStatBucket(const std::shared_ptr<api::StatBucketCommand>&) override; // Bucket operations diff --git a/storage/src/vespa/storage/storageserver/documentapiconverter.cpp b/storage/src/vespa/storage/storageserver/documentapiconverter.cpp index 99923b1c495..b6ac2a4b219 100644 --- a/storage/src/vespa/storage/storageserver/documentapiconverter.cpp +++ b/storage/src/vespa/storage/storageserver/documentapiconverter.cpp @@ -3,9 +3,9 @@ #include "documentapiconverter.h" #include "priorityconverter.h" #include <vespa/document/bucket/bucketidfactory.h> +#include <vespa/document/update/documentupdate.h> #include <vespa/documentapi/documentapi.h> #include <vespa/storage/common/bucket_resolver.h> -#include <vespa/storageapi/message/batch.h> #include <vespa/storageapi/message/datagram.h> #include <vespa/storageapi/message/documentsummary.h> #include <vespa/storageapi/message/persistence.h> |