Merge pull request #364 from RedisLabsModules/2.0.5

Author: alonre24

.circleci/config.yml

@@ -71,7 +71,7 @@ commands:
     parameters:
       redis_version:
         type: string
-        default: "7.2-rc1"
+        default: "7.2"
       getredis_params:
         type: string
         default: ""
@@ -101,7 +101,7 @@ commands:
         default: ""
       redis_version:
         type: string
-        default: "7.2-rc1"
+        default: "7.2"
       getredis_params:
         type: string
         default: ""
@@ -111,6 +111,11 @@ commands:
       - install-prerequisites:
           redis_version: <<parameters.redis_version>>
           getredis_params: <<parameters.getredis_params>>
+      - run:
+          name: patch macos tests # Avoid AVX with Regex with CircleCI since virtualization layer doesn't support it. Use sed to replace the relevant entry in cargo.toml
+          command: |
+            if [[ $(uname -s) == Darwin ]]; then sed -i 's/regex = "1"/regex = { version = "1", features = ["perf", "unicode"] }/g' Cargo.toml; fi
+            cat Cargo.toml
       - restore_cache:
           keys:
             - v3-dependencies-{{ arch }}-{{ checksum "Cargo.toml" }}
@@ -203,7 +208,7 @@ jobs:
 
   build-macos-x64:
     macos:
-      xcode: 13.2.1
+      xcode: 13.4.1
     resource_class: macos.x86.medium.gen2
     steps:
       - build-steps

.github/workflows/freebsd.yml

@@ -26,5 +26,5 @@ jobs:
           sh rustup.sh -y
           . $HOME/.cargo/env
           rustup target add i686-unknown-freebsd
-          cargo build --all --all-targets --verbose --target i686-unknown-freebsd
+          cargo build --all --all-targets --verbose --no-default-features --target i686-unknown-freebsd
           

.gitignore

@@ -1,6 +1,6 @@
 # Generated by Cargo
 # will have compiled files and executables
-/target/
+**/target/
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
@@ -21,3 +21,5 @@ dump.rdb
 
 # Debugger-related files:
 .gdb_history
+
+venv/

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "redis-module"
-version = "99.99.99"
+version = "2.0.5"
 authors = ["Gavrie Philipson <[email protected]>", "Guy Korland <[email protected]>"]
 edition = "2021"
 build = "build.rs"
@@ -23,13 +23,18 @@ crate-type = ["cdylib"]
 name = "configuration"
 crate-type = ["cdylib"]
 
+[[example]]
+name = "proc_macro_commands"
+crate-type = ["cdylib"]
+
 [[example]]
 name = "acl"
 crate-type = ["cdylib"]
 
 [[example]]
 name = "call"
 crate-type = ["cdylib"]
+required-features = ["min-redis-compatibility-version-7-2"]
 
 [[example]]
 name = "keys_pos"
@@ -75,6 +80,22 @@ crate-type = ["cdylib"]
 name = "test_helper"
 crate-type = ["cdylib"]
 
+[[example]]
+name = "info_handler_macro"
+crate-type = ["cdylib"]
+
+[[example]]
+name = "info_handler_builder"
+crate-type = ["cdylib"]
+
+[[example]]
+name = "info_handler_struct"
+crate-type = ["cdylib"]
+
+[[example]]
+name = "info_handler_multiple_sections"
+crate-type = ["cdylib"]
+
 [[example]]
 name = "info"
 crate-type = ["cdylib"]
@@ -91,8 +112,12 @@ crate-type = ["cdylib"]
 name = "response"
 crate-type = ["cdylib"]
 
+[[example]]
+name = "open_key_with_flags"
+crate-type = ["cdylib"]
+
 [dependencies]
-bitflags = "2.1"
+bitflags = "2"
 libc = "0.2"
 enum-primitive-derive = "^0.1"
 num-traits = "^0.2"
@@ -104,16 +129,17 @@ serde = { version = "1", features = ["derive"] }
 nix = "0.26"
 cfg-if = "1"
 redis-module-macros-internals = { path = "./redismodule-rs-macros-internals" }
+log = "0.4"
 
 [dev-dependencies]
 anyhow = "1"
 redis = "0.23"
 lazy_static = "1"
 redis-module-macros = { path = "./redismodule-rs-macros"}
-redis-module = { path = "./" }
+redis-module = { path = "./", default-features = false, features = ["min-redis-compatibility-version-7-2"] }
 
 [build-dependencies]
-bindgen = "0.65"
+bindgen = "0.66"
 cc = "1"
 
 [features]

Makefile

@@ -57,7 +57,7 @@ RUST_SOEXT.freebsd=so
 RUST_SOEXT.macos=dylib
 
 build:
-	cargo build --all --all-targets  $(CARGO_FLAGS)
+	cargo build --all --all-targets --no-default-features $(CARGO_FLAGS)
 	# cp $(TARGET_DIR)/librejson.$(RUST_SOEXT.$(OS)) $(TARGET)
 
 clean:
