Skip to content

feat: The "character_length" function handle "Binary" type #7350

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

Closed
wants to merge 6 commits into from
Closed

feat: The "character_length" function handle "Binary" type #7350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e750c08
init fix error, with many untests code
parkma99 Aug 21, 2023
214f3b9
add test case and handle largebinary
parkma99 Aug 22, 2023
7f59173
use coerce_arguments_for_fun
parkma99 Aug 24, 2023
3f679e2
fix
parkma99 Aug 24, 2023
91c4040
fix
parkma99 Aug 24, 2023
a41a73e
add test
parkma99 Aug 24, 2023
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
8 changes: 4 additions & 4 deletions datafusion/expr/src/built_in_function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,8 @@ impl BuiltinScalarFunction {
conditional_expressions::SUPPORTED_COALESCE_TYPES.to_vec(),
self.volatility(),
),
BuiltinScalarFunction::SHA224
BuiltinScalarFunction::CharacterLength
| BuiltinScalarFunction::SHA224
| BuiltinScalarFunction::SHA256
| BuiltinScalarFunction::SHA384
| BuiltinScalarFunction::SHA512
Expand All @@ -883,7 +884,6 @@ impl BuiltinScalarFunction {
),
BuiltinScalarFunction::Ascii
| BuiltinScalarFunction::BitLength
| BuiltinScalarFunction::CharacterLength
| BuiltinScalarFunction::InitCap
| BuiltinScalarFunction::Lower
| BuiltinScalarFunction::OctetLength
Expand Down Expand Up @@ -1392,8 +1392,8 @@ macro_rules! make_utf8_to_return_type {
($FUNC:ident, $largeUtf8Type:expr, $utf8Type:expr) => {
fn $FUNC(arg_type: &DataType, name: &str) -> Result<DataType> {
Ok(match arg_type {
DataType::LargeUtf8 => $largeUtf8Type,
DataType::Utf8 => $utf8Type,
DataType::LargeUtf8 | DataType::LargeBinary => $largeUtf8Type,
DataType::Utf8 | DataType::Binary => $utf8Type,
DataType::Null => DataType::Null,
DataType::Dictionary(_, value_type) => {
match **value_type {
Expand Down
14 changes: 14 additions & 0 deletions datafusion/optimizer/src/analyzer/type_coercion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,20 @@ fn coerce_arguments_for_fun(
.map(|(expr, from_type)| cast_array_expr(expr, &from_type, &new_type, schema))
.collect();
}

if *fun == BuiltinScalarFunction::CharacterLength {
expressions = expressions
.into_iter()
.map(|expr| {
let data_type = expr.get_type(schema).unwrap();
if let DataType::Binary = data_type {
expr.cast_to(&DataType::Utf8, schema)
} else {
Ok(expr)
}
})
.collect::<Result<Vec<_>>>()?;
}
Ok(expressions)
}

Expand Down
5 changes: 5 additions & 0 deletions datafusion/sqllogictest/test_files/functions.slt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ SELECT character_length('josé')
----
4

query I
SELECT character_length(X'6a6f73c3a9')
----
4

query ?
SELECT character_length(NULL)
----
Expand Down