added fixes for prev commit

Signed-off-by: sachinvmurthy <[email protected]>

Author: sachinvmurthy

examples/client.rs

@@ -1,6 +1,6 @@
 use valkey_module::alloc::ValkeyAlloc;
 use valkey_module::{
-    valkey_module, Context, NextArg, ValkeyError, ValkeyResult, ValkeyString, ValkeyValue,
+    valkey_module, Context, NextArg, Status, ValkeyError, ValkeyResult, ValkeyString, ValkeyValue,
 };
 
 fn get_client_id(ctx: &Context, _args: Vec<ValkeyString>) -> ValkeyResult {
@@ -88,8 +88,10 @@ fn deauth_client_by_id(ctx: &Context, args: Vec<ValkeyString>) -> ValkeyResult {
     let client_id: u64 = client_id_str.parse_integer()?.try_into().unwrap();
     let resp = ctx.deauthenticate_and_close_client_by_id(client_id);
     match resp {
-        Ok(msg) => Ok(ValkeyValue::from(msg)),
-        Err(err) => Err(err),
+        Status::Ok => Ok(ValkeyValue::from("OK")),
+        Status::Err => Err(ValkeyError::Str(
+            "Failed to deauthenticate and close client",
+        )),
     }
 }
 

examples/server_events.rs

@@ -6,7 +6,8 @@ use valkey_module::{
     server_events::FlushSubevent, valkey_module, Context, ValkeyResult, ValkeyString, ValkeyValue,
 };
 use valkey_module_macros::{
-    client_changed_event_handler, config_changed_event_handler, cron_event_handler, flush_event_handler, key_event_handler, persistence_event_handler, shutdown_event_handler
+    client_changed_event_handler, config_changed_event_handler, cron_event_handler,
+    flush_event_handler, key_event_handler, persistence_event_handler, shutdown_event_handler,
 };
 
 static NUM_FLUSHES: AtomicI64 = AtomicI64::new(0);
@@ -129,7 +130,9 @@ fn num_key_events(_ctx: &Context, _args: Vec<ValkeyString>) -> ValkeyResult {
 }
 
 fn num_persistence_events(_ctx: &Context, _args: Vec<ValkeyString>) -> ValkeyResult {
-    Ok(ValkeyValue::Integer(NUM_PERSISTENCE_EVENTS.load(Ordering::SeqCst)))
+    Ok(ValkeyValue::Integer(
+        NUM_PERSISTENCE_EVENTS.load(Ordering::SeqCst),
+    ))
 }
 
 //////////////////////////////////////////////////////

src/context/client.rs

@@ -121,18 +121,14 @@ impl Context {
     pub fn get_client_ip(&self) -> ValkeyResult<String> {
         self.get_client_ip_by_id(self.get_client_id())
     }
-    pub fn deauthenticate_and_close_client_by_id(&self, client_id: u64) -> ValkeyResult<ValkeyString> {
-        match unsafe { RedisModule_DeauthenticateAndCloseClient.unwrap()(self.ctx, client_id) } {
-            result if result as isize == VALKEYMODULE_OK => Ok(ValkeyString::create(None, "OK")),
-            _ => Err(ValkeyError::Str(
-                "Failed to deauthenticate and close client",
-            )),
-        }
+    pub fn deauthenticate_and_close_client_by_id(&self, client_id: u64) -> Status {
+        let resp =
+            unsafe { RedisModule_DeauthenticateAndCloseClient.unwrap()(self.ctx, client_id) };
+        Status::from(resp)
     }
 
-    pub fn deauthenticate_and_close_client(&self) -> ValkeyResult<String> {
+    pub fn deauthenticate_and_close_client(&self) -> Status {
         self.deauthenticate_and_close_client_by_id(self.get_client_id())
-            .map(|valkey_str| valkey_str.to_string())
     }
 
     pub fn config_get(&self, config: String) -> ValkeyResult<ValkeyString> {

tests/integration.rs

@@ -484,8 +484,6 @@ fn test_server_event() -> Result<()> {
     //one for overwrite and one for delete
     assert_eq!(res, 2);
 
-    // Get initial persistence counts
-    let initial_persistence_events: i64 = redis::cmd("num_persistence_events").query(&mut con)?;
 
     // Trigger RDB save (BGSAVE command triggers persistence events)
     redis::cmd("bgsave")
@@ -497,10 +495,10 @@ fn test_server_event() -> Result<()> {
 
     // Check that persistence events were fired
     let persistence_events_after_rdb: i64 = redis::cmd("num_persistence_events").query(&mut con)?;
-    
-    // Should have at least one more persistence event (RDB start)
-    assert!(persistence_events_after_rdb > initial_persistence_events, 
-            "Expected persistence events to increase after BGSAVE");
+
+    //initially there are 2 persistence events (one for RDB save start and one for RDB save end)
+    // after the BGSAVE command, we expect 2 more events (one for RDB save start and one for RDB save end)
+    assert_eq!(persistence_events_after_rdb, 4);
 
     Ok(())
 }
@@ -1214,11 +1212,16 @@ fn test_client() -> Result<()> {
         .with_context(|| "failed execute client.ip")?;
     assert_eq!(resp, "127.0.0.1");
     // Test client.deauth
-    let resp: String = redis::cmd("client.deauth")
-        .arg(0)
-        .query(&mut con)
-        .with_context(|| "failed execute client.deauth")?;
-    assert_eq!(resp, "Failed to deauthenticate and close client");
+    let result = redis::cmd("client.deauth").arg(0).query::<String>(&mut con);
+    match result {
+        Ok(resp) => {
+            assert_eq!(resp, "OK");
+        }
+        Err(err) => {
+            let error_msg = err.to_string();
+            assert!(error_msg.contains("Failed: to deauthenticate and close client"));
+        }
+    }
     let resp: String = redis::cmd("client.config_get")
         .arg("maxmemory-policy")
         .query(&mut con)