ISSUES-5436 try fix build failure & pvs & style

programs/server/HTTPHandlerFactory.cpp

@@ -23,13 +23,12 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int CANNOT_COMPILE_REGEXP;
-    extern const int NO_ELEMENTS_IN_CONFIG;
+    extern const int LOGICAL_ERROR;
     extern const int UNKNOWN_ELEMENT_IN_CONFIG;
 }
 
-HTTPRequestHandlerFactoryMain::HTTPRequestHandlerFactoryMain(IServer & server_, const std::string & name_)
-    : server(server_), log(&Logger::get(name_)), name(name_)
+HTTPRequestHandlerFactoryMain::HTTPRequestHandlerFactoryMain(const std::string & name_)
+    : log(&Logger::get(name_)), name(name_)
 {
 }
 
@@ -77,29 +76,37 @@ HTTPRequestHandlerFactoryMain::TThis * HTTPRequestHandlerFactoryMain::addHandler
 
 static inline auto createHandlersFactoryFromConfig(IServer & server, const std::string & name, const String & prefix)
 {
-    auto main_handler_factory = new HTTPRequestHandlerFactoryMain(server, name);
+    auto main_handler_factory = new HTTPRequestHandlerFactoryMain(name);
 
-    Poco::Util::AbstractConfiguration::Keys keys;
-    server.config().keys(prefix, keys);
-
-    for (const auto & key : keys)
+    try
     {
-        if (!startsWith(key, "routing_rule"))
-            throw Exception("Unknown element in config: " + prefix + "." + key + ", must be 'routing_rule'", ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG);
-
-        const auto & handler_type = server.config().getString(prefix + "." + key + ".handler.type", "");
-
-        if (handler_type == "static")
-            main_handler_factory->addHandler(createStaticHandlerFactory(server, prefix));
-        else if (handler_type == "dynamic_query_handler")
-            main_handler_factory->addHandler(createDynamicHandlerFactory(server, prefix));
-        else if (handler_type == "predefine_query_handler")
-            main_handler_factory->addHandler(createPredefineHandlerFactory(server, prefix));
-        else
-            throw Exception("Unknown element in config: " + prefix + "." + key + ", must be 'routing_rule'", ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG);
+        Poco::Util::AbstractConfiguration::Keys keys;
+        server.config().keys(prefix, keys);
+
+        for (const auto & key : keys)
+        {
+            if (!startsWith(key, "routing_rule"))
+                throw Exception("Unknown element in config: " + prefix + "." + key + ", must be 'routing_rule'", ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG);
+
+            const auto & handler_type = server.config().getString(prefix + "." + key + ".handler.type", "");
+
+            if (handler_type == "static")
+                main_handler_factory->addHandler(createStaticHandlerFactory(server, prefix));
+            else if (handler_type == "dynamic_query_handler")
+                main_handler_factory->addHandler(createDynamicHandlerFactory(server, prefix));
+            else if (handler_type == "predefine_query_handler")
+                main_handler_factory->addHandler(createPredefineHandlerFactory(server, prefix));
+            else
+                throw Exception("Unknown element in config: " + prefix + "." + key + ", must be 'routing_rule'", ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG);
+        }
+
+        return main_handler_factory;
+    }
+    catch (...)
+    {
+        delete main_handler_factory;
+        throw;
     }
-
-    return main_handler_factory;
 }
 
 static const auto ping_response_expression = "Ok.\n";
