Skip to content

Commit c5c3fcd

Browse files
committed
fix: clear result vec of incomplete conversion on fail
1 parent fb1c24a commit c5c3fcd

1 file changed

Lines changed: 29 additions & 1 deletion

File tree

  • core/src/execution/datafusion/expressions/scalar_funcs

‎core/src/execution/datafusion/expressions/scalar_funcs/unhex.rs‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ fn spark_unhex_inner<T: OffsetSizeTrait>(
7474
if let Some(s) = item {
7575
if unhex(s, &mut encoded).is_ok() {
7676
builder.append_value(encoded.as_slice());
77-
encoded.clear();
7877
} else if fail_on_error {
7978
return exec_err!("Input to unhex is not a valid hex string: {s}");
8079
} else {
8180
builder.append_null();
8281
}
82+
encoded.clear();
8383
} else {
8484
builder.append_null();
8585
}
@@ -143,9 +143,11 @@ pub(super) fn spark_unhex(args: &[ColumnarValue]) -> Result<ColumnarValue, DataF
143143
mod test {
144144
use std::sync::Arc;
145145

146+
use arrow::array::{BinaryBuilder, StringBuilder};
146147
use arrow_array::make_array;
147148
use arrow_data::ArrayData;
148149
use datafusion::logical_expr::ColumnarValue;
150+
use datafusion_common::ScalarValue;
149151

150152
use super::unhex;
151153

@@ -168,6 +170,32 @@ mod test {
168170
}
169171
}
170172

173+
#[test]
174+
fn test_partial_error() -> Result<(), Box<dyn std::error::Error>> {
175+
let mut input = StringBuilder::new();
176+
177+
input.append_value("1CGG"); // 1C is ok, but GG is invalid
178+
input.append_value("537061726B2053514C"); // followed by valid
179+
180+
let input = ColumnarValue::Array(Arc::new(input.finish()));
181+
let fail_on_error = ColumnarValue::Scalar(ScalarValue::Boolean(Some(false)));
182+
183+
let result = super::spark_unhex(&[input, fail_on_error])?;
184+
185+
let mut expected = BinaryBuilder::new();
186+
expected.append_null();
187+
expected.append_value("Spark SQL".as_bytes());
188+
189+
match (result, ColumnarValue::Array(Arc::new(expected.finish()))) {
190+
(ColumnarValue::Array(result), ColumnarValue::Array(expected)) => {
191+
assert_eq!(*result, *expected);
192+
193+
Ok(())
194+
}
195+
_ => Err("Unexpected result type".into()),
196+
}
197+
}
198+
171199
#[test]
172200
fn test_unhex_valid() -> Result<(), Box<dyn std::error::Error>> {
173201
let mut result = Vec::new();

0 commit comments

Comments
 (0)