Fix error with IPv6 in host param and impove HostPort reading from input stream

Author: df530

programs/client/Client.cpp

@@ -482,10 +482,6 @@ catch (...)
 
 void Client::connect()
 {
-    for (auto host_port : hosts_ports)
-    {
-        DB::DNSResolver::instance().resolveHost(host_port.host);
-    }
     UInt16 default_port = ConnectionParameters::getPortFromConfig(config());
     connection_parameters = ConnectionParameters(config(), hosts_ports[0].host,
                                                  hosts_ports[0].port.value_or(default_port));

src/Client/ClientBase.h

@@ -5,6 +5,7 @@
 #include <Common/InterruptListener.h>
 #include <Common/ShellCommand.h>
 #include <Common/Stopwatch.h>
+#include <Common/DNSResolver.h>
 #include <Core/ExternalTable.h>
 #include <Poco/Util/Application.h>
 #include <Interpreters/Context.h>
@@ -239,20 +240,27 @@ class ClientBase : public Poco::Util::Application, public IHints<2, ClientBase>
     struct HostPort
     {
         String host;
-        std::optional<int> port{};
+        std::optional<UInt16> port{};
         friend std::istream & operator>>(std::istream & in, HostPort & hostPort)
         {
             String host_with_port;
-            String delimiter = ":";
             in >> host_with_port;
-            size_t delimiter_pos = host_with_port.find(delimiter);
-            if (delimiter_pos != String::npos)
+            DB::DNSResolver & resolver = DB::DNSResolver::instance();
+            try
             {
-                hostPort.host = host_with_port.substr(0, delimiter_pos);
-                hostPort.port = boost::lexical_cast<uint>(host_with_port.substr(delimiter_pos + 1, host_with_port.length()));
+                Poco::Net::SocketAddress address = resolver.resolveAddress(host_with_port);
+                hostPort.host = address.host().toString();
+                hostPort.port = address.port();
+            }
+            catch (const Exception & e)
+            {
+                if (e.message() == "Missing port number") {
+                    hostPort.host = resolver.resolveHost(host_with_port).toString();
+                    hostPort.port = std::nullopt;
+                    return in;
+                }
+                throw;
             }
-            else
-                hostPort.host = host_with_port;
             return in;
         }
     };