From 39d00826c3e7e30d59e6ca6d88eb3f36fb8358fd Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Fri, 27 Nov 2020 00:21:44 +0000 Subject: GC LoadTypeSet --- searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp | 5 +---- searchcore/src/apps/vespa-feed-bm/bm_message_bus.cpp | 7 +++---- searchcore/src/apps/vespa-feed-bm/bm_message_bus.h | 4 +--- .../src/apps/vespa-feed-bm/storage_api_rpc_bm_feed_handler.cpp | 4 +--- searchcore/src/apps/vespa-feed-bm/vespa_feed_bm.cpp | 9 +-------- 5 files changed, 7 insertions(+), 22 deletions(-) (limited to 'searchcore') 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 #include #include -#include #include #include #include @@ -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 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(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 document_type_repo, - const documentapi::LoadTypeSet& load_types) + std::shared_ptr document_type_repo) : _reply_handler(std::make_unique()), _message_bus(), _session() { mbus::RPCNetworkParams params(config_uri); mbus::ProtocolSet protocol_set; - protocol_set.add(std::make_shared(load_types, document_type_repo)); - protocol_set.add(std::make_shared(document_type_repo, load_types)); + protocol_set.add(std::make_shared(document_type_repo)); + protocol_set.add(std::make_shared(document_type_repo)); params.setIdentity(mbus::Identity("vespa-bm-client")); _message_bus = std::make_unique( 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 _session; public: BmMessageBus(const config::ConfigUri& config_uri, - std::shared_ptr document_type_repo, - const documentapi::LoadTypeSet& load_types); + std::shared_ptr document_type_repo); ~BmMessageBus(); uint32_t get_error_count() const; void send_msg(std::unique_ptr 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 #include -#include #include #include #include #include #include #include -#include using document::Document; using document::DocumentId; @@ -75,7 +73,7 @@ StorageApiRpcBmFeedHandler::StorageApiRpcBmFeedHandler(SharedRpcResources& share _storage_address(std::make_unique(&_Storage, distributor ? NodeType::DISTRIBUTOR : NodeType::STORAGE, 0)), _shared_rpc_resources(shared_rpc_resources_in), _message_dispatcher(std::make_unique()), - _message_codec_provider(std::make_unique(repo, std::make_shared())), + _message_codec_provider(std::make_unique(repo)), _rpc_client(std::make_unique(*_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 #include #include -#include #include #include #include @@ -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(config_uri, - _repo, - documentapi::LoadTypeSet()); + _message_bus = std::make_unique(config_uri, _repo); LOG(info, "Started message bus"); } -- cgit v1.2.3