backward for json.get multi path (#68)

* backward for json.get multi path

* add Path:new

* update to redismodule-rs 0.5.0

Author: gkorland

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "redisjson"
-version = "0.7.1"
+version = "0.8.0"
 authors = ["Gavrie Philipson <gavrie@redislabs.com>"]
 edition = "2018"
 
@@ -13,11 +13,11 @@ serde_json = "1.0"
 libc = "0.2"
 jsonpath_lib = { git="https://github.com/gkorland/jsonpath.git", branch="reaplce_with_ownership_parser" }
 
-[dependencies.redismodule]
+[dependencies.redis-module]
 git = "https://github.com/redislabsmodules/redismodule-rs.git"
-branch = "safe_context_rm_call"
+tag = "v0.5.0"
 features = ["experimental-api"]
 
 [dependencies.redisearch_api]
 git = "https://github.com/RediSearch/redisearch-api-rs.git"
-branch = "safe_context_rm_call"
+tag = "v0.2.0"

Cargo.toml

@@ -1,4 +1,4 @@
-use redismodule::raw;
+use redis_module::raw;
 use serde_json::map::Map;
 use serde_json::Number;
 use serde_json::Value;

src/backward.rs

@@ -2,7 +2,7 @@ use std::thread;
 
 use serde_json::{Map, Value};
 
-use redismodule::{Context, NextArg, RedisError, RedisResult, RedisValue, REDIS_OK};
+use redis_module::{Context, NextArg, RedisError, RedisResult, RedisValue, REDIS_OK};
 
 use redisearch_api::{Document, FieldType};
 

src/commands/index.rs

@@ -31,8 +31,8 @@ impl From<JsonPathError> for Error {
     }
 }
 
-impl From<Error> for redismodule::RedisError {
+impl From<Error> for redis_module::RedisError {
     fn from(e: Error) -> Self {
-        redismodule::RedisError::String(e.msg)
+        redis_module::RedisError::String(e.msg)
     }
 }

src/error.rs

@@ -1,10 +1,10 @@
 #[macro_use]
-extern crate redismodule;
+extern crate redis_module;
 
-use redismodule::native_types::RedisType;
-use redismodule::raw::RedisModuleTypeMethods;
-use redismodule::{raw as rawmod, NextArg};
-use redismodule::{Context, RedisError, RedisResult, RedisValue, REDIS_OK};
+use redis_module::native_types::RedisType;
+use redis_module::raw::RedisModuleTypeMethods;
+use redis_module::{raw as rawmod, NextArg};
+use redis_module::{Context, RedisError, RedisResult, RedisValue, REDIS_OK};
 use serde_json::{Number, Value};
 
 use std::{i64, usize};
@@ -20,13 +20,13 @@ mod schema; // TODO: Remove
 use crate::array_index::ArrayIndex;
 use crate::commands::index;
 use crate::error::Error;
-use crate::redisjson::{Format, RedisJSON, SetOptions};
+use crate::redisjson::{Format, Path, RedisJSON, SetOptions};
 
 static REDIS_JSON_TYPE: RedisType = RedisType::new(
     "ReJSON-RL",
     2,
     RedisModuleTypeMethods {
-        version: redismodule::TYPE_METHOD_VERSION,
+        version: redis_module::TYPE_METHOD_VERSION,
 
         rdb_load: Some(redisjson::type_methods::rdb_load),
         rdb_save: Some(redisjson::type_methods::rdb_save),
@@ -165,7 +165,7 @@ fn json_get(ctx: &Context, args: Vec<String>) -> RedisResult {
     let mut args = args.into_iter().skip(1);
     let key = args.next_string()?;
 
-    let mut paths: Vec<String> = vec![];
+    let mut paths: Vec<Path> = vec![];
     let mut first_loop = true;
     let mut format = Format::JSON;
     loop {
@@ -174,7 +174,7 @@ fn json_get(ctx: &Context, args: Vec<String>) -> RedisResult {
             Err(_) => {
                 // path is optional -> no path found on the first loop we use root "$"
                 if first_loop {
-                    paths.push("$".to_owned());
+                    paths.push(Path::new("$".to_string()));
                 }
                 break;
             }
@@ -198,15 +198,15 @@ fn json_get(ctx: &Context, args: Vec<String>) -> RedisResult {
                 format = Format::from_str(args.next_string()?.as_str())?;
             }
             _ => {
-                paths.push(backwards_compat_path(arg));
+                paths.push(Path::new(arg));
             }
         };
     }
 
     let key = ctx.open_key_writable(&key);
     let value = match key.get_value::<RedisJSON>(&REDIS_JSON_TYPE)? {
         Some(doc) => if paths.len() == 1 {
-            doc.to_string(&paths[0], format)?
+            doc.to_string(&paths[0].fixed, format)?
         } else {
             // can't be smaller than 1
             doc.to_json(&mut paths)?

src/lib.rs

@@ -10,7 +10,7 @@ use crate::nodevisitor::NodeVisitorImpl;
 
 use bson::decode_document;
 use jsonpath_lib::SelectorMut;
-use redismodule::raw;
+use redis_module::raw;
 use serde_json::Value;
 use std::io::Cursor;
 use std::mem;
@@ -38,6 +38,30 @@ impl Format {
     }
 }
 
+///
+/// Backwards compatibility convertor for RedisJSON 1.x clients
+///
+pub struct Path {
+    pub path: String,
+    pub fixed: String,
+}
+
+impl Path {
+    pub fn new(path: String) -> Path {
+        let mut fixed = path.clone();
+        if !fixed.starts_with("$") {
+            if fixed == "." {
+                fixed.replace_range(..1, "$");
+            } else if fixed.starts_with(".") {
+                fixed.insert(0, '$');
+            } else {
+                fixed.insert_str(0, "$.");
+            }
+        }
+        Path{path, fixed}
+    }
+}
+
 #[derive(Debug)]
 pub struct RedisJSON {
     data: Value,
@@ -173,18 +197,18 @@ impl RedisJSON {
 
     // FIXME: Implement this by manipulating serde_json::Value values,
     // and then using serde to serialize to JSON instead of doing it ourselves with strings.
-    pub fn to_json(&self, paths: &mut Vec<String>) -> Result<String, Error> {
+    pub fn to_json(&self, paths: &mut Vec<Path>) -> Result<String, Error> {
         let mut selector = jsonpath_lib::selector(&self.data);
         let mut result = paths.drain(..).fold(String::from("{"), |mut acc, path| {
-            let value = match selector(&path) {
+            let value = match selector(&path.fixed) {
                 Ok(s) => match s.first() {
                     Some(v) => v,
                     None => &Value::Null,
                 },
                 Err(_) => &Value::Null,
             };
             acc.push('\"');
-            acc.push_str(&path);
+            acc.push_str(&path.path);
             acc.push_str("\":");
             acc.push_str(value.to_string().as_str());
             acc.push(',');

src/redisjson.rs

@@ -1,7 +1,7 @@
 use std::os::raw::{c_int, c_void};
 
 use redisearch_api::Index;
-use redismodule::raw;
+use redis_module::raw;
 
 use crate::error::Error;
 use std::collections::HashMap;