Skip to content

refactor: group response tags, use let-else in proto handlers #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kacy merged 1 commit into from
Feb 14, 2026
Merged

refactor: group response tags, use let-else in proto handlers #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 20 additions & 30 deletions crates/ember-server/src/concurrent_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,14 +415,12 @@ async fn execute_concurrent(
// -- protobuf commands --
#[cfg(feature = "protobuf")]
Command::ProtoRegister { name, descriptor } => {
let registry = match _engine.schema_registry() {
Some(r) => r,
None => return Frame::Error("ERR protobuf support is not enabled".into()),
let Some(registry) = _engine.schema_registry() else {
return Frame::Error("ERR protobuf support is not enabled".into());
};
let result = {
let mut reg = match registry.write() {
Ok(r) => r,
Err(_) => return Frame::Error("ERR schema registry lock poisoned".into()),
let Ok(mut reg) = registry.write() else {
return Frame::Error("ERR schema registry lock poisoned".into());
};
reg.register(name.clone(), descriptor.clone())
};
Expand Down Expand Up @@ -457,14 +455,12 @@ async fn execute_concurrent(
nx,
xx,
} => {
let registry = match _engine.schema_registry() {
Some(r) => r,
None => return Frame::Error("ERR protobuf support is not enabled".into()),
let Some(registry) = _engine.schema_registry() else {
return Frame::Error("ERR protobuf support is not enabled".into());
};
{
let reg = match registry.read() {
Ok(r) => r,
Err(_) => return Frame::Error("ERR schema registry lock poisoned".into()),
let Ok(reg) = registry.read() else {
return Frame::Error("ERR schema registry lock poisoned".into());
};
if let Err(e) = reg.validate(&type_name, &data) {
return Frame::Error(format!("ERR {e}"));
Expand Down Expand Up @@ -533,13 +529,11 @@ async fn execute_concurrent(

#[cfg(feature = "protobuf")]
Command::ProtoSchemas => {
let registry = match _engine.schema_registry() {
Some(r) => r,
None => return Frame::Error("ERR protobuf support is not enabled".into()),
let Some(registry) = _engine.schema_registry() else {
return Frame::Error("ERR protobuf support is not enabled".into());
};
let reg = match registry.read() {
Ok(r) => r,
Err(_) => return Frame::Error("ERR schema registry lock poisoned".into()),
let Ok(reg) = registry.read() else {
return Frame::Error("ERR schema registry lock poisoned".into());
};
let names = reg.schema_names();
Frame::Array(
Expand All @@ -552,13 +546,11 @@ async fn execute_concurrent(

#[cfg(feature = "protobuf")]
Command::ProtoDescribe { name } => {
let registry = match _engine.schema_registry() {
Some(r) => r,
None => return Frame::Error("ERR protobuf support is not enabled".into()),
let Some(registry) = _engine.schema_registry() else {
return Frame::Error("ERR protobuf support is not enabled".into());
};
let reg = match registry.read() {
Ok(r) => r,
Err(_) => return Frame::Error("ERR schema registry lock poisoned".into()),
let Ok(reg) = registry.read() else {
return Frame::Error("ERR schema registry lock poisoned".into());
};
match reg.describe(&name) {
Some(types) => Frame::Array(
Expand All @@ -573,16 +565,14 @@ async fn execute_concurrent(

#[cfg(feature = "protobuf")]
Command::ProtoGetField { key, field_path } => {
let registry = match _engine.schema_registry() {
Some(r) => r,
None => return Frame::Error("ERR protobuf support is not enabled".into()),
let Some(registry) = _engine.schema_registry() else {
return Frame::Error("ERR protobuf support is not enabled".into());
};
let req = ember_core::ShardRequest::ProtoGet { key: key.clone() };
match _engine.route(&key, req).await {
Ok(ember_core::ShardResponse::ProtoValue(Some((type_name, data, _ttl)))) => {
let reg = match registry.read() {
Ok(r) => r,
Err(_) => return Frame::Error("ERR schema registry lock poisoned".into()),
let Ok(reg) = registry.read() else {
return Frame::Error("ERR schema registry lock poisoned".into());
};
match reg.get_field(&type_name, &data, &field_path) {
Ok(frame) => frame,
Expand Down
88 changes: 50 additions & 38 deletions crates/ember-server/src/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,22 +1248,38 @@ async fn resolve_response(
/// Converts a `ShardResponse` to a `Frame` based on the response tag.
fn resolve_shard_response(resp: ShardResponse, tag: ResponseTag) -> Frame {
match tag {
ResponseTag::Get => match resp {
// Value(Some(String)) → Bulk, Value(None) → Null
ResponseTag::Get
| ResponseTag::PopResult
| ResponseTag::HGetResult => match resp {
ShardResponse::Value(Some(Value::String(data))) => Frame::Bulk(data),
ShardResponse::Value(None) => Frame::Null,
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

// Ok → Simple("OK"), with optional Null/OOM
ResponseTag::Set => match resp {
ShardResponse::Ok => Frame::Simple("OK".into()),
ShardResponse::Value(None) => Frame::Null,
ShardResponse::OutOfMemory => oom_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

// Bool → Integer(0/1), no type check
ResponseTag::BoolToInt => match resp {
ShardResponse::Bool(b) => Frame::Integer(i64::from(b)),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

// Bool → Integer(0/1), with WrongType
ResponseTag::HExistsResult
| ResponseTag::SIsMemberResult => match resp {
ShardResponse::Bool(b) => Frame::Integer(i64::from(b)),
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

ResponseTag::Ttl => match resp {
ShardResponse::Ttl(TtlResult::Seconds(s)) => Frame::Integer(s as i64),
ShardResponse::Ttl(TtlResult::NoExpiry) => Frame::Integer(-1),
Expand All @@ -1276,71 +1292,82 @@ fn resolve_shard_response(resp: ShardResponse, tag: ResponseTag) -> Frame {
ShardResponse::Ttl(TtlResult::NotFound) => Frame::Integer(-2),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

// Integer → Integer, with WrongType/OOM/Err
ResponseTag::IntResult => match resp {
ShardResponse::Integer(n) => Frame::Integer(n),
ShardResponse::WrongType => wrongtype_error(),
ShardResponse::OutOfMemory => oom_error(),
ShardResponse::Err(msg) => Frame::Error(msg),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

// Len → Integer, with WrongType only
ResponseTag::LenResult => match resp {
ShardResponse::Len(n) => Frame::Integer(n as i64),
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},
ResponseTag::LenResultOom => match resp {

// Len → Integer, with WrongType + OOM
ResponseTag::LenResultOom
| ResponseTag::HSetResult => match resp {
ShardResponse::Len(n) => Frame::Integer(n as i64),
ShardResponse::WrongType => wrongtype_error(),
ShardResponse::OutOfMemory => oom_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

ResponseTag::FloatResult => match resp {
ShardResponse::BulkString(val) => Frame::Bulk(Bytes::from(val)),
ShardResponse::WrongType => wrongtype_error(),
ShardResponse::OutOfMemory => oom_error(),
ShardResponse::Err(msg) => Frame::Error(msg),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},
ResponseTag::PopResult => match resp {
ShardResponse::Value(Some(Value::String(data))) => Frame::Bulk(data),
ShardResponse::Value(None) => Frame::Null,
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},
ResponseTag::ArrayResult => match resp {

// Array of Bytes → Array of Bulk
ResponseTag::ArrayResult
| ResponseTag::HValsResult => match resp {
ShardResponse::Array(items) => {
Frame::Array(items.into_iter().map(Frame::Bulk).collect())
}
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

ResponseTag::TypeResult => match resp {
ShardResponse::TypeName(name) => Frame::Simple(name.into()),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

ResponseTag::ZAddResult => match resp {
ShardResponse::ZAddLen { count, .. } => Frame::Integer(count as i64),
ShardResponse::WrongType => wrongtype_error(),
ShardResponse::OutOfMemory => oom_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

ResponseTag::ZRemResult => match resp {
ShardResponse::ZRemLen { count, .. } => Frame::Integer(count as i64),
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

ResponseTag::ZScoreResult => match resp {
ShardResponse::Score(Some(s)) => Frame::Bulk(Bytes::from(format!("{s}"))),
ShardResponse::Score(None) => Frame::Null,
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

ResponseTag::ZRankResult => match resp {
ShardResponse::Rank(Some(r)) => Frame::Integer(r as i64),
ShardResponse::Rank(None) => Frame::Null,
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

ResponseTag::ZRangeResult { with_scores } => match resp {
ShardResponse::ScoredArray(items) => {
let mut frames = Vec::new();
Expand All @@ -1355,18 +1382,7 @@ fn resolve_shard_response(resp: ShardResponse, tag: ResponseTag) -> Frame {
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},
ResponseTag::HSetResult => match resp {
ShardResponse::Len(n) => Frame::Integer(n as i64),
ShardResponse::WrongType => wrongtype_error(),
ShardResponse::OutOfMemory => oom_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},
ResponseTag::HGetResult => match resp {
ShardResponse::Value(Some(Value::String(data))) => Frame::Bulk(data),
ShardResponse::Value(None) => Frame::Null,
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

ResponseTag::HGetAllResult => match resp {
ShardResponse::HashFields(fields) => {
let mut frames = Vec::with_capacity(fields.len() * 2);
Expand All @@ -1379,23 +1395,23 @@ fn resolve_shard_response(resp: ShardResponse, tag: ResponseTag) -> Frame {
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

ResponseTag::HDelResult => match resp {
ShardResponse::HDelLen { count, .. } => Frame::Integer(count as i64),
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},
ResponseTag::HExistsResult => match resp {
ShardResponse::Bool(b) => Frame::Integer(if b { 1 } else { 0 }),
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

// Integer → Integer, with WrongType/OOM and prefixed Err
ResponseTag::HIncrByResult => match resp {
ShardResponse::Integer(n) => Frame::Integer(n),
ShardResponse::WrongType => wrongtype_error(),
ShardResponse::OutOfMemory => oom_error(),
ShardResponse::Err(msg) => Frame::Error(format!("ERR {msg}")),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

// StringArray → Array of Bulk
ResponseTag::StringArrayResult => match resp {
ShardResponse::StringArray(items) => Frame::Array(
items
Expand All @@ -1406,11 +1422,7 @@ fn resolve_shard_response(resp: ShardResponse, tag: ResponseTag) -> Frame {
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},
ResponseTag::HValsResult => match resp {
ShardResponse::Array(vals) => Frame::Array(vals.into_iter().map(Frame::Bulk).collect()),
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

ResponseTag::HMGetResult => match resp {
ShardResponse::OptionalArray(vals) => Frame::Array(
vals.into_iter()
Expand All @@ -1423,19 +1435,17 @@ fn resolve_shard_response(resp: ShardResponse, tag: ResponseTag) -> Frame {
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},
ResponseTag::SIsMemberResult => match resp {
ShardResponse::Bool(b) => Frame::Integer(if b { 1 } else { 0 }),
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

ResponseTag::RenameResult => match resp {
ShardResponse::Ok => Frame::Simple("OK".into()),
ShardResponse::Err(msg) => Frame::Error(msg),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

// -- vector commands --
#[cfg(feature = "vector")]
ResponseTag::VAddResult => match resp {
ShardResponse::VAddResult { added, .. } => Frame::Integer(if added { 1 } else { 0 }),
ShardResponse::VAddResult { added, .. } => Frame::Integer(i64::from(added)),
ShardResponse::WrongType => wrongtype_error(),
ShardResponse::OutOfMemory => oom_error(),
ShardResponse::Err(msg) => Frame::Error(format!("ERR {msg}")),
Expand All @@ -1458,7 +1468,7 @@ fn resolve_shard_response(resp: ShardResponse, tag: ResponseTag) -> Frame {
},
#[cfg(feature = "vector")]
ResponseTag::VRemResult => match resp {
ShardResponse::Bool(removed) => Frame::Integer(if removed { 1 } else { 0 }),
ShardResponse::Bool(removed) => Frame::Integer(i64::from(removed)),
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},
Expand Down Expand Up @@ -1494,6 +1504,8 @@ fn resolve_shard_response(resp: ShardResponse, tag: ResponseTag) -> Frame {
ShardResponse::WrongType => wrongtype_error(),
other => Frame::Error(format!("ERR unexpected shard response: {other:?}")),
},

// -- protobuf commands --
#[cfg(feature = "protobuf")]
ResponseTag::ProtoSetResult => match resp {
ShardResponse::Ok => Frame::Simple("OK".into()),
Expand Down
Loading