Skip to content
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

Only allocate command name if required. #707

Merged
merged 1 commit into from
Dec 20, 2023
Merged

Only allocate command name if required. #707

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
33 changes: 18 additions & 15 deletions babushka-core/src/socket_listener.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,12 +408,18 @@ fn get_slot_addr(slot_type: &protobuf::EnumOrUnknown<SlotTypes>) -> ClientUsageR

fn get_route(
route: Option<Box<Routes>>,
response_policy: Option<ResponsePolicy>,
cmd: Option<&Cmd>,
) -> ClientUsageResult<Option<RoutingInfo>> {
use crate::redis_request::routes::Value;
let Some(route) = route.and_then(|route| route.value) else {
return Ok(None);
};
let get_response_policy = |cmd: Option<&Cmd>| {
cmd.and_then(|cmd| {
cmd.command()
.and_then(|cmd| ResponsePolicy::for_command(&cmd))
})
};
match route {
Value::SimpleRoutes(simple_route) => {
let simple_route = simple_route.enum_value().map_err(|id| {
Expand All @@ -424,11 +430,14 @@ fn get_route(
match simple_route {
crate::redis_request::SimpleRoutes::AllNodes => Ok(Some(RoutingInfo::MultiNode((
MultipleNodeRoutingInfo::AllNodes,
response_policy,
get_response_policy(cmd),
)))),
crate::redis_request::SimpleRoutes::AllPrimaries => Ok(Some(
RoutingInfo::MultiNode((MultipleNodeRoutingInfo::AllMasters, response_policy)),
)),
crate::redis_request::SimpleRoutes::AllPrimaries => {
Ok(Some(RoutingInfo::MultiNode((
MultipleNodeRoutingInfo::AllMasters,
get_response_policy(cmd),
))))
}
crate::redis_request::SimpleRoutes::Random => {
Ok(Some(RoutingInfo::SingleNode(SingleNodeRoutingInfo::Random)))
}
Expand All @@ -455,16 +464,10 @@ fn handle_request(request: RedisRequest, client: Client, writer: Rc<Writer>) {
Some(action) => match action {
redis_request::Command::SingleCommand(command) => {
match get_redis_command(&command) {
Ok(cmd) => {
let response_policy = cmd
.command()
.map(|cmd| ResponsePolicy::for_command(&cmd))
.unwrap_or(None);
match get_route(request.route.0, response_policy) {
Ok(routes) => send_command(cmd, client, routes).await,
Err(e) => Err(e),
}
}
Ok(cmd) => match get_route(request.route.0, Some(&cmd)) {
Ok(routes) => send_command(cmd, client, routes).await,
Err(e) => Err(e),
},
Err(e) => Err(e),
}
}
Expand Down
Loading