cluster: move connect to main impl

cluster: use modified connect method

Author: 0xWOF

redis/src/cluster.rs

@@ -227,7 +227,7 @@ impl ClusterConnection {
                 _ => panic!("No reach."),
             };
 
-            if let Ok(mut conn) = connect(
+            if let Ok(mut conn) = Self::connect(
                 info.clone(),
                 read_from_replicas,
                 username.clone(),
@@ -281,7 +281,7 @@ impl ClusterConnection {
                     }
                 }
 
-                if let Ok(mut conn) = connect(
+                if let Ok(mut conn) = Self::connect(
                     addr.as_ref(),
                     self.read_from_replicas,
                     self.username.clone(),
@@ -359,6 +359,28 @@ impl ClusterConnection {
         }
     }
 
+    fn connect<T: IntoConnectionInfo>(
+        info: T,
+        read_from_replicas: bool,
+        username: Option<String>,
+        password: Option<String>,
+    ) -> RedisResult<Connection>
+    where
+        T: std::fmt::Debug,
+    {
+        let mut connection_info = info.into_connection_info()?;
+        connection_info.redis.username = username;
+        connection_info.redis.password = password;
+        let client = super::Client::open(connection_info)?;
+
+        let mut conn = client.get_connection()?;
+        if read_from_replicas {
+            // If READONLY is sent to primary nodes, it will have no effect
+            cmd("READONLY").query(&mut conn)?;
+        }
+        Ok(conn)
+    }
+
     fn get_connection<'a>(
         &self,
         connections: &'a mut HashMap<String, Connection>,
@@ -388,7 +410,7 @@ impl ClusterConnection {
         } else {
             // Create new connection.
             // TODO: error handling
-            let conn = connect(
+            let conn = Self::connect(
                 addr,
                 self.read_from_replicas,
                 self.username.clone(),
@@ -723,28 +745,6 @@ impl ConnectionLike for ClusterConnection {
     }
 }
 
-fn connect<T: IntoConnectionInfo>(
-    info: T,
-    read_from_replicas: bool,
-    username: Option<String>,
-    password: Option<String>,
-) -> RedisResult<Connection>
-where
-    T: std::fmt::Debug,
-{
-    let mut connection_info = info.into_connection_info()?;
-    connection_info.redis.username = username;
-    connection_info.redis.password = password;
-    let client = super::Client::open(connection_info)?;
-
-    let mut con = client.get_connection()?;
-    if read_from_replicas {
-        // If READONLY is sent to primary nodes, it will have no effect
-        cmd("READONLY").query(&mut con)?;
-    }
-    Ok(con)
-}
-
 fn get_random_connection<'a>(
     connections: &'a mut HashMap<String, Connection>,
     excludes: Option<&'a HashSet<String>>,