Fix queries returning full responses

They should return groups instead
next
Sayan Nandan 3 years ago
parent 57bfeab4fa
commit ba0a67a179

@ -82,7 +82,7 @@ where
} }
if was_engine_error { if was_engine_error {
return con return con
.write_response(responses::fresp::R_SERVER_ERR.to_owned()) .write_response(responses::groups::SERVER_ERR.to_owned())
.await; .await;
} }
if engine_was_busy { if engine_was_busy {
@ -93,14 +93,12 @@ where
if let Some(succeeded) = snap_result { if let Some(succeeded) = snap_result {
if succeeded { if succeeded {
// Snapshotting succeeded, return Okay // Snapshotting succeeded, return Okay
return con return con.write_response(responses::groups::OKAY.to_owned()).await;
.write_response(responses::fresp::R_OKAY.to_owned())
.await;
} else { } else {
// Nope, something happened while creating a snapshot // Nope, something happened while creating a snapshot
// return a server error // return a server error
return con return con
.write_response(responses::fresp::R_SERVER_ERR.to_owned()) .write_response(responses::groups::SERVER_ERR.to_owned())
.await; .await;
} }
} else { } else {
@ -149,16 +147,14 @@ where
} }
if failed { if failed {
return con return con
.write_response(responses::fresp::R_SERVER_ERR.to_owned()) .write_response(responses::groups::SERVER_ERR.to_owned())
.await; .await;
} else { } else {
return con return con.write_response(responses::groups::OKAY.to_owned()).await;
.write_response(responses::fresp::R_OKAY.to_owned())
.await;
} }
} else { } else {
return con return con
.write_response(responses::fresp::R_ACTION_ERR.to_owned()) .write_response(responses::groups::ACTION_ERR.to_owned())
.await; .await;
} }
} }

@ -148,7 +148,9 @@ where
Err(ParseError::NotEnough) => (), Err(ParseError::NotEnough) => (),
Err(ParseError::DataTypeParseError) => return Ok(QueryResult::Wrongtype), Err(ParseError::DataTypeParseError) => return Ok(QueryResult::Wrongtype),
Err(ParseError::UnexpectedByte) | Err(ParseError::BadPacket) => { Err(ParseError::UnexpectedByte) | Err(ParseError::BadPacket) => {
return Ok(QueryResult::E(responses::fresp::R_PACKET_ERR.to_owned())); return Ok(QueryResult::E(
responses::full_responses::R_PACKET_ERR.to_owned(),
));
} }
Err(ParseError::UnknownDatatype) => { Err(ParseError::UnknownDatatype) => {
unimplemented!() unimplemented!()

@ -64,6 +64,6 @@ where
if let Some(done_howmany) = done_howmany { if let Some(done_howmany) = done_howmany {
con.write_response(done_howmany).await con.write_response(done_howmany).await
} else { } else {
con.write_response(&**responses::fresp::R_SERVER_ERR).await con.write_response(&**responses::groups::SERVER_ERR).await
} }
} }

@ -45,7 +45,7 @@ where
// An odd number of arguments means that the number of keys // An odd number of arguments means that the number of keys
// is not the same as the number of values, we won't run this // is not the same as the number of values, we won't run this
// action at all // action at all
return con.write_response(&**responses::fresp::R_ACTION_ERR).await; return con.write_response(&**responses::groups::ACTION_ERR).await;
} }
let mut kviter = act.into_iter().skip(1); let mut kviter = act.into_iter().skip(1);
let failed = { let failed = {
@ -62,7 +62,7 @@ where
} }
}; };
if failed { if failed {
con.write_response(&**responses::fresp::R_SERVER_ERR).await con.write_response(&**responses::groups::SERVER_ERR).await
} else { } else {
con.write_response(howmany / 2).await con.write_response(howmany / 2).await
} }

@ -61,7 +61,7 @@ pub mod groups {
} }
} }
pub mod fresp { pub mod full_responses {
//! # Pre-compiled **responses** //! # Pre-compiled **responses**
//! These are pre-compiled **complete** responses. This means that they should //! These are pre-compiled **complete** responses. This means that they should
//! be written off directly to the stream and should **not be preceded by any response metaframe** //! be written off directly to the stream and should **not be preceded by any response metaframe**

Loading…
Cancel
Save