Skip to content
This repository has been archived by the owner on Mar 18, 2022. It is now read-only.

Add support for SUNION, SINTER and SDIFF commands #66

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions redisless/src/command/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ pub enum Command {
SAdd(Key, SetValues),
SCard(Key),
SRem(Key, SetValues),
SUnion(Keys),
SInter(Keys),
SDiff(Keys),
Del(Key),
Incr(Key),
IncrBy(Key, i64),
Expand Down Expand Up @@ -338,7 +341,45 @@ impl Command {
}
Ok(SRem(key, values_set))
}
b"SUNION" | b"SUnion" | b"Sunion" | b"sunion" => {
let keys = &v[1..];
if keys.is_empty() {
return Err(ArgNumber);
}

let mut keys_vec = Keys::with_capacity(keys.len());
for key in keys {
let key = get_bytes_vec(Some(key))?;
keys_vec.push(key);
}
Ok(SUnion(keys_vec))
}
b"SINTER" | b"SInter" | b"Sinter" | b"sinter" => {
let keys = &v[1..];
if keys.is_empty() {
return Err(ArgNumber);
}

let mut keys_vec = Keys::with_capacity(keys.len());
for key in keys {
let key = get_bytes_vec(Some(key))?;
keys_vec.push(key);
}
Ok(SInter(keys_vec))
}
b"SDIFF" | b"SDiff" | b"Sdiff" | b"sdiff" => {
let keys = &v[1..];
if keys.is_empty() {
return Err(ArgNumber);
}

let mut keys_vec = Keys::with_capacity(keys.len());
for key in keys {
let key = get_bytes_vec(Some(key))?;
keys_vec.push(key);
}
Ok(SDiff(keys_vec))
}
b"DEL" | b"del" | b"Del" => {
let key = get_bytes_vec(v.get(1))?;
Ok(Del(key))
Expand Down
21 changes: 21 additions & 0 deletions redisless/src/server/tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,27 @@ fn sadd_scard_srem() {
assert_eq!(server.stop(), Some(ServerState::Stopped));
}

#[test]
#[serial]
fn sunion_sinter_sdiff() {
let (server, mut con) = get_redis_client_connection(3358);
let values = &["val1", "val2", "val3", "val4"][..];
let values2 = &["val4", "val5", "val6"][..];
let values3 = &["val1", "val4", "val7"][..];
let _: i64 = con.sadd("setkey1", values).unwrap();
let _: i64 = con.sadd("setkey2", values2).unwrap();
let _: i64 = con.sadd("setkey3", values3).unwrap();
let keys = &["setkey1", "setkey2", "nokey", "setkey3"][..];

let x: Vec<String> = con.sunion(keys).unwrap();
assert_eq!(x.len(), 7);
let y: Vec<String> = con.sinter(keys).unwrap();
assert_eq!(y.len(), 1);
let z: Vec<String> = con.sdiff(keys).unwrap();
assert_eq!(z.len(), 2);
assert_eq!(server.stop(), Some(ServerState::Stopped));
}

#[test]
#[serial]
fn start_and_stop_server() {
Expand Down
90 changes: 90 additions & 0 deletions redisless/src/server/util/run_command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,96 @@ pub fn run_command_and_get_response<T: Storage>(
storage.swrite(&key, vals);
RedisResponse::single(Integer(rem))
}
Command::SUnion(keys_vec) => {
let mut storage = lock_then_release(storage);
let mut keys = vec![];
for key in keys_vec {
let keytype = storage.type_of(&key);
if keytype == "none".as_bytes() {
continue;
}
if keytype != "set".as_bytes() {
return RedisResponse::error(RedisCommandError::WrongTypeOperation);
}
keys.push(key.to_vec());
}
let mut responses = Vec::<RedisResponseType>::new();
if keys.is_empty() {
return RedisResponse::array(responses);
}
let mut result: HashSet<_> = storage.sread(&keys[0]).unwrap().to_owned();
let mut val: HashSet<_>;
keys.remove(0);
for key in keys {
val = storage.sread(&key).unwrap().to_owned();
result = result.union(&val).cloned().collect();
}
for elem in result {
let response = RedisResponseType::SimpleString(elem);
responses.push(response);
}
RedisResponse::array(responses)
}
Command::SInter(keys_vec) => {
let mut storage = lock_then_release(storage);
let mut keys = vec![];
for key in keys_vec {
let keytype = storage.type_of(&key);
if keytype == "none".as_bytes() {
continue;
}
if keytype != "set".as_bytes() {
return RedisResponse::error(RedisCommandError::WrongTypeOperation);
}
keys.push(key.to_vec());
}
let mut responses = Vec::<RedisResponseType>::new();
if keys.is_empty() {
return RedisResponse::array(responses);
}
let mut result: HashSet<_> = storage.sread(&keys[0]).unwrap().to_owned();
let mut val: HashSet<_>;
keys.remove(0);
for key in keys {
val = storage.sread(&key).unwrap().to_owned();
result = result.intersection(&val).cloned().collect();
}
for elem in result {
let response = RedisResponseType::SimpleString(elem);
responses.push(response);
}
RedisResponse::array(responses)
}
Command::SDiff(keys_vec) => {
let mut storage = lock_then_release(storage);
let mut keys = vec![];
for key in keys_vec {
let keytype = storage.type_of(&key);
if keytype == "none".as_bytes() {
continue;
}
if keytype != "set".as_bytes() {
return RedisResponse::error(RedisCommandError::WrongTypeOperation);
}
keys.push(key.to_vec());
}
let mut responses = Vec::<RedisResponseType>::new();
if keys.is_empty() {
return RedisResponse::array(responses);
}
let mut result: HashSet<_> = storage.sread(&keys[0]).unwrap().to_owned();
let mut val: HashSet<_>;
keys.remove(0);
for key in keys {
val = storage.sread(&key).unwrap().to_owned();
result = result.difference(&val).cloned().collect();
}
for elem in result {
let response = RedisResponseType::SimpleString(elem);
responses.push(response);
}
RedisResponse::array(responses)
}
Command::Del(k) => {
let d = lock_then_release(storage).remove(k.as_slice());
RedisResponse::single(Integer(d as i64))
Expand Down