fix backward read buffer (#45)

* backward rdb load
* add backward test

Author: gkorland

Cargo.lock

@@ -13,4 +13,4 @@ serde_json = "1.0"
 libc = "0.2"
 jsonpath_lib = { git="https://github.com/gkorland/jsonpath.git", branch="reaplce_with_ownership_parser" }
 redismodule = { git="https://github.com/redislabsmodules/redismodule-rs.git", branch="master" }
-redisearch_api = { git = "https://github.com/RediSearch/redisearch-api-rs.git", branch="master" }
+redisearch_api = { git = "https://github.com/RediSearch/redisearch-api-rs.git", branch="master" }

Cargo.toml

@@ -39,16 +39,14 @@ pub unsafe fn json_rdb_load(rdb: *mut raw::RedisModuleIO) -> Value {
     match node_type {
         NodeType::Null => Value::Null,
         NodeType::Boolean => {
-            let mut str_len = 0;
-            let str_buffer = raw::load_string_buffer(rdb, &mut str_len);
-            Value::Bool(str_buffer.starts_with("1"))
+            let buffer = raw::load_string_buffer(rdb);
+            Value::Bool(buffer.as_ref()[0] == b'1')
         }
         NodeType::Integer => Value::Number(raw::load_signed(rdb).into()),
         NodeType::Number => Value::Number(Number::from_f64(raw::load_double(rdb)).unwrap()),
         NodeType::String => {
-            let mut str_len = 0;
-            let str_buffer = raw::load_string_buffer(rdb, &mut str_len);
-            Value::String(str_buffer.to_string())
+            let buffer = raw::load_string_buffer(rdb);
+            Value::String(buffer.to_string().unwrap())
         }
         NodeType::Dict => {
             let len = raw::load_unsigned(rdb);
@@ -58,9 +56,8 @@ pub unsafe fn json_rdb_load(rdb: *mut raw::RedisModuleIO) -> Value {
                 if t != NodeType::KeyVal {
                     panic!("Can't load old RedisJSON RDB");
                 }
-                let mut str_len = 0;
-                let name = &raw::load_string_buffer(rdb, &mut str_len);
-                m.insert(name.to_string(), json_rdb_load(rdb));
+                let buffer = raw::load_string_buffer(rdb);
+                m.insert(buffer.to_string().unwrap(), json_rdb_load(rdb));
             }
             Value::Object(m)
         }

src/backward.rs

@@ -66,7 +66,7 @@
     },
 }
 
-rmtest.config.REDIS_MODULE = './target/debug/libredisjson.so'
+rmtest.config.REDIS_MODULE = os.path.abspath(os.path.join(os.getcwd(), 'target/debug/libredisjson.so'))
 
 class BaseReJSONTest(BaseModuleTestCase):
     def getCacheInfo(self):
@@ -241,6 +241,11 @@ def testGetPartsOfValuesDocumentMultiple(self):
             data = json.loads(r.execute_command('JSON.GET', 'test', *docs['values'].keys()))
             # self.assertDictEqual(data, docs['values']) // TODO backward compatibility with JSONPATH "$.list" vs "list"
 
+    def testBackwardRDB(self):
+        with self.redis(**{"dir": os.path.abspath(os.path.join(os.getcwd(), 'test/files/')),  "dbfilename": 'backward.rdb'}) as r:
+            r.client_setname(self._testMethodName)
+            data = json.loads(r.execute_command('JSON.GET', 'complex'))
+            self.assertDictEqual(data, {"a":{"b":[{"c":{"d":[1,'2'],"e":None}},True],"a":'a'},"b":1,"c":True,"d":None})
 
     def testSetBSON(self):
         with self.redis() as r: