TokenWithStrategy::new() optimisation + style enhancement

scylladb · Jan 22, 2023 · 81eea08 · 81eea08
1 parent f356b0e
commit 81eea08
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/scylla/src/transport/load_balancing/default.rs b/scylla/src/transport/load_balancing/default.rs
@@ -318,15 +318,10 @@ struct TokenWithStrategy<'a> {
 
 impl<'a> TokenWithStrategy<'a> {
     fn new(query: &'a QueryInfo, cluster: &'a ClusterData) -> Option<TokenWithStrategy<'a>> {
-        let keyspace = query
-            .keyspace
-            .and_then(|keyspace| cluster.get_keyspace_info().get(keyspace));
-        let strategy = keyspace.map(|keyspace| &keyspace.strategy);
-
-        if let (Some(token), Some(strategy)) = (query.token, strategy) {
-            return Some(TokenWithStrategy { strategy, token });
-        }
-
-        None
+        let token = query.token?;
+        let keyspace_name = query.keyspace?;
+        let keyspace = cluster.get_keyspace_info().get(keyspace_name)?;
+        let strategy = &keyspace.strategy;
+        Some(TokenWithStrategy { strategy, token })
     }
 }