Skip to content

feat: impl function strip_null_value for Variant #17640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 24, 2025
Merged

feat: impl function strip_null_value for Variant #17640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
002b15c
feat: impl function `strip_null_value` for Variant
KKould Mar 24, 2025
f9ed478
test: add unit test for `strip_null_value` on variant.rs
KKould Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/query/functions/src/scalars/variant.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1869,6 +1869,19 @@ pub fn register(registry: &mut FunctionRegistry) {
},
}))
});

registry.register_1_arg_core::<NullableType<VariantType>, NullableType<VariantType>, _, _>(
"strip_null_value",
|_, _| FunctionDomain::Full,
vectorize_1_arg::<NullableType<VariantType>, NullableType<VariantType>>(|val, _| {
val.and_then(|v| {
if matches!(RawJsonb::new(v).is_null(), Ok(true)) {
return None;
}
Some(v.to_vec())
})
}),
);
}

fn json_array_fn(args: &[Value<AnyType>], ctx: &mut EvalContext) -> Value<AnyType> {
Expand Down
1 change: 1 addition & 0 deletions src/query/functions/tests/it/scalars/testdata/function_list.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3449,6 +3449,7 @@ Functions overloads:
1 strcmp(String NULL, String NULL) :: Int8 NULL
0 string_to_h3(String) :: UInt64
1 string_to_h3(String NULL) :: UInt64 NULL
0 strip_null_value(Variant NULL) :: Variant NULL
0 sub_bitmap(Bitmap, UInt64, UInt64) :: Bitmap
1 sub_bitmap(Bitmap NULL, UInt64 NULL, UInt64 NULL) :: Bitmap NULL
0 substr(String, Int64) :: String
Expand Down
72 changes: 72 additions & 0 deletions src/query/functions/tests/it/scalars/testdata/variant.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5815,3 +5815,75 @@ evaluation (internal):
+--------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------+


ast : strip_null_value(parse_json('1234'))
raw expr : strip_null_value(parse_json('1234'))
checked expr : strip_null_value<Variant NULL>(CAST(parse_json<String>("1234") AS Variant NULL))
optimized expr : 0x20000000200000035004d2
output type : Variant NULL
output domain : Undefined
output : '1234'


ast : strip_null_value(parse_json('null'))
raw expr : strip_null_value(parse_json('null'))
checked expr : strip_null_value<Variant NULL>(CAST(parse_json<String>("null") AS Variant NULL))
optimized expr : NULL
output type : Variant NULL
output domain : {NULL}
output : NULL


ast : strip_null_value(null)
raw expr : strip_null_value(NULL)
checked expr : strip_null_value<Variant NULL>(CAST(NULL AS Variant NULL))
optimized expr : NULL
output type : Variant NULL
output domain : {NULL}
output : NULL


ast : strip_null_value(parse_json(s))
raw expr : strip_null_value(parse_json(s::String))
checked expr : strip_null_value<Variant NULL>(CAST(parse_json<String>(s) AS Variant NULL))
evaluation:
+--------+-------------------------------------------------------+--------------------+
| | s | Output |
+--------+-------------------------------------------------------+--------------------+
| Type | String | Variant NULL |
| Domain | {"[\"a\",\"b\",\"c\"]"..="{ \"a\": 1, \"b\": null }"} | Unknown |
| Row 0 | '{ "a": 1, "b": null }' | '{"a":1,"b":null}' |
| Row 1 | 'null' | NULL |
| Row 2 | '["a","b","c"]' | '["a","b","c"]' |
+--------+-------------------------------------------------------+--------------------+
evaluation (internal):
+--------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Column | Data |
+--------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| s | StringColumn[{ "a": 1, "b": null }, null, ["a","b","c"]] |
| Output | NullableColumn { column: BinaryColumn { data: 0x40000002100000011000000120000002000000006162500180000003100000011000000110000001616263, offsets: [0, 24, 24, 43] }, validity: [0b_____101] } |
+--------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+


ast : strip_null_value(parse_json(s))
raw expr : strip_null_value(parse_json(s::String NULL))
checked expr : strip_null_value<Variant NULL>(parse_json<String NULL>(s))
evaluation:
+--------+----------------------------------------------------------------+--------------------+
| | s | Output |
+--------+----------------------------------------------------------------+--------------------+
| Type | String NULL | Variant NULL |
| Domain | {"[\"a\",\"b\",\"c\"]"..="{ \"a\": 1, \"b\": null }"} ∪ {NULL} | Unknown |
| Row 0 | '{ "a": 1, "b": null }' | '{"a":1,"b":null}' |
| Row 1 | 'null' | NULL |
| Row 2 | NULL | NULL |
| Row 3 | '["a","b","c"]' | '["a","b","c"]' |
+--------+----------------------------------------------------------------+--------------------+
evaluation (internal):
+--------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Column | Data |
+--------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| s | NullableColumn { column: StringColumn[{ "a": 1, "b": null }, null, , ["a","b","c"]], validity: [0b____1011] } |
| Output | NullableColumn { column: BinaryColumn { data: 0x40000002100000011000000120000002000000006162500180000003100000011000000110000001616263, offsets: [0, 24, 24, 24, 43] }, validity: [0b____1001] } |
+--------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+


29 changes: 29 additions & 0 deletions src/query/functions/tests/it/scalars/variant.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ fn test_variant() {
test_json_object_insert(file);
test_json_object_delete(file);
test_json_object_pick(file);
test_strip_null_value(file);
}

fn test_parse_json(file: &mut impl Write) {
Expand Down Expand Up @@ -2131,3 +2132,31 @@ fn test_json_object_pick(file: &mut impl Write) {
),
)]);
}

fn test_strip_null_value(file: &mut impl Write) {
run_ast(file, "strip_null_value(parse_json('1234'))", &[]);
run_ast(file, "strip_null_value(parse_json('null'))", &[]);
run_ast(file, "strip_null_value(null)", &[]);

run_ast(file, "strip_null_value(parse_json(s))", &[(
"s",
StringType::from_data(vec![
r#"{ "a": 1, "b": null }"#,
"null",
"[\"a\",\"b\",\"c\"]",
]),
)]);

run_ast(file, "strip_null_value(parse_json(s))", &[(
"s",
StringType::from_data_with_validity(
vec![
r#"{ "a": 1, "b": null }"#,
"null",
"",
"[\"a\",\"b\",\"c\"]",
],
vec![true, true, false, true],
),
)]);
}
20 changes: 20 additions & 0 deletions tests/sqllogictests/suites/query/functions/02_0065_function_json.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,3 +1504,23 @@ SELECT id, json_object_pick(v1, 'a', 'k1') from t5

statement ok
DROP TABLE IF EXISTS t5

statement ok
CREATE OR REPLACE TABLE t6 (id INT, data VARIANT);

statement ok
INSERT INTO t6 VALUES
(1, '{"name": "Alice", "age": 30, "address": null}'),
(2, '{"name": "Bob", "age": null, "address": {"city": "New York", "zip": null}}'),
(3, '{"name": "Charlie", "age": 25, "address": {"city": "San Francisco", "zip": "94107"}}');

query II
SELECT id, data:address, data:address:zip, STRIP_NULL_VALUE(data:address), STRIP_NULL_VALUE(data:address:zip) FROM t6;
----
1 null NULL NULL NULL
2 {"city":"New York","zip":null} null {"city":"New York","zip":null} NULL
3 {"city":"San Francisco","zip":"94107"} "94107" {"city":"San Francisco","zip":"94107"} "94107"


statement ok
DROP TABLE IF EXISTS t6