add RM_AddACLCategory (#393)

Cargo.toml

@@ -148,6 +148,7 @@ cc = "1"
 
 [features]
 default = ["min-redis-compatibility-version-6-0"]
+min-redis-compatibility-version-7-4 = ["redis-module/min-redis-compatibility-version-7-4"]
 min-redis-compatibility-version-7-2 = ["redis-module/min-redis-compatibility-version-7-2"]
 min-redis-compatibility-version-7-0 = ["redis-module/min-redis-compatibility-version-7-0"]
 min-redis-compatibility-version-6-2 = ["redis-module/min-redis-compatibility-version-6-2"]

build.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
-cargo build --all --all-targets --no-default-features
+cargo build --all --all-targets --no-default-features --features min-redis-compatibility-version-7-4
 
 

redismodule-rs-macros-internals/src/api_versions.rs

@@ -5,6 +5,7 @@ use quote::quote;
 
 lazy_static::lazy_static! {
     pub(crate) static ref API_VERSION_MAPPING: HashMap<String, usize> = HashMap::from([
+        ("RedisModule_AddACLCategory".to_string(), 70400),
         ("RedisModule_AddPostNotificationJob".to_string(), 70200),
         ("RedisModule_SetCommandACLCategories".to_string(), 70200),
         ("RedisModule_GetOpenKeyModesAll".to_string(), 70200),
@@ -30,6 +31,7 @@ lazy_static::lazy_static! {
         (60200, "min-redis-compatibility-version-6-2".to_string()),
         (70000, "min-redis-compatibility-version-7-0".to_string()),
         (70200, "min-redis-compatibility-version-7-2".to_string()),
+        (70400, "min-redis-compatibility-version-7-4".to_string()),
     ];
 }
 

src/context/commands.rs

@@ -471,6 +471,7 @@ api! {[
 
 #[cfg(all(
     any(
+        feature = "min-redis-compatibility-version-7-4",
         feature = "min-redis-compatibility-version-7-2",
         feature = "min-redis-compatibility-version-7-0"
     ),
@@ -495,6 +496,7 @@ pub fn register_commands(ctx: &Context) -> Status {
         feature = "min-redis-compatibility-version-6-0"
     ),
     not(any(
+        feature = "min-redis-compatibility-version-7-4",
         feature = "min-redis-compatibility-version-7-2",
         feature = "min-redis-compatibility-version-7-0"
     ))

src/context/mod.rs

@@ -54,7 +54,10 @@ pub struct CallOptions {
 }
 
 #[derive(Clone)]
-#[cfg(feature = "min-redis-compatibility-version-7-2")]
+#[cfg(any(
+    feature = "min-redis-compatibility-version-7-4",
+    feature = "min-redis-compatibility-version-7-2"
+))]
 pub struct BlockingCallOptions {
     options: CString,
 }
@@ -136,7 +139,10 @@ impl CallOptionsBuilder {
     /// Construct a CallOption object that can be used to run commands using call_blocking.
     /// The commands can be either blocking or none blocking. In case the command are blocking
     /// (like `blpop`) a [FutureCallReply] will be returned.
-    #[cfg(feature = "min-redis-compatibility-version-7-2")]
+    #[cfg(any(
+        feature = "min-redis-compatibility-version-7-4",
+        feature = "min-redis-compatibility-version-7-2"
+    ))]
     pub fn build_blocking(mut self) -> BlockingCallOptions {
         self.add_flag("K");
         BlockingCallOptions {
@@ -441,7 +447,10 @@ impl Context {
     }
 
     /// Same as [call_ext] but also allow to perform blocking commands like BLPOP.
-    #[cfg(feature = "min-redis-compatibility-version-7-2")]
+    #[cfg(any(
+        feature = "min-redis-compatibility-version-7-4",
+        feature = "min-redis-compatibility-version-7-2"
+    ))]
     pub fn call_blocking<
         'ctx,
         'a,

src/include/redismodule.h

@@ -969,6 +969,7 @@ REDISMODULE_API RedisModuleCommand *(*RedisModule_GetCommand)(RedisModuleCtx *ct
 REDISMODULE_API int (*RedisModule_CreateSubcommand)(RedisModuleCommand *parent, const char *name, RedisModuleCmdFunc cmdfunc, const char *strflags, int firstkey, int lastkey, int keystep) REDISMODULE_ATTR;
 REDISMODULE_API int (*RedisModule_SetCommandInfo)(RedisModuleCommand *command, const RedisModuleCommandInfo *info) REDISMODULE_ATTR;
 REDISMODULE_API int (*RedisModule_SetCommandACLCategories)(RedisModuleCommand *command, const char *ctgrsflags) REDISMODULE_ATTR;
+REDISMODULE_API int (*RedisModule_AddACLCategory)(RedisModuleCtx *ctx, const char *name) REDISMODULE_ATTR;
 REDISMODULE_API void (*RedisModule_SetModuleAttribs)(RedisModuleCtx *ctx, const char *name, int ver, int apiver) REDISMODULE_ATTR;
 REDISMODULE_API int (*RedisModule_IsModuleNameBusy)(const char *name) REDISMODULE_ATTR;
 REDISMODULE_API int (*RedisModule_WrongArity)(RedisModuleCtx *ctx) REDISMODULE_ATTR;

src/lib.rs

@@ -34,7 +34,10 @@ pub use crate::context::defrag;
 pub use crate::context::keys_cursor::KeysCursor;
 pub use crate::context::server_events;
 pub use crate::context::AclPermissions;
-#[cfg(feature = "min-redis-compatibility-version-7-2")]
+#[cfg(any(
+    feature = "min-redis-compatibility-version-7-4",
+    feature = "min-redis-compatibility-version-7-2"
+))]
 pub use crate::context::BlockingCallOptions;
 pub use crate::context::CallOptionResp;
 pub use crate::context::CallOptions;

tests/integration.rs

@@ -279,7 +279,10 @@ fn test_stream_reader() -> Result<()> {
 }
 
 #[test]
-#[cfg(feature = "min-redis-compatibility-version-7-2")]
+#[cfg(any(
+    feature = "min-redis-compatibility-version-7-4",
+    feature = "min-redis-compatibility-version-7-2"
+))]
 fn test_call() -> Result<()> {
     let port: u16 = 6488;
     let _guards = vec![start_redis_server_with_module("call", port)
@@ -631,7 +634,10 @@ fn test_redis_value_derive() -> Result<()> {
 }
 
 #[test]
-#[cfg(feature = "min-redis-compatibility-version-7-2")]
+#[cfg(any(
+    feature = "min-redis-compatibility-version-7-4",
+    feature = "min-redis-compatibility-version-7-2"
+))]
 fn test_call_blocking() -> Result<()> {
     let port: u16 = 6499;
     let _guards = vec![start_redis_server_with_module("call", port)