From aa1f27553e8619cdf355b78f90b65bf726e9aca5 Mon Sep 17 00:00:00 2001 From: proller Date: Fri, 1 Sep 2017 22:04:46 +0300 Subject: [PATCH] Header compile fixes --- .../AggregateFunctions/AggregateFunctionQuantileTiming.h | 7 ++++--- dbms/src/Common/TypeList.h | 4 ++++ dbms/src/Server/HTTPHandler.h | 4 +++- dbms/src/Server/TCPHandler.h | 3 ++- dbms/src/Server/TCPHandlerFactory.h | 6 +++--- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dbms/src/AggregateFunctions/AggregateFunctionQuantileTiming.h b/dbms/src/AggregateFunctions/AggregateFunctionQuantileTiming.h index d07c3a7fcca..86f9eaadf7f 100644 --- a/dbms/src/AggregateFunctions/AggregateFunctionQuantileTiming.h +++ b/dbms/src/AggregateFunctions/AggregateFunctionQuantileTiming.h @@ -21,14 +21,15 @@ #include + +namespace DB +{ + namespace ErrorCodes { extern const int LOGICAL_ERROR; } -namespace DB -{ - /** Calculates quantile for time in milliseconds, less than 30 seconds. * If the value is greater than 30 seconds, the value is set to 30 seconds. * diff --git a/dbms/src/Common/TypeList.h b/dbms/src/Common/TypeList.h index 8a683de74d8..ceb431a12bd 100644 --- a/dbms/src/Common/TypeList.h +++ b/dbms/src/Common/TypeList.h @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include + namespace DB { diff --git a/dbms/src/Server/HTTPHandler.h b/dbms/src/Server/HTTPHandler.h index 8ce4c8c489a..7a5bd656f9a 100644 --- a/dbms/src/Server/HTTPHandler.h +++ b/dbms/src/Server/HTTPHandler.h @@ -13,6 +13,8 @@ namespace CurrentMetrics extern const Metric HTTPConnection; } +namespace Poco { class Logger; } + namespace DB { @@ -52,7 +54,7 @@ private: }; IServer & server; - Logger * log; + Poco::Logger * log; CurrentMetrics::Increment metric_increment{CurrentMetrics::HTTPConnection}; diff --git a/dbms/src/Server/TCPHandler.h b/dbms/src/Server/TCPHandler.h index 575568a63f5..ba40ed30d97 100644 --- a/dbms/src/Server/TCPHandler.h +++ b/dbms/src/Server/TCPHandler.h @@ -18,6 +18,7 @@ namespace CurrentMetrics extern const Metric TCPConnection; } +namespace Poco { class Logger; } namespace DB { @@ -86,7 +87,7 @@ public: private: IServer & server; - Logger * log; + Poco::Logger * log; String client_name; UInt64 client_version_major = 0; diff --git a/dbms/src/Server/TCPHandlerFactory.h b/dbms/src/Server/TCPHandlerFactory.h index 9514a2deb3b..3abde2ef393 100644 --- a/dbms/src/Server/TCPHandlerFactory.h +++ b/dbms/src/Server/TCPHandlerFactory.h @@ -1,11 +1,11 @@ #pragma once #include - +#include #include "IServer.h" - #include "TCPHandler.h" +namespace Poco { class Logger; } namespace DB { @@ -14,7 +14,7 @@ class TCPHandlerFactory : public Poco::Net::TCPServerConnectionFactory { private: IServer & server; - Logger * log; + Poco::Logger * log; public: TCPHandlerFactory(IServer & server_)