[feature-search-json] Sync with master (2)

.circleci/config.yml

@@ -88,7 +88,9 @@ commands:
           name: Setup automation and install dependencies
           command: |
             ./deps/readies/bin/getpy3
+            python3 -m pip list -v
             ./system-setup.py
+            python3 -m pip list -v
             source $HOME/.cargo/env
             rustc --version
             cargo --version
@@ -100,7 +102,7 @@ commands:
             redis-server --version
       - restore_cache:
           keys:
-            - v2-dependencies-{{ arch }}-{{ checksum "Cargo.lock" }}
+            - v3-dependencies-{{ arch }}-{{ checksum "Cargo.lock" }}
       - run:
           name: Check formatting
           command: bash -l -c "make lint"
@@ -111,7 +113,7 @@ commands:
           name: Build release
           command: bash -l -c "make build pack <<parameters.build_params>>"
       - save_cache:
-          key: v2-dependencies-{{ arch }}-{{ checksum "Cargo.lock" }}
+          key: v3-dependencies-{{ arch }}-{{ checksum "Cargo.lock" }}
           paths:
             - "~/.cargo"
             - "./target"
@@ -213,7 +215,7 @@ jobs:
 
   build-macos:
     macos:
-      xcode: 11.3.0
+      xcode: 11.6.0
     steps:
       - build-steps
       - test-steps

Cargo.toml

@@ -14,7 +14,7 @@ serde_json = "1.0"
 serde = "1.0"
 libc = "0.2"
 jsonpath_lib = { git="https://github.com/RedisJSON/jsonpath.git", branch="public-parser" }
-# redis-module = { version="0.15.0", features = ["experimental-api"]}
+# redis-module = { version="0.15", features = ["experimental-api"]}
 redis-module = { git = "https://github.com/RedisLabsModules/redismodule-rs", features = ["experimental-api"] }
 lazy_static = "1.4.0"
 # readies-wd40 = { path = "deps/readies/wd40" }

Dockerfile

@@ -1,6 +1,6 @@
 # BUILD redisfab/rejson:${VERSION}-${ARCH}-${OSNICK}
 
-ARG REDIS_VER=6.2.1
+ARG REDIS_VER=6.2.2
 
 # stretch|bionic|buster
 ARG OSNICK=buster

Makefile

@@ -9,6 +9,8 @@ include $(ROOT)/deps/readies/mk/main
 #----------------------------------------------------------------------------------------------
 
 define HELP
+make setup         # install prerequisites
+
 make build
   DEBUG=1          # build debug variant
 make clean         # remove binary files
@@ -73,6 +75,14 @@ all: build
 
 #----------------------------------------------------------------------------------------------
 
+setup:
+	./deps/readies/bin/getpy3
+	./system-setup.py
+
+.PHONY: setup
+
+#----------------------------------------------------------------------------------------------
+
 lint:
 	cargo fmt -- --check
 

README.md

@@ -39,6 +39,14 @@ Then, build as usual:
 cargo build --release
 ```
 
+When running the tests, you need to explicitly specify the `test` feature to disable use of the Redis memory allocator when testing:
+
+```bash
+cargo test --features test
+```
+
+If you forget to do this, you'll see an error mentioning `signal: 4, SIGILL: illegal instruction`.
+
 ## Run
 
 ### Linux