@@ -111,7 +118,7 @@ static inline Poco::Net::HTTPRequestHandlerFactory * createHTTPHandlerFactory(IS
         return createHandlersFactoryFromConfig(server, name, "routing_rules");
     else
     {
-        return (new HTTPRequestHandlerFactoryMain(server, name))
+        return (new HTTPRequestHandlerFactoryMain(name))
             ->addHandler((new RoutingRuleHTTPHandlerFactory<StaticRequestHandler>(server, root_response_expression))
                 ->attachStrictPath("/")->allowGetAndHeadRequest())
             ->addHandler((new RoutingRuleHTTPHandlerFactory<StaticRequestHandler>(server, ping_response_expression))
@@ -127,7 +134,7 @@ static inline Poco::Net::HTTPRequestHandlerFactory * createHTTPHandlerFactory(IS
 
 static inline Poco::Net::HTTPRequestHandlerFactory * createInterserverHTTPHandlerFactory(IServer & server, const std::string & name)
 {
-    return (new HTTPRequestHandlerFactoryMain(server, name))
+    return (new HTTPRequestHandlerFactoryMain(name))
         ->addHandler((new RoutingRuleHTTPHandlerFactory<StaticRequestHandler>(server, root_response_expression))
             ->attachStrictPath("/")->allowGetAndHeadRequest())
         ->addHandler((new RoutingRuleHTTPHandlerFactory<StaticRequestHandler>(server, ping_response_expression))

programs/server/HTTPHandlerFactory.h

@@ -16,7 +16,6 @@ class HTTPRequestHandlerFactoryMain : public Poco::Net::HTTPRequestHandlerFactor
 private:
     using TThis = HTTPRequestHandlerFactoryMain;
 
-    IServer & server;
     Logger * log;
     std::string name;
 
@@ -25,7 +24,7 @@ public:
 
     ~HTTPRequestHandlerFactoryMain();
 
-    HTTPRequestHandlerFactoryMain(IServer & server_, const std::string & name_);
+    HTTPRequestHandlerFactoryMain(const std::string & name_);
 
     TThis * addHandler(Poco::Net::HTTPRequestHandlerFactory * child_factory);
 

programs/server/Server.cpp

@@ -767,15 +767,9 @@ int Server::main(const std::vector<std::string> & /*args*/)
                 auto address = socket_bind_listen(socket, listen_host, port);
                 socket.setReceiveTimeout(settings.http_receive_timeout);
                 socket.setSendTimeout(settings.http_send_timeout);
-                auto handler_factory = createHandlerFactory(*this, "HTTPHandler-factory");
-//                if (config().has("prometheus") && config().getInt("prometheus.port", 0) == 0)
-//                    handler_factory->addHandler<PrometheusHandlerFactory>(async_metrics);
 
                 servers.emplace_back(std::make_unique<Poco::Net::HTTPServer>(
-                    handler_factory,
-                    server_pool,
-                    socket,
-                    http_params));
+                    createHandlerFactory(*this, "HTTPHandler-factory"), server_pool, socket, http_params));
 
                 LOG_INFO(log, "Listening for http://" + address.toString());
             });
@@ -789,10 +783,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
                 socket.setReceiveTimeout(settings.http_receive_timeout);
                 socket.setSendTimeout(settings.http_send_timeout);
                 servers.emplace_back(std::make_unique<Poco::Net::HTTPServer>(
-                    createHandlerFactory(*this, "HTTPSHandler-factory"),
-                    server_pool,
-                    socket,
-                    http_params));
+                    createHandlerFactory(*this, "HTTPSHandler-factory"), server_pool, socket, http_params));
 
                 LOG_INFO(log, "Listening for https://" + address.toString());
 #else
@@ -847,10 +838,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
                 socket.setReceiveTimeout(settings.http_receive_timeout);
                 socket.setSendTimeout(settings.http_send_timeout);
                 servers.emplace_back(std::make_unique<Poco::Net::HTTPServer>(
-                    createHandlerFactory(*this, "InterserverIOHTTPHandler-factory"),
-                    server_pool,
-                    socket,
-                    http_params));
+                    createHandlerFactory(*this, "InterserverIOHTTPHandler-factory"), server_pool, socket, http_params));
 
                 LOG_INFO(log, "Listening for replica communication (interserver): http://" + address.toString());
             });
@@ -863,10 +851,7 @@ int Server::main(const std::vector<std::string> & /*args*/)
                 socket.setReceiveTimeout(settings.http_receive_timeout);
                 socket.setSendTimeout(settings.http_send_timeout);
                 servers.emplace_back(std::make_unique<Poco::Net::HTTPServer>(
-                    createHandlerFactory(*this, "InterserverIOHTTPSHandler-factory"),
-                    server_pool,
-                    socket,
-                    http_params));
+                    createHandlerFactory(*this, "InterserverIOHTTPSHandler-factory"), server_pool, socket, http_params));
 
                 LOG_INFO(log, "Listening for secure replica communication (interserver): https://" + address.toString());
 #else