Skip to content

MOD-8720 command proc macro: add acl and command arguments parameters #432

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
AvivDavid23 merged 6 commits into from
Nov 11, 2025
Merged

MOD-8720 command proc macro: add acl and command arguments parameters #432

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a67ed1a
MOD-8720 command proc macro: add acl and command arguments parameters
AvivDavid23 Nov 10, 2025
9faad8a
cargo fmt
AvivDavid23 Nov 11, 2025
13c4718
CR
AvivDavid23 Nov 11, 2025
9c41c23
CR
AvivDavid23 Nov 11, 2025
24ef389
CR
AvivDavid23 Nov 11, 2025
8908078
fmt
AvivDavid23 Nov 11, 2025
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
56 changes: 26 additions & 30 deletions src/context/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use libc::c_char;
use linkme::distributed_slice;
use redis_module_macros_internals::api;
use std::ffi::CString;
use std::iter;
use std::mem::MaybeUninit;
use std::os::raw::c_int;
use std::ptr;
Expand Down Expand Up @@ -471,20 +472,19 @@ fn convert_command_arg_to_raw(arg: &RedisModuleCommandArg) -> raw::RedisModuleCo
.map(|v| CString::new(v.as_str()).unwrap().into_raw())
.unwrap_or(ptr::null_mut());

let subargs = match &arg.subargs {
Some(subargs_vec) => {
let mut raw_subargs: Vec<raw::RedisModuleCommandArg> = subargs_vec
.iter()
.map(|subarg| convert_command_arg_to_raw(subarg))
.collect();

let zerod: raw::RedisModuleCommandArg = unsafe { MaybeUninit::zeroed().assume_init() };
raw_subargs.push(zerod);

Box::into_raw(raw_subargs.into_boxed_slice()) as *mut raw::RedisModuleCommandArg
}
None => ptr::null_mut(),
};
let subargs = arg
.subargs
.as_ref()
.map(|v| {
Box::into_raw(
v.iter()
.map(convert_command_arg_to_raw)
.chain(iter::once(unsafe { MaybeUninit::zeroed().assume_init() }))
.collect::<Vec<_>>()
.into_boxed_slice(),
) as *mut raw::RedisModuleCommandArg
})
.unwrap_or(ptr::null_mut());

raw::RedisModuleCommandArg {
name,
Expand All @@ -507,14 +507,12 @@ pub fn get_redis_command_args(
return None;
}

let mut raw_args: Vec<raw::RedisModuleCommandArg> = args
let raw_args: Vec<raw::RedisModuleCommandArg> = args
.iter()
.map(|arg| convert_command_arg_to_raw(arg))
.map(convert_command_arg_to_raw)
.chain(iter::once(unsafe { MaybeUninit::zeroed().assume_init() }))
.collect();

let zerod: raw::RedisModuleCommandArg = unsafe { MaybeUninit::zeroed().assume_init() };
raw_args.push(zerod);

Some(raw_args)
}

Expand Down Expand Up @@ -592,6 +590,13 @@ api! {[
// Register the extra data of the command
let command = unsafe { RedisModule_GetCommand(ctx.ctx, name.as_ptr()) };

if command.is_null() {
return Err(RedisError::String(format!(
"Failed finding command {} after registration.",
command_info.name
)));
}

if let Some(acl_categories) = command_info.acl_categories {
let acl_categories = CString::new(acl_categories.join(" ")).map_err(|e| RedisError::String(e.to_string()))?;
if unsafe { RedisModule_SetCommandACLCategories(command, acl_categories.as_ptr()) } == raw::Status::Err as i32 {
Expand All @@ -602,13 +607,6 @@ api! {[
}
}

if command.is_null() {
return Err(RedisError::String(format!(
"Failed finding command {} after registration.",
command_info.name
)));
}

let summary = command_info
.summary
.as_ref()
Expand Down Expand Up @@ -643,7 +641,7 @@ api! {[
tips: tips.as_ref().map(|v| v.as_ptr()).unwrap_or(ptr::null_mut()),
arity: command_info.arity as c_int,
key_specs: key_specs.as_ptr() as *mut raw::RedisModuleCommandKeySpec,
args: args.as_ref().map(|v| v.as_ptr()).unwrap_or(ptr::null_mut()) as *mut raw::RedisModuleCommandArg,
args: args.as_ref().map(Vec::as_ptr).unwrap_or(ptr::null_mut()) as *mut raw::RedisModuleCommandArg,
};

if unsafe { RedisModule_SetCommandInfo(command, &mut redis_command_info as *mut raw::RedisModuleCommandInfo) } == raw::Status::Err as i32 {
Expand All @@ -666,9 +664,7 @@ api! {[
}
});

args.map(|v| v.into_iter()).unwrap_or_default().for_each(|arg| {
free_command_arg(&arg);
});
args.unwrap_or_default().iter().for_each(free_command_arg);

Ok(())
})
Expand Down