@@ -74,8 +74,8 @@ endif
 test: cargo_test
 
 cargo_test:
-	cargo test --workspace $(CARGO_FLAGS)
-	cargo test --doc --workspace $(CARGO_FLAGS)
+	cargo test --workspace --no-default-features $(CARGO_FLAGS)
+	cargo test --doc --workspace --no-default-features $(CARGO_FLAGS)
 
 .PHONY: test cargo_test
 

build.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
-cargo build --features experimental-api,test --all --all-targets
+cargo build --all --all-targets --no-default-features
 
 

deps/readies

@@ -1,8 +1,11 @@
 use redis_module::{
-    redis_module, CallOptionResp, CallOptionsBuilder, CallReply, CallResult, Context, RedisError,
-    RedisResult, RedisString,
+    redis_module, BlockedClient, CallOptionResp, CallOptionsBuilder, CallReply, CallResult,
+    Context, FutureCallReply, PromiseCallReply, RedisError, RedisResult, RedisString, RedisValue,
+    ThreadSafeContext,
 };
 
+use std::thread;
+
 fn call_test(ctx: &Context, _: Vec<RedisString>) -> RedisResult {
     let res: String = ctx.call("ECHO", &["TEST"])?.try_into()?;
     if "TEST" != &res {
@@ -110,6 +113,49 @@ fn call_test(ctx: &Context, _: Vec<RedisString>) -> RedisResult {
     Ok("pass".into())
 }
 
+fn call_blocking_internal(ctx: &Context) -> PromiseCallReply {
+    let call_options = CallOptionsBuilder::new().build_blocking();
+    ctx.call_blocking("blpop", &call_options, &["list", "1"])
+}
+
+fn call_blocking_handle_future(ctx: &Context, f: FutureCallReply, blocked_client: BlockedClient) {
+    let future_handler = f.set_unblock_handler(move |_ctx, reply| {
+        let thread_ctx = ThreadSafeContext::with_blocked_client(blocked_client);
+        thread_ctx.reply(reply.map_or_else(|e| Err(e.into()), |v| Ok((&v).into())));
+    });
+    future_handler.dispose(ctx);
+}
+
+fn call_blocking(ctx: &Context, _: Vec<RedisString>) -> RedisResult {
+    let res = call_blocking_internal(ctx);
+    match res {
+        PromiseCallReply::Resolved(r) => r.map_or_else(|e| Err(e.into()), |v| Ok((&v).into())),
+        PromiseCallReply::Future(f) => {
+            let blocked_client = ctx.block_client();
+            call_blocking_handle_future(ctx, f, blocked_client);
+            Ok(RedisValue::NoReply)
+        }
+    }
+}
+
+fn call_blocking_from_detach_ctx(ctx: &Context, _: Vec<RedisString>) -> RedisResult {
+    let blocked_client = ctx.block_client();
+    thread::spawn(move || {
+        let ctx_guard = redis_module::MODULE_CONTEXT.lock();
+        let res = call_blocking_internal(&ctx_guard);
+        match res {
+            PromiseCallReply::Resolved(r) => {
+                let thread_ctx = ThreadSafeContext::with_blocked_client(blocked_client);
+                thread_ctx.reply(r.map_or_else(|e| Err(e.into()), |v| Ok((&v).into())));
+            }
+            PromiseCallReply::Future(f) => {
+                call_blocking_handle_future(&ctx_guard, f, blocked_client);
+            }
+        }
+    });
+    Ok(RedisValue::NoReply)
+}
+
 //////////////////////////////////////////////////////
 
 redis_module! {
@@ -119,5 +165,7 @@ redis_module! {
     data_types: [],
     commands: [
         ["call.test", call_test, "", 0, 0, 0],
+        ["call.blocking", call_blocking, "", 0, 0, 0],
+        ["call.blocking_from_detached_ctx", call_blocking_from_detach_ctx, "", 0, 0, 0],
     ],
 }

examples/call.rs

@@ -24,6 +24,7 @@ static MY_REDIS_TYPE: RedisType = RedisType::new(
         // Aux data
         aux_load: None,
         aux_save: None,
+        aux_save2: None,
         aux_save_triggers: 0,
 
         free_effort: None,

examples/data_type.rs

@@ -1,4 +1,3 @@
-use redis_module::apierror::APIResult;
 use redis_module::{
     redis_module, Context, NotifyEvent, RedisError, RedisResult, RedisString, RedisValue, Status,
 };
@@ -19,7 +18,7 @@ fn on_event(ctx: &Context, event_type: NotifyEvent, event: &str, key: &[u8]) {
         event
     );
     ctx.log_notice(msg.as_str());
-    let _: APIResult<Status> = ctx.add_post_notification_job(|ctx| {
+    let _ = ctx.add_post_notification_job(|ctx| {
         // it is not safe to write inside the notification callback itself.
         // So we perform the write on a post job notificaiton.
         if let Err(e) = ctx.call("incr", &["num_sets"]) {