From 7d0019515bfcd889c2579ce95cf093511b7ab516 Mon Sep 17 00:00:00 2001 From: Maksim Kita Date: Sat, 1 May 2021 15:00:37 +0300 Subject: [PATCH] XDBCBridgeHelper use global context --- src/Bridge/LibraryBridgeHelper.cpp | 4 ++-- src/Bridge/XDBCBridgeHelper.h | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Bridge/LibraryBridgeHelper.cpp b/src/Bridge/LibraryBridgeHelper.cpp index 0931abfdfc3..c589d0ce09e 100644 --- a/src/Bridge/LibraryBridgeHelper.cpp +++ b/src/Bridge/LibraryBridgeHelper.cpp @@ -24,11 +24,11 @@ LibraryBridgeHelper::LibraryBridgeHelper( ContextPtr context_, const Block & sample_block_, const Field & dictionary_id_) - : IBridgeHelper(context_) + : IBridgeHelper(context_->getGlobalContext()) , log(&Poco::Logger::get("LibraryBridgeHelper")) , sample_block(sample_block_) , config(context_->getConfigRef()) - , http_timeout(context_->getSettingsRef().http_receive_timeout.value) + , http_timeout(context_->getGlobalContext()->getSettingsRef().http_receive_timeout.value) , dictionary_id(dictionary_id_) { bridge_port = config.getUInt("library_bridge.port", DEFAULT_PORT); diff --git a/src/Bridge/XDBCBridgeHelper.h b/src/Bridge/XDBCBridgeHelper.h index 7dc7f91c87a..299df6ff888 100644 --- a/src/Bridge/XDBCBridgeHelper.h +++ b/src/Bridge/XDBCBridgeHelper.h @@ -62,20 +62,19 @@ public: static constexpr inline auto SCHEMA_ALLOWED_HANDLER = "/schema_allowed"; XDBCBridgeHelper( - ContextPtr global_context_, + ContextPtr context_, Poco::Timespan http_timeout_, const std::string & connection_string_) - : IXDBCBridgeHelper(global_context_) + : IXDBCBridgeHelper(context_->getGlobalContext()) , log(&Poco::Logger::get(BridgeHelperMixin::getName() + "BridgeHelper")) , connection_string(connection_string_) , http_timeout(http_timeout_) - , config(global_context_->getConfigRef()) + , config(context_->getGlobalContext()->getConfigRef()) { bridge_host = config.getString(BridgeHelperMixin::configPrefix() + ".host", DEFAULT_HOST); bridge_port = config.getUInt(BridgeHelperMixin::configPrefix() + ".port", DEFAULT_PORT); } - protected: auto getConnectionString() const { return connection_string; }