Skip to content

Commit 368283b

Browse files
committed
Pull from main and rebase
1 parent bb5eb32 commit 368283b

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

redis/benches/bench_basic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ fn bench_simple_getsetdel_async(b: &mut Bencher) {
3131
() = redis::cmd("SET")
3232
.arg(key)
3333
.arg(42)
34-
.query_async::<_, Option<Value>>(&mut con)
34+
.query_async(&mut con)
3535
.await?;
3636
let _: isize = redis::cmd("GET").arg(key).query_async(&mut con).await?;
3737
() = redis::cmd("DEL").arg(key).query_async(&mut con).await?;

redis/src/cluster_async/mod.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,12 +1287,7 @@ where
12871287
let mut nodes_to_delete = Vec::new();
12881288
let connections_container = inner.conn_lock.read().await;
12891289

1290-
let all_nodes_with_slots: HashSet<String> = connections_container
1291-
.slot_map
1292-
.addresses_for_all_nodes()
1293-
.iter()
1294-
.map(|addr| String::from(*addr))
1295-
.collect();
1290+
let all_nodes_with_slots = connections_container.slot_map.all_node_addresses();
12961291

12971292
connections_container
12981293
.all_node_connections()
@@ -1325,8 +1320,8 @@ where
13251320
addrs_to_refresh.extend(
13261321
all_nodes_with_slots
13271322
.iter()
1328-
.filter(|addr| !all_valid_conns.contains_key(*addr))
1329-
.cloned(),
1323+
.filter(|addr| !all_valid_conns.contains_key(addr.as_str()))
1324+
.map(|addr| addr.to_string()),
13301325
);
13311326

13321327
if !addrs_to_refresh.is_empty() {

0 commit comments

Comments
 (0)