diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-11-27 00:21:44 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-11-27 11:56:09 +0000 |
commit | 39d00826c3e7e30d59e6ca6d88eb3f36fb8358fd (patch) | |
tree | a7c3158fd574ec67ab32e66d7cd3ab58ebbdb2cc /searchcore/src/apps | |
parent | 989b8b5afa58dcbfa03e3999d75802ac6c70aa94 (diff) |
GC LoadTypeSet
Diffstat (limited to 'searchcore/src/apps')
5 files changed, 7 insertions, 22 deletions
diff --git a/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp b/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp index f034ccdd6d1..a842caef379 100644 --- a/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp +++ b/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp @@ -6,7 +6,6 @@ #include <vespa/document/document.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/documentapi/documentapi.h> -#include <vespa/documentapi/loadtypes/loadtypeset.h> #include <vespa/messagebus/destinationsession.h> #include <vespa/messagebus/protocolset.h> #include <vespa/messagebus/rpcmessagebus.h> @@ -47,7 +46,6 @@ public: class FeedHandler : public mbus::IMessageHandler { private: - documentapi::LoadTypeSet _loadTypes; mbus::RPCMessageBus _mbus; mbus::DestinationSession::UP _session; OutputFile &_idx; @@ -95,8 +93,7 @@ FeedHandler::handleMessage(mbus::Message::UP message) } FeedHandler::FeedHandler(std::shared_ptr<const document::DocumentTypeRepo> repo, OutputFile &idx, OutputFile &dat) - : _loadTypes(), - _mbus(mbus::MessageBusParams().addProtocol(mbus::IProtocol::SP(new documentapi::DocumentProtocol(_loadTypes, repo))), + : _mbus(mbus::MessageBusParams().addProtocol(std::make_shared<documentapi::DocumentProtocol>(repo)), mbus::RPCNetworkParams()), _session(_mbus.getMessageBus() .createDestinationSession(mbus::DestinationSessionParams() diff --git a/searchcore/src/apps/vespa-feed-bm/bm_message_bus.cpp b/searchcore/src/apps/vespa-feed-bm/bm_message_bus.cpp index ec50a4c7c01..b608593dada 100644 --- a/searchcore/src/apps/vespa-feed-bm/bm_message_bus.cpp +++ b/searchcore/src/apps/vespa-feed-bm/bm_message_bus.cpp @@ -129,16 +129,15 @@ BmMessageBus::ReplyHandler::message_aborted(uint64_t msg_id) } BmMessageBus::BmMessageBus(const config::ConfigUri& config_uri, - std::shared_ptr<const document::DocumentTypeRepo> document_type_repo, - const documentapi::LoadTypeSet& load_types) + std::shared_ptr<const document::DocumentTypeRepo> document_type_repo) : _reply_handler(std::make_unique<ReplyHandler>()), _message_bus(), _session() { mbus::RPCNetworkParams params(config_uri); mbus::ProtocolSet protocol_set; - protocol_set.add(std::make_shared<DocumentProtocol>(load_types, document_type_repo)); - protocol_set.add(std::make_shared<StorageProtocol>(document_type_repo, load_types)); + protocol_set.add(std::make_shared<DocumentProtocol>(document_type_repo)); + protocol_set.add(std::make_shared<StorageProtocol>(document_type_repo)); params.setIdentity(mbus::Identity("vespa-bm-client")); _message_bus = std::make_unique<mbus::RPCMessageBus>( protocol_set, diff --git a/searchcore/src/apps/vespa-feed-bm/bm_message_bus.h b/searchcore/src/apps/vespa-feed-bm/bm_message_bus.h index 9ebe394e9e6..a9cff1fb826 100644 --- a/searchcore/src/apps/vespa-feed-bm/bm_message_bus.h +++ b/searchcore/src/apps/vespa-feed-bm/bm_message_bus.h @@ -6,7 +6,6 @@ namespace config { class ConfigUri; } namespace document { class DocumentTypeRepo; } -namespace documentapi { class LoadTypeSet; } namespace mbus { @@ -32,8 +31,7 @@ class BmMessageBus std::unique_ptr<mbus::SourceSession> _session; public: BmMessageBus(const config::ConfigUri& config_uri, - std::shared_ptr<const document::DocumentTypeRepo> document_type_repo, - const documentapi::LoadTypeSet& load_types); + std::shared_ptr<const document::DocumentTypeRepo> document_type_repo); ~BmMessageBus(); uint32_t get_error_count() const; void send_msg(std::unique_ptr<mbus::Message> msg, const mbus::Route &route, PendingTracker &tracker); diff --git a/searchcore/src/apps/vespa-feed-bm/storage_api_rpc_bm_feed_handler.cpp b/searchcore/src/apps/vespa-feed-bm/storage_api_rpc_bm_feed_handler.cpp index 575cde3fe00..d37b6ee9f41 100644 --- a/searchcore/src/apps/vespa-feed-bm/storage_api_rpc_bm_feed_handler.cpp +++ b/searchcore/src/apps/vespa-feed-bm/storage_api_rpc_bm_feed_handler.cpp @@ -6,14 +6,12 @@ #include "storage_reply_error_checker.h" #include <vespa/document/fieldvalue/document.h> #include <vespa/document/update/documentupdate.h> -#include <vespa/documentapi/loadtypes/loadtypeset.h> #include <vespa/storageapi/messageapi/storagemessage.h> #include <vespa/storageapi/message/persistence.h> #include <vespa/storage/storageserver/message_dispatcher.h> #include <vespa/storage/storageserver/rpc/message_codec_provider.h> #include <vespa/storage/storageserver/rpc/shared_rpc_resources.h> #include <vespa/storage/storageserver/rpc/storage_api_rpc_service.h> -#include <cassert> using document::Document; using document::DocumentId; @@ -75,7 +73,7 @@ StorageApiRpcBmFeedHandler::StorageApiRpcBmFeedHandler(SharedRpcResources& share _storage_address(std::make_unique<StorageMessageAddress>(&_Storage, distributor ? NodeType::DISTRIBUTOR : NodeType::STORAGE, 0)), _shared_rpc_resources(shared_rpc_resources_in), _message_dispatcher(std::make_unique<MyMessageDispatcher>()), - _message_codec_provider(std::make_unique<storage::rpc::MessageCodecProvider>(repo, std::make_shared<documentapi::LoadTypeSet>())), + _message_codec_provider(std::make_unique<storage::rpc::MessageCodecProvider>(repo)), _rpc_client(std::make_unique<storage::rpc::StorageApiRpcService>(*_message_dispatcher, _shared_rpc_resources, *_message_codec_provider, rpc_params)) { } diff --git a/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp b/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp index a55638651d6..5532abcc8ba 100644 --- a/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp +++ b/searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp @@ -15,7 +15,6 @@ #include <vespa/config-bucketspaces.h> #include <vespa/config-imported-fields.h> #include <vespa/config-indexschema.h> -#include <vespa/config-load-type.h> #include <vespa/config-persistence.h> #include <vespa/config-rank-profiles.h> #include <vespa/config-slobroks.h> @@ -86,7 +85,6 @@ using namespace std::chrono_literals; using namespace vespa::config::search::core; using namespace vespa::config::search::summary; using namespace vespa::config::search; -using vespa::config::content::LoadTypeConfigBuilder; using vespa::config::content::PersistenceConfigBuilder; using vespa::config::content::StorDistributionConfigBuilder; using vespa::config::content::StorFilestorConfigBuilder; @@ -444,7 +442,6 @@ struct MyStorageConfig StorServerConfigBuilder stor_server; StorStatusConfigBuilder stor_status; BucketspacesConfigBuilder bucketspaces; - LoadTypeConfigBuilder load_type; MetricsmanagerConfigBuilder metricsmanager; SlobroksConfigBuilder slobroks; MessagebusConfigBuilder messagebus; @@ -462,7 +459,6 @@ struct MyStorageConfig stor_server(), stor_status(), bucketspaces(), - load_type(), metricsmanager(), slobroks(), messagebus() @@ -516,7 +512,6 @@ struct MyStorageConfig set.addBuilder(config_id, &stor_server); set.addBuilder(config_id, &stor_status); set.addBuilder(config_id, &bucketspaces); - set.addBuilder(config_id, &load_type); set.addBuilder(config_id, &metricsmanager); set.addBuilder(config_id, &slobroks); set.addBuilder(config_id, &messagebus); @@ -919,9 +914,7 @@ PersistenceProviderFixture::start_message_bus() { config::ConfigUri config_uri("bm-message-bus", _config_context); LOG(info, "Starting message bus"); - _message_bus = std::make_unique<BmMessageBus>(config_uri, - _repo, - documentapi::LoadTypeSet()); + _message_bus = std::make_unique<BmMessageBus>(config_uri, _repo); LOG(info, "Started message bus"); } |