chore: bump jsonb 0.5.0 (#17698)

* chore: bump jsonb 0.5.0

* fix tests

* fix tests

* bump jsonb v0.5

Author: b41sh

Cargo.lock

@@ -348,7 +348,7 @@ jaq-interpret = "1.5.0"
 jaq-parse = "1.0.3"
 jaq-std = "1.6.0"
 jiff = { version = "0.2.1", features = ["serde", "tzdb-bundle-always"] }
-jsonb = "0.4.4"
+jsonb = "0.5.0"
 jwt-simple = { version = "0.12.10", default-features = false, features = ["pure-rust"] }
 lenient_semver = "0.4.2"
 levenshtein_automata = "0.2.1"
@@ -406,7 +406,7 @@ openraft = { version = "0.10.0", features = [
 ] }
 opensrv-mysql = { git = "https://github.com/databendlabs/opensrv.git", rev = "a1fb4da", features = ["tls"] }
 orc-rust = "0.5.0"
-ordered-float = { version = "4.5.0", default-features = false }
+ordered-float = { version = "5.0.0", default-features = false }
 ordq = "0.2.0"
 p256 = "0.13"
 parking_lot = "0.12.1"
@@ -640,7 +640,6 @@ color-eyre = { git = "https://github.com/eyre-rs/eyre.git", rev = "e5d92c3" }
 deltalake = { git = "https://github.com/delta-io/delta-rs", rev = "c149502" }
 display-more = { git = "https://github.com/databendlabs/display-more", tag = "v0.1.2" }
 ethnum = { git = "https://github.com/datafuse-extras/ethnum-rs", rev = "4cb05f1" }
-jsonb = { git = "https://github.com/databendlabs/jsonb", rev = "1a53512" }
 map-api = { git = "https://github.com/databendlabs/map-api", tag = "v0.2.3" }
 openai_api_rust = { git = "https://github.com/datafuse-extras/openai-api", rev = "819a0ed" }
 openraft = { git = "https://github.com/databendlabs/openraft", tag = "v0.10.0-alpha.9" }

Cargo.toml

@@ -2261,20 +2261,35 @@ fn path_predicate_fn<'a>(
                     match json_row {
                         ScalarRef::Variant(v) => {
                             let jsonb = RawJsonb::new(v);
-                            let res = if is_match {
-                                jsonb.path_match(&path)
-                            } else {
-                                jsonb.path_exists(&path)
-                            };
-                            match res {
-                                Ok(r) => {
-                                    output.push(r);
-                                    validity.push(true);
+                            if is_match {
+                                let res = jsonb.path_match(&path);
+                                match res {
+                                    Ok(Some(r)) => {
+                                        output.push(r);
+                                        validity.push(true);
+                                    }
+                                    Ok(None) => {
+                                        output.push(false);
+                                        validity.push(false);
+                                    }
+                                    Err(err) => {
+                                        ctx.set_error(output.len(), err.to_string());
+                                        output.push(false);
+                                        validity.push(false);
+                                    }
                                 }
-                                Err(err) => {
-                                    ctx.set_error(output.len(), err.to_string());
-                                    output.push(false);
-                                    validity.push(false);
+                            } else {
+                                let res = jsonb.path_exists(&path);
+                                match res {
+                                    Ok(r) => {
+                                        output.push(r);
+                                        validity.push(true);
+                                    }
+                                    Err(err) => {
+                                        ctx.set_error(output.len(), err.to_string());
+                                        output.push(false);
+                                        validity.push(false);
+                                    }
                                 }
                             }
                         }

src/query/functions/src/scalars/variant.rs

@@ -383,7 +383,7 @@ statement ok
 CREATE TABLE IF NOT EXISTS t5(id Int null, obj Variant null) Engine = Fuse
 
 statement ok
-insert into t5 values(1, '{"car_no":10,"测试\\"\\uD83D\\uDC8E":"a"}'), (2, '{"car_no":20}')
+insert into t5 values(1, '{"car_no":10,"测试\\"\\uD83D\\uDC8E":"a","nums":[2,3,4],"obj":{"a":{"b":[1,2]},"c":1}}'), (2, '{"car_no":20,"nums":[-10,-11],"obj":{"x":"y"}}')
 
 query T
 select get(arr, 0) from t1
@@ -549,6 +549,11 @@ select id, json_path_query(arr, '$[*]?(@ > 1 && @ <= 3)') from t1
 1 2
 1 3
 
+query IT
+select id, json_path_query(arr, '$[3][*]?(@ starts with "a")') from t1
+----
+1 "a"
+
 query IT
 select id, json_path_query(arr, '$[*][1]') from t1
 ----
@@ -704,6 +709,85 @@ select json_path_query_first(obj, '$.测试\\"\\uD83D\\uDC8E') from t5
 "a"
 NULL
 
+query IT
+select id, json_path_query(obj, '$.obj.**') from t5
+----
+1 {"a":{"b":[1,2]},"c":1}
+1 {"b":[1,2]}
+1 [1,2]
+1 1
+1 2
+1 1
+2 {"x":"y"}
+2 "y"
+
+query IT
+select id, json_path_query(obj, '$.obj.**{2 to last}') from t5
+----
+1 [1,2]
+1 1
+1 2
+
+query IT
+select id, json_path_query(obj, '$.obj.**{1}') from t5
+----
+1 {"b":[1,2]}
+1 1
+2 "y"
+
+query IT
+select id, json_path_query(obj, '$.obj.**{1}.b') from t5
+----
+1 [1,2]
+
+query IT
+select id, json_path_query(obj, '+$.nums') from t5
+----
+1 2
+1 3
+1 4
+2 -10
+2 -11
+
+query IT
+select id, json_path_query(obj, '-$.nums') from t5
+----
+1 -2
+1 -3
+1 -4
+2 10
+2 11
+
+query IT
+select id, json_path_query(obj, '$.nums[0] + 3') from t5
+----
+1 5
+2 -7
+
+query IT
+select id, json_path_query(obj, '7 - $.nums[0]') from t5
+----
+1 5
+2 17
+
+query IT
+select id, json_path_query(obj, '2 * $.nums[1]') from t5
+----
+1 6
+2 -22
+
+query IT
+select id, json_path_query(obj, '$.nums[1] / 2') from t5
+----
+1 1.5
+2 -5.5
+
+query IT
+select id, json_path_query(obj, '$.nums[1] % 2') from t5
+----
+1 1
+2 -1
+
 statement ok
 set max_block_size = 65535;
 

tests/sqllogictests/suites/query/functions/02_0051_function_semi_structureds_get.test

@@ -570,8 +570,8 @@ select id, v @? '$.b' from t2 order by id
 query T
 select id, v @@ '$[*] == "b"' from t2 order by id
 ----
-1 0
-2 0
+1 NULL
+2 NULL
 3 1
 4 NULL