diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2020-09-09 20:56:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-09 20:56:30 +0200 |
commit | 71e37c26157c1ff16e3d5474dd119ea61ac84627 (patch) | |
tree | 749cbc304ec1757ab0a5950250d01755fac1ee09 /searchcore | |
parent | 71051f2a92c3b79cc69b99e605bdd4b9b0e58fb8 (diff) |
Revert "Revert "Revert "Revert "Balder/group commits to tls 2 remaining rebased""""
Diffstat (limited to 'searchcore')
4 files changed, 12 insertions, 12 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp b/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp index 85644c2111a..348adf5bf41 100644 --- a/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp +++ b/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp @@ -17,7 +17,7 @@ TransLogServerMetrics::DomainMetrics::DomainMetrics(metrics::MetricSet *parent, { } -TransLogServerMetrics::DomainMetrics::~DomainMetrics() {} +TransLogServerMetrics::DomainMetrics::~DomainMetrics() = default; void TransLogServerMetrics::DomainMetrics::update(const DomainInfo &stats) @@ -66,7 +66,7 @@ TransLogServerMetrics::TransLogServerMetrics(metrics::MetricSet *parent) { } -TransLogServerMetrics::~TransLogServerMetrics() { } +TransLogServerMetrics::~TransLogServerMetrics() = default; void TransLogServerMetrics::update(const DomainStats &stats) diff --git a/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.h b/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.h index 830d643e93e..727b0c6304d 100644 --- a/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.h +++ b/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.h @@ -3,7 +3,7 @@ #pragma once #include <vespa/metrics/metrics.h> -#include <vespa/searchlib/transactionlog/domain.h> +#include <vespa/searchlib/transactionlog/domainconfig.h> namespace proton { diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp index b297dd860ea..c40f1263324 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp @@ -22,6 +22,7 @@ #include <vespa/searchcore/proton/summaryengine/docsum_by_slime.h> #include <vespa/searchcore/proton/matchengine/matchengine.h> #include <vespa/searchlib/transactionlog/trans_log_server_explorer.h> +#include <vespa/searchlib/transactionlog/translogserverapp.h> #include <vespa/searchlib/util/fileheadertk.h> #include <vespa/searchlib/common/packets.h> #include <vespa/document/base/exceptions.h> diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.h b/searchcore/src/vespa/searchcore/proton/server/proton.h index 6b561ad5deb..55fd3594463 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton.h +++ b/searchcore/src/vespa/searchcore/proton/server/proton.h @@ -19,7 +19,6 @@ #include <vespa/searchcore/proton/persistenceengine/persistenceengine.h> #include <vespa/searchlib/common/fileheadercontext.h> #include <vespa/searchlib/engine/monitorapi.h> -#include <vespa/searchlib/transactionlog/translogserverapp.h> #include <vespa/vespalib/net/component_config_producer.h> #include <vespa/vespalib/net/generic_state_handler.h> #include <vespa/vespalib/net/json_get_handler.h> @@ -31,7 +30,7 @@ #include <shared_mutex> namespace vespalib { class StateServer; } - +namespace search::transactionlog { class TransLogServerApp; } namespace proton { class DiskMemUsageSampler; @@ -52,12 +51,12 @@ class Proton : public IProtonConfigurerOwner, public vespalib::StateExplorer { private: - typedef search::transactionlog::TransLogServerApp TLS; - typedef search::engine::MonitorRequest MonitorRequest; - typedef search::engine::MonitorReply MonitorReply; - typedef search::engine::MonitorClient MonitorClient; - typedef std::map<DocTypeName, DocumentDB::SP> DocumentDBMap; - typedef BootstrapConfig::ProtonConfigSP ProtonConfigSP; + using TLS = search::transactionlog::TransLogServerApp; + using MonitorRequest = search::engine::MonitorRequest; + using MonitorReply = search::engine::MonitorReply; + using MonitorClient = search::engine::MonitorClient; + using DocumentDBMap = std::map<DocTypeName, DocumentDB::SP>; + using ProtonConfigSP = BootstrapConfig::ProtonConfigSP; using InitializeThreads = std::shared_ptr<vespalib::SyncableThreadExecutor>; using BucketSpace = document::BucketSpace; @@ -91,7 +90,7 @@ private: MetricsUpdateHook _metricsHook; std::unique_ptr<MetricsEngine> _metricsEngine; ProtonFileHeaderContext _fileHeaderContext; - TLS::UP _tls; + std::unique_ptr<TLS> _tls; std::unique_ptr<DiskMemUsageSampler> _diskMemUsageSampler; PersistenceEngine::UP _persistenceEngine; DocumentDBMap _documentDBMap; |