thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 00:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed static std::string variable #2482

Browse Source
This commit is contained in:
Alexey Milovidov 2018-08-14 23:56:23 +03:00
parent 0415c9e34a
commit 9a78ee3e44
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/Common/ODBCBridgeHelper.cpp
View File

@ -6,10 +6,12 @@
#include <IO/ReadWriteBufferFromHTTP.h> #include <IO/ReadWriteBufferFromHTTP.h>
#include <Poco/Path.h> #include <Poco/Path.h>
#include <Poco/Util/AbstractConfiguration.h> #include <Poco/Util/AbstractConfiguration.h>
#include <Poco/Net/HTTPRequest.h>
#include <Common/ShellCommand.h> #include <Common/ShellCommand.h>
#include <common/logger_useful.h> #include <common/logger_useful.h>
#include <ext/range.h> #include <ext/range.h>
namespace DB namespace DB
{ {
namespace ErrorCodes namespace ErrorCodes
@ -73,7 +75,7 @@ bool ODBCBridgeHelper::checkODBCBridgeIsRunning() const
{ {
try try
{ {
ReadWriteBufferFromHTTP buf(ping_url, ODBCBridgeHelper::PING_METHOD, nullptr); ReadWriteBufferFromHTTP buf(ping_url, Poco::Net::HTTPRequest::HTTP_GET, nullptr);
return checkString(ODBCBridgeHelper::PING_OK_ANSWER, buf); return checkString(ODBCBridgeHelper::PING_OK_ANSWER, buf);
} }
catch (...) catch (...)

4
dbms/src/Common/ODBCBridgeHelper.h
View File

@ -2,7 +2,6 @@
#include <Interpreters/Context.h> #include <Interpreters/Context.h>
#include <Poco/Logger.h> #include <Poco/Logger.h>
#include <Poco/Net/HTTPRequest.h>
#include <Poco/URI.h> #include <Poco/URI.h>
namespace DB namespace DB
@ -33,9 +32,6 @@ public:
static constexpr inline auto MAIN_HANDLER = "/"; static constexpr inline auto MAIN_HANDLER = "/";
static constexpr inline auto PING_OK_ANSWER = "Ok."; static constexpr inline auto PING_OK_ANSWER = "Ok.";
static const inline std::string PING_METHOD = Poco::Net::HTTPRequest::HTTP_GET;
static const inline std::string MAIN_METHOD = Poco::Net::HTTPRequest::HTTP_POST;
ODBCBridgeHelper(const Context & context_global_, const std::string & connection_string_); ODBCBridgeHelper(const Context & context_global_, const std::string & connection_string_);
std::vector<std::pair<std::string, std::string>> getURLParams(const NamesAndTypesList & cols, size_t max_block_size) const; std::vector<std::pair<std::string, std::string>> getURLParams(const NamesAndTypesList & cols, size_t max_block_size) const;

3
dbms/src/Dictionaries/ODBCDictionarySource.cpp
View File

@ -3,6 +3,7 @@
#include <common/LocalDateTime.h> #include <common/LocalDateTime.h>
#include <Poco/Ext/SessionPoolHelpers.h> #include <Poco/Ext/SessionPoolHelpers.h>
#include <Poco/Util/AbstractConfiguration.h> #include <Poco/Util/AbstractConfiguration.h>
#include <Poco/Net/HTTPRequest.h>
#include <DataTypes/DataTypeString.h> #include <DataTypes/DataTypeString.h>
#include <Columns/ColumnString.h> #include <Columns/ColumnString.h>
#include <DataStreams/IProfilingBlockInputStream.h> #include <DataStreams/IProfilingBlockInputStream.h>
@ -28,7 +29,7 @@ namespace
size_t max_block_size, size_t max_block_size,
const ConnectionTimeouts & timeouts) const ConnectionTimeouts & timeouts)
{ {
read_buf = std::make_unique<ReadWriteBufferFromHTTP>(uri, ODBCBridgeHelper::MAIN_METHOD, callback, timeouts); read_buf = std::make_unique<ReadWriteBufferFromHTTP>(uri, Poco::Net::HTTPRequest::HTTP_POST, callback, timeouts);
reader = FormatFactory::instance().getInput(ODBCBridgeHelper::DEFAULT_FORMAT, *read_buf, sample_block, context, max_block_size); reader = FormatFactory::instance().getInput(ODBCBridgeHelper::DEFAULT_FORMAT, *read_buf, sample_block, context, max_block_size);
} }

2
dbms/src/Storages/StorageODBC.cpp
View File

@ -49,7 +49,7 @@ StorageODBC::StorageODBC(const std::string & table_name_,
std::string StorageODBC::getReadMethod() const std::string StorageODBC::getReadMethod() const
{ {
return ODBCBridgeHelper::MAIN_METHOD; return Poco::Net::HTTPRequest::HTTP_POST;
} }
std::vector<std::pair<std::string, std::string>> StorageODBC::getReadURIParams(const Names & column_names, std::vector<std::pair<std::string, std::string>> StorageODBC::getReadURIParams(const Names & column_names,