Merge pull request #139 from RedisLabsModules/omer_feature-search-json

WIP open_with_redis_string does not take ownership of the RedisModuleString
RedisLabsModules · Apr 18, 2021 · 2aa926b · 2aa926b
2 parents 06a9724 + 036cb51
commit 2aa926b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 23 deletions.
diff --git a/src/key.rs b/src/key.rs
@@ -33,17 +33,17 @@ pub enum KeyMode {
 pub struct RedisKey {
     ctx: *mut raw::RedisModuleCtx,
     key_inner: *mut raw::RedisModuleKey,
-    key_str: RedisString,
+    key_str: Option<RedisString>,
 }
 
 impl RedisKey {
     pub fn open(ctx: *mut raw::RedisModuleCtx, key: &str) -> RedisKey {
         let key_str = RedisString::create(ctx, key);
         let key_inner = raw::open_key(ctx, key_str.inner, to_raw_mode(KeyMode::Read));
         RedisKey {
-            ctx,
-            key_inner,
-            key_str,
+            ctx: ctx,
+            key_inner: key_inner,
+            key_str: Some(key_str),
         }
     }
 
@@ -133,17 +133,17 @@ pub struct RedisKeyWritable {
     // This field is needed on the struct so that its Drop implementation gets
     // called when it goes out of scope.
     #[allow(dead_code)]
-    key_str: RedisString,
+    key_str: Option<RedisString>,
 }
 
 impl RedisKeyWritable {
     pub fn open(ctx: *mut raw::RedisModuleCtx, key: &str) -> RedisKeyWritable {
         let key_str = RedisString::create(ctx, key);
         let key_inner = raw::open_key(ctx, key_str.inner, to_raw_mode(KeyMode::ReadWrite));
         RedisKeyWritable {
-            ctx,
-            key_inner,
-            key_str,
+            ctx: ctx,
+            key_inner: key_inner,
+            key_str: Some(key_str),
         }
     }
 
@@ -243,12 +243,11 @@ impl RedisKeyWritable {
         ctx: *mut raw::RedisModuleCtx,
         string: *mut raw::RedisModuleString,
     ) -> RedisKeyWritable {
-        let key_str = RedisString::create_from_redis_string(ctx, string);
-        let key_inner = raw::open_key(ctx, key_str.inner, to_raw_mode(KeyMode::ReadWrite));
+        let key_inner = raw::open_key(ctx, string, to_raw_mode(KeyMode::ReadWrite));
         RedisKeyWritable {
-            ctx,
-            key_inner,
-            key_str,
+            ctx: ctx,
+            key_inner: key_inner,
+            key_str: None,
         }
     }
 

diff --git a/src/redismodule.rs b/src/redismodule.rs
@@ -103,16 +103,6 @@ impl RedisString {
         RedisString { ctx, inner }
     }
 
-    pub fn create_from_redis_string(
-        ctx: *mut raw::RedisModuleCtx,
-        redis_string: *mut raw::RedisModuleString,
-    ) -> RedisString {
-        RedisString {
-            ctx,
-            inner: redis_string,
-        }
-    }
-
     pub fn from_ptr<'a>(ptr: *const raw::RedisModuleString) -> Result<&'a str, Utf8Error> {
         let mut len: libc::size_t = 0;
         let bytes = unsafe { raw::RedisModule_StringPtrLen.unwrap()(ptr, &mut len) };