Return no updates when performing an NX set to an existing array element (RedisJSON#593)

EricRabil · oshadmi · web-flow · commit 526cd59672fb · 2022-01-09T10:18:38.000+02:00
* Return no updates if the desired index is already present (nothing to add)

* Create test for noError when NX SETting an existing array index

* Update tests/pytest/test.py

Co-authored-by: Omer Shadmi &lt;76992134+oshadmi@users.noreply.github.com&gt;

Co-authored-by: Omer Shadmi &lt;76992134+oshadmi@users.noreply.github.com&gt;
diff --git a/src/commands.rs b/src/commands.rs
@@ -283,10 +283,18 @@ impl<'a, V: SelectValue> KeyValue<'a, V> {
                     .collect())
             }
         } else if let StaticPathElement::ArrayIndex(_) = last {
-            // if we reach here with array path we must be out of range
-            // otherwise the path would be valid to be set and we would not
-            // have reached here!!
-            Err("ERR array index out of range".into())
+            // if we reach here with array path we are either out of range
+            // or no-oping an NX where the value is already present
+            let mut selector = Selector::default();
+            let res = selector
+                .str_path(path)?
+                .value(self.val)
+                .select_with_paths(|_| true)?;
+            if !res.is_empty() {
+                Ok(Vec::new())
+            } else {
+                Err("ERR array index out of range".into())
+            }
         } else {
             Err("ERR path not an object or array".into())
         }
diff --git a/tests/pytest/test.py b/tests/pytest/test.py
@@ -955,6 +955,13 @@ def testMultiPathResults(env):
     # make sure legacy json path returns single result
     env.expect("JSON.GET", "k", '.*[0,2]').equal('1')
 
+def testIssue_597(env):
+    env.expect("JSON.SET", "test", ".", "[0]").ok()
+    env.assertEqual(env.execute_command("JSON.SET", "test", ".[0]", "[0]", "NX"), None)
+    env.expect("JSON.SET", "test", ".[1]", "[0]", "NX").raiseError()
+    # make sure value was not changed
+    env.expect("JSON.GET", "test", ".").equal('[0]')
+
 # class CacheTestCase(BaseReJSONTest):
 #     @property
 #     def module_args(env):
