Slightly more readable.

dbms/src/Interpreters/Cluster.cpp

@@ -149,7 +149,7 @@ Cluster::Address Cluster::Address::fromFullString(const String & full_string)
 
     const char * user_pw_end = strchr(full_string.data(), '@');
 
-    /// parsing with [shard{shard_index}[_replica{replica_index}]] format
+    /// parsing with the new [shard{shard_index}[_replica{replica_index}]] format
     if (!user_pw_end && startsWith(full_string, "shard"))
     {
         const char * underscore = strchr(full_string.data(), '_');
@@ -157,38 +157,45 @@ Cluster::Address Cluster::Address::fromFullString(const String & full_string)
         Address address;
         address.shard_index = parse<UInt32>(address_begin + 5);
         address.replica_index = underscore ? parse<UInt32>(underscore + 8) : 0;
+
         return address;
     }
-
-    /// parsing with old user[:password]@host:port#default_database format
-    Protocol::Secure secure = Protocol::Secure::Disable;
-    const char * secure_tag = "+secure";
-    if (endsWith(full_string, secure_tag))
+    else
     {
-        address_end -= strlen(secure_tag);
-        secure = Protocol::Secure::Enable;
-    }
+        /// parsing with the old user[:password]@host:port#default_database format
+        /// This format is appeared to be inconvenient for the following reasons:
+        /// - credentials are exposed in file name;
+        /// - the file name can be too long.
+
+        Protocol::Secure secure = Protocol::Secure::Disable;
+        const char * secure_tag = "+secure";
+        if (endsWith(full_string, secure_tag))
+        {
+            address_end -= strlen(secure_tag);
+            secure = Protocol::Secure::Enable;
+        }
 
-    const char * colon = strchr(full_string.data(), ':');
-    if (!user_pw_end || !colon)
-        throw Exception("Incorrect user[:password]@host:port#default_database format " + full_string, ErrorCodes::SYNTAX_ERROR);
-
-    const bool has_pw = colon < user_pw_end;
-    const char * host_end = has_pw ? strchr(user_pw_end + 1, ':') : colon;
-    if (!host_end)
-        throw Exception("Incorrect address '" + full_string + "', it does not contain port", ErrorCodes::SYNTAX_ERROR);
-
-    const char * has_db = strchr(full_string.data(), '#');
-    const char * port_end = has_db ? has_db : address_end;
-
-    Address address;
-    address.secure = secure;
-    address.port = parse<UInt16>(host_end + 1, port_end - (host_end + 1));
-    address.host_name = unescapeForFileName(std::string(user_pw_end + 1, host_end));
-    address.user = unescapeForFileName(std::string(address_begin, has_pw ? colon : user_pw_end));
-    address.password = has_pw ? unescapeForFileName(std::string(colon + 1, user_pw_end)) : std::string();
-    address.default_database = has_db ? unescapeForFileName(std::string(has_db + 1, address_end)) : std::string();
-    return address;
+        const char * colon = strchr(full_string.data(), ':');
+        if (!user_pw_end || !colon)
+            throw Exception("Incorrect user[:password]@host:port#default_database format " + full_string, ErrorCodes::SYNTAX_ERROR);
+
+        const bool has_pw = colon < user_pw_end;
+        const char * host_end = has_pw ? strchr(user_pw_end + 1, ':') : colon;
+        if (!host_end)
+            throw Exception("Incorrect address '" + full_string + "', it does not contain port", ErrorCodes::SYNTAX_ERROR);
+
+        const char * has_db = strchr(full_string.data(), '#');
+        const char * port_end = has_db ? has_db : address_end;
+
+        Address address;
+        address.secure = secure;
+        address.port = parse<UInt16>(host_end + 1, port_end - (host_end + 1));
+        address.host_name = unescapeForFileName(std::string(user_pw_end + 1, host_end));
+        address.user = unescapeForFileName(std::string(address_begin, has_pw ? colon : user_pw_end));
+        address.password = has_pw ? unescapeForFileName(std::string(colon + 1, user_pw_end)) : std::string();
+        address.default_database = has_db ? unescapeForFileName(std::string(has_db + 1, address_end)) : std::string();
+        return address;
+    }
 }