Skip to content

Commit

Permalink
add tests for weights in zunionstore and zinterstore
Browse files Browse the repository at this point in the history
  • Loading branch information
@ndd7xv
ndd7xv committed Jul 5, 2022
1 parent cac63b5 commit 3eb9de5
Show file tree
Hide file tree
Showing 2 changed files with 119 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/commands.rs
View file
Expand Up @@ -820,23 +820,23 @@ implement_commands! {
/// multiplication factor for each sorted set by pairing one with each key
/// in a tuple.
fn zinterstore_weights<K: ToRedisArgs, W: ToRedisArgs>(dstkey: K, keys: &'a [(K, W)]) {
let (keys, weights): (Vec<&K>, Vec<&W>) = keys.iter().map( | (key, weight) | { (key, weight) } ).unzip();
let (keys, weights): (Vec<&K>, Vec<&W>) = keys.iter().map(|(key, weight)| (key, weight)).unzip();
cmd("ZINTERSTORE").arg(dstkey).arg(keys.len()).arg(keys).arg("WEIGHTS").arg(weights)
}

/// [`Commands::zinterstore_min`], but with the ability to specify a
/// multiplication factor for each sorted set by pairing one with each key
/// in a tuple.
fn zinterstore_min_weights<K: ToRedisArgs, W: ToRedisArgs>(dstkey: K, keys: &'a [(K, W)]) {
let (keys, weights): (Vec<&K>, Vec<&W>) = keys.iter().map( | (key, weight) | { (key, weight) } ).unzip();
let (keys, weights): (Vec<&K>, Vec<&W>) = keys.iter().map(|(key, weight)| (key, weight)).unzip();
cmd("ZINTERSTORE").arg(dstkey).arg(keys.len()).arg(keys).arg("AGGREGATE").arg("MIN").arg("WEIGHTS").arg(weights)
}

/// [`Commands::zinterstore_max`], but with the ability to specify a
/// multiplication factor for each sorted set by pairing one with each key
/// in a tuple.
fn zinterstore_max_weights<K: ToRedisArgs, W: ToRedisArgs>(dstkey: K, keys: &'a [(K, W)]) {
let (keys, weights): (Vec<&K>, Vec<&W>) = keys.iter().map( | (key, weight) | { (key, weight) } ).unzip();
let (keys, weights): (Vec<&K>, Vec<&W>) = keys.iter().map(|(key, weight)| (key, weight)).unzip();
cmd("ZINTERSTORE").arg(dstkey).arg(keys.len()).arg(keys).arg("AGGREGATE").arg("MAX").arg("WEIGHTS").arg(weights)
}

Expand Down Expand Up @@ -1031,23 +1031,23 @@ implement_commands! {
/// multiplication factor for each sorted set by pairing one with each key
/// in a tuple.
fn zunionstore_weights<K: ToRedisArgs, W: ToRedisArgs>(dstkey: K, keys: &'a [(K, W)]) {
let (keys, weights): (Vec<&K>, Vec<&W>) = keys.iter().map( | (key, weight) | { (key, weight) } ).unzip();
let (keys, weights): (Vec<&K>, Vec<&W>) = keys.iter().map(|(key, weight)| (key, weight)).unzip();
cmd("ZUNIONSTORE").arg(dstkey).arg(keys.len()).arg(keys).arg("WEIGHTS").arg(weights)
}

/// [`Commands::zunionstore_min`], but with the ability to specify a
/// multiplication factor for each sorted set by pairing one with each key
/// in a tuple.
fn zunionstore_min_weights<K: ToRedisArgs, W: ToRedisArgs>(dstkey: K, keys: &'a [(K, W)]) {
let (keys, weights): (Vec<&K>, Vec<&W>) = keys.iter().map( | (key, weight) | { (key, weight) } ).unzip();
let (keys, weights): (Vec<&K>, Vec<&W>) = keys.iter().map(|(key, weight)| (key, weight)).unzip();
cmd("ZUNIONSTORE").arg(dstkey).arg(keys.len()).arg(keys).arg("AGGREGATE").arg("MIN").arg("WEIGHTS").arg(weights)
}

/// [`Commands::zunionstore_max`], but with the ability to specify a
/// multiplication factor for each sorted set by pairing one with each key
/// in a tuple.
fn zunionstore_max_weights<K: ToRedisArgs, W: ToRedisArgs>(dstkey: K, keys: &'a [(K, W)]) {
let (keys, weights): (Vec<&K>, Vec<&W>) = keys.iter().map( | (key, weight) | { (key, weight) } ).unzip();
let (keys, weights): (Vec<&K>, Vec<&W>) = keys.iter().map(|(key, weight)| (key, weight)).unzip();
cmd("ZUNIONSTORE").arg(dstkey).arg(keys.len()).arg(keys).arg("AGGREGATE").arg("MAX").arg("WEIGHTS").arg(weights)
}

Expand Down
113 changes: 113 additions & 0 deletions tests/test_basic.rs
View file
Expand Up @@ -921,6 +921,119 @@ fn test_redis_server_down() {
assert!(!con.is_open());
}

#[test]
fn test_zinterstore_weights() {
let ctx = TestContext::new();
let mut con = ctx.connection();

let _: () = con
.zadd_multiple("zset1", &[(1, "one"), (2, "two"), (4, "four")])
.unwrap();
let _: () = con
.zadd_multiple("zset2", &[(1, "one"), (2, "two"), (3, "three")])
.unwrap();

// zinterstore_weights
assert_eq!(
con.zinterstore_weights("out", &[("zset1", 2), ("zset2", 3)]),
Ok(2)
);

assert_eq!(
con.zrange_withscores("out", 0, -1),
Ok(vec![
("one".to_string(), "5".to_string()),
("two".to_string(), "10".to_string())
])
);

// zinterstore_min_weights
assert_eq!(
con.zinterstore_min_weights("out", &[("zset1", 2), ("zset2", 3)]),
Ok(2)
);

assert_eq!(
con.zrange_withscores("out", 0, -1),
Ok(vec![
("one".to_string(), "2".to_string()),
("two".to_string(), "4".to_string()),
])
);

// zinterstore_max_weights
assert_eq!(
con.zinterstore_max_weights("out", &[("zset1", 2), ("zset2", 3)]),
Ok(2)
);

assert_eq!(
con.zrange_withscores("out", 0, -1),
Ok(vec![
("one".to_string(), "3".to_string()),
("two".to_string(), "6".to_string()),
])
);
}

#[test]
fn test_zunionstore_weights() {
let ctx = TestContext::new();
let mut con = ctx.connection();

let _: () = con
.zadd_multiple("zset1", &[(1, "one"), (2, "two")])
.unwrap();
let _: () = con
.zadd_multiple("zset2", &[(1, "one"), (2, "two"), (3, "three")])
.unwrap();

// zunionstore_weights
assert_eq!(
con.zunionstore_weights("out", &[("zset1", 2), ("zset2", 3)]),
Ok(3)
);

assert_eq!(
con.zrange_withscores("out", 0, -1),
Ok(vec![
("one".to_string(), "5".to_string()),
("three".to_string(), "9".to_string()),
("two".to_string(), "10".to_string())
])
);

// zunionstore_min_weights
assert_eq!(
con.zunionstore_min_weights("out", &[("zset1", 2), ("zset2", 3)]),
Ok(3)
);

assert_eq!(
con.zrange_withscores("out", 0, -1),
Ok(vec![
("one".to_string(), "2".to_string()),
("two".to_string(), "4".to_string()),
("three".to_string(), "9".to_string())
])
);

// zunionstore_max_weights
assert_eq!(
con.zunionstore_max_weights("out", &[("zset1", 2), ("zset2", 3)]),
Ok(3)
);

assert_eq!(
con.zrange_withscores("out", 0, -1),
Ok(vec![
("one".to_string(), "3".to_string()),
("two".to_string(), "6".to_string()),
("three".to_string(), "9".to_string())
])
);
}

#[test]
fn test_zrembylex() {
let ctx = TestContext::new();
Expand Down

0 comments on commit 3eb9de5

Please sign in to comment.