fix(query): fix variant function with invalid jsonb panic (databendla…

…bs#14520)
guojidan · Jan 30, 2024 · d2a0aee · d2a0aee
1 parent 2c474ce
commit d2a0aee
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -107,7 +107,7 @@ members = [
 
 [workspace.dependencies]
 # databend maintains
-jsonb = { git = "https://github.com/datafuselabs/jsonb", rev = "e21b273" }
+jsonb = { git = "https://github.com/datafuselabs/jsonb", rev = "0247ffc" }
 
 opendal = { version = "0.44.2", features = [
     "layers-minitrace",

diff --git a/src/query/formats/src/field_decoder/fast_values.rs b/src/query/formats/src/field_decoder/fast_values.rs
@@ -466,7 +466,6 @@ impl FastFieldDecoderValues {
             }
             Err(_) => {
                 if self.common_settings().disable_variant_check {
-                    column.put_slice(&buf);
                     column.commit_row();
                 } else {
                     return Err(ErrorCode::BadBytes(format!(

diff --git a/src/query/formats/src/field_decoder/nested.rs b/src/query/formats/src/field_decoder/nested.rs
@@ -309,7 +309,6 @@ impl NestedValues {
             }
             Err(e) => {
                 if self.common_settings().disable_variant_check {
-                    column.put_slice(&buf);
                     column.commit_row();
                 } else {
                     return Err(ErrorCode::BadBytes(e.to_string()));

diff --git a/src/query/formats/src/field_decoder/separated_text.rs b/src/query/formats/src/field_decoder/separated_text.rs
@@ -333,7 +333,6 @@ impl SeparatedTextDecoder {
             }
             Err(e) => {
                 if self.common_settings().disable_variant_check {
-                    column.put_slice(data);
                     column.commit_row();
                 } else {
                     return Err(ErrorCode::BadBytes(e.to_string()));

diff --git a/src/query/functions/src/scalars/variant.rs b/src/query/functions/src/scalars/variant.rs
@@ -121,7 +121,7 @@ pub fn register(registry: &mut FunctionRegistry) {
                 }
                 Err(err) => {
                     if ctx.func_ctx.disable_variant_check {
-                        output.put_str(&val);
+                        output.put_str("");
                     } else {
                         ctx.set_error(output.len(), err.to_string());
                     }
@@ -147,7 +147,7 @@ pub fn register(registry: &mut FunctionRegistry) {
                 }
                 Err(err) => {
                     if ctx.func_ctx.disable_variant_check {
-                        output.put_str(s);
+                        output.put_str("");
                     } else {
                         ctx.set_error(output.len(), err.to_string());
                     }

diff --git a/tests/sqllogictests/suites/stage/formats/csv/csv_types.test b/tests/sqllogictests/suites/stage/formats/csv/csv_types.test
@@ -35,7 +35,7 @@ csv/invalid_variant.csv 2 0 NULL NULL
 query IT
 select * from iv
 ----
-1 invalidvariant
+1 null
 2 {"k":"v"}
 
 statement ok

diff --git a/tests/sqllogictests/suites/stage/formats/parquet/parquet_field_types.test b/tests/sqllogictests/suites/stage/formats/parquet/parquet_field_types.test
@@ -203,4 +203,4 @@ select * from t2 order by a
 3 [1,2,3]
 4 ["a","b"]
 5 {"k":"v"}
-6 [1,
+6 null
-Original file line number
+Diff line change
@@ Expand Up / @@ -203,4 +203,4 @@ select * from t2 order by a @@
 [1,2,3]
 ["a","b"]
 {"k":"v"}
-[1,
+null