Skip to content

Commit 88bdcde

Browse files
committed
refactor: remove scalar handling
1 parent 5e17897 commit 88bdcde

1 file changed

Lines changed: 2 additions & 30 deletions

File tree

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

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

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use arrow_schema::DataType;
2626
use datafusion::logical_expr::ColumnarValue;
2727
use datafusion_common::{
2828
cast::{as_binary_array, as_fixed_size_binary_array, as_int64_array},
29-
exec_err, DataFusionError, ScalarValue,
29+
exec_err, DataFusionError,
3030
};
3131
use std::fmt::Write;
3232

@@ -156,35 +156,7 @@ pub(super) fn spark_hex(args: &[ColumnarValue]) -> Result<ColumnarValue, DataFus
156156
array.data_type()
157157
),
158158
},
159-
ColumnarValue::Scalar(scalar) => match scalar {
160-
ScalarValue::Int64(Some(v)) => {
161-
let hex_string = hex_int64(*v);
162-
163-
Ok(ColumnarValue::Scalar(ScalarValue::Utf8(Some(hex_string))))
164-
}
165-
ScalarValue::Binary(Some(v))
166-
| ScalarValue::LargeBinary(Some(v))
167-
| ScalarValue::FixedSizeBinary(_, Some(v)) => {
168-
let hex_string = hex_bytes(v)?;
169-
170-
Ok(ColumnarValue::Scalar(ScalarValue::Utf8(Some(hex_string))))
171-
}
172-
ScalarValue::Utf8(Some(v)) | ScalarValue::LargeUtf8(Some(v)) => {
173-
let hex_string = hex_bytes(v)?;
174-
175-
Ok(ColumnarValue::Scalar(ScalarValue::Utf8(Some(hex_string))))
176-
}
177-
ScalarValue::Int64(None)
178-
| ScalarValue::Utf8(None)
179-
| ScalarValue::Binary(None)
180-
| ScalarValue::FixedSizeBinary(_, None) => {
181-
Ok(ColumnarValue::Scalar(ScalarValue::Utf8(None)))
182-
}
183-
_ => exec_err!(
184-
"hex got an unexpected argument type: {:?}",
185-
scalar.data_type()
186-
),
187-
},
159+
_ => exec_err!("native hex does not support scalar values at this time"),
188160
}
189161
}
190162

0 commit comments

Comments
 (0)