Merge branch 'master' into arr_index_obj

Author: gkorland

.circleci/config.yml

@@ -59,7 +59,7 @@ jobs:
           name: Package
           command: |
             cargo build --all --all-targets --release
-            ramp pack -m ramp.yml -o ./target/release/$PACKAGE_NAME.{os}-{architecture}.$CIRCLE_BRANCH.zip ./target/release/$MODULE_ARTIFACT
+            ramp pack -m ramp.yml -n RedisJSON -o ./target/release/$PACKAGE_NAME.{os}-{architecture}.$CIRCLE_BRANCH.zip ./target/release/$MODULE_ARTIFACT
 
       # - run:
       #     name: Upload Coverage
@@ -71,11 +71,11 @@ jobs:
             - "~/.cargo"
             - "./target"
 
-      # - run:
-      #     name: Deploy to S3
-      #     command: >-
-      #       aws s3 cp ./target/release/ s3://redismodules/$PACKAGE_NAME/ --acl
-      #       public-read --recursive --exclude "*" --include "*.zip"            
+      - run:
+          name: Deploy to S3
+          command: >-
+            aws s3 cp ./target/release/ s3://redismodules/$PACKAGE_NAME/ --acl
+            public-read --recursive --exclude "*" --include "*.zip"            
 
 #      - run:
 #          name: Run all tests

Cargo.lock

@@ -12,5 +12,5 @@ bson = "0.14"
 serde_json = "1.0"
 libc = "0.2"
 jsonpath_lib = { git="https://github.com/gkorland/jsonpath.git", branch="patch-1" }
-redis-module = { version="0.5.0", features = ["experimental-api"]}
-redisearch_api = "0.2.1"
+redis-module = { version="0.7.0", features = ["experimental-api"]}
+redisearch_api = "0.3.0"

Cargo.toml

@@ -1,12 +1,12 @@
-display_name: RedisJSON
+display_name: RedisJSON2
 author: Redis Labs
 email: redismodules@redislabs.com
 description: Native JSON Data Type for Redis
 homepage: http://redisjson.io
 license: Redis Source Available License Agreement
 command_line_args: ""
-min_redis_version: "4.0"
-min_redis_pack_version: "5.0"
+min_redis_version: "5.0"
+min_redis_pack_version: "5.4"
 capabilities:
     - types
     - no_multi_key

ramp.yml

@@ -792,6 +792,19 @@ def testDoubleParse(self):
         self.assertEqual(1512060373.222988, float(res))
         self.assertEqual('1512060373.222988', res)
 
+    def testIssue_80(self):
+        """https://github.com/RedisJSON/RedisJSON2/issues/80"""
+    
+        with self.redis() as r:
+            r.client_setname(self._testMethodName)
+            r.flushdb()
+    
+            self.assertOk(r.execute_command('JSON.SET', 'test', '.', '[{"code":"1"}, {"code":"2"}]'))
+            r.execute_command('JSON.GET', 'test', '.[?(@.code=="2")]')
+
+            # This shouldn't crash Redis
+            r.execute_command('JSON.GET', 'test', '$.[?(@.code=="2")]')
+
 #
 # class CacheTestCase(BaseReJSONTest):
 #     @property