-
Notifications
You must be signed in to change notification settings - Fork 264
fix: null character not permitted in chr function #513
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.
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
Changes from 8 commits
ac34c1a
9399c13
146cbb0
42b5b26
58a4d81
a0ab369
d21227e
10992bc
a3ab124
c80ac59
b42d9e3
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| use std::{any::Any, sync::Arc}; | ||
|
|
||
| use arrow::{ | ||
| array::{ArrayRef, StringArray}, | ||
| datatypes::{ | ||
| DataType, | ||
| DataType::{Int64, Utf8}, | ||
| }, | ||
| }; | ||
|
|
||
| use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility}; | ||
| use datafusion_common::{cast::as_int64_array, exec_err, DataFusionError, Result, ScalarValue}; | ||
|
|
||
| /// Returns the ASCII character having the binary equivalent to the input expression. | ||
| /// E.g., chr(65) = 'A'. | ||
| /// Compatible with Apache Spark's Chr function | ||
| pub fn spark_chr(args: &[ColumnarValue]) -> Result<ColumnarValue, DataFusionError> { | ||
| let chr_func = ChrFunc::default(); | ||
| chr_func.invoke(args) | ||
| } | ||
|
|
||
| pub fn chr(args: &[ArrayRef]) -> Result<ArrayRef> { | ||
| let integer_array = as_int64_array(&args[0])?; | ||
|
|
||
| // first map is the iterator, second is for the `Option<_>` | ||
| let result = integer_array | ||
| .iter() | ||
| .map(|integer: Option<i64>| { | ||
| integer | ||
| .map(|integer| match core::char::from_u32(integer as u32) { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Spark
Does
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Seems this is for the issue of null char, it is okay to fix it in follow up.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes i am tracking that, #480 is the one I will work on next. That one handles the cases you mentioned above! |
||
| Some(integer) => Ok(integer.to_string()), | ||
| None => { | ||
| exec_err!("requested character too large for encoding.") | ||
| } | ||
| }) | ||
| .transpose() | ||
| }) | ||
| .collect::<Result<StringArray>>()?; | ||
|
|
||
| Ok(Arc::new(result) as ArrayRef) | ||
| } | ||
|
|
||
| #[derive(Debug)] | ||
| pub struct ChrFunc { | ||
| signature: Signature, | ||
| } | ||
|
|
||
| impl Default for ChrFunc { | ||
| fn default() -> Self { | ||
| Self::new() | ||
| } | ||
| } | ||
|
|
||
| impl ChrFunc { | ||
| pub fn new() -> Self { | ||
| Self { | ||
| signature: Signature::uniform(1, vec![Int64], Volatility::Immutable), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl ScalarUDFImpl for ChrFunc { | ||
| fn as_any(&self) -> &dyn Any { | ||
| self | ||
| } | ||
|
|
||
| fn name(&self) -> &str { | ||
| "chr" | ||
| } | ||
|
|
||
| fn signature(&self) -> &Signature { | ||
| &self.signature | ||
| } | ||
|
|
||
| fn return_type(&self, _arg_types: &[DataType]) -> Result<DataType> { | ||
| Ok(Utf8) | ||
| } | ||
|
|
||
| fn invoke(&self, args: &[ColumnarValue]) -> Result<ColumnarValue> { | ||
| make_scalar_function(chr)(args) | ||
| } | ||
| } | ||
|
|
||
| /// The make_scalar_function function is a higher-order function that: | ||
| /// - Takes a function inner designed to operate on arrays. | ||
| /// - Wraps this function in a closure that can accept a mix of scalar and array inputs. | ||
| /// - Converts scalar inputs to arrays, calls the inner function, and then converts the result back to a scalar if the original inputs were all scalars. | ||
| /// | ||
| /// taken from datafusion utils | ||
|
|
||
| fn make_scalar_function<F>(inner: F) -> impl Fn(&[ColumnarValue]) -> Result<ColumnarValue> | ||
vaibhawvipul marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| where | ||
| F: Fn(&[ArrayRef]) -> Result<ArrayRef> + Sync + Send + 'static, | ||
| { | ||
| move |args: &[ColumnarValue]| { | ||
| // first, identify if any of the arguments is an Array. If yes, store its `len`, | ||
| // as any scalar will need to be converted to an array of len `len`. | ||
| let len = args | ||
| .iter() | ||
| .fold(Option::<usize>::None, |acc, arg| match arg { | ||
| ColumnarValue::Scalar(_) => acc, | ||
| ColumnarValue::Array(a) => Some(a.len()), | ||
| }); | ||
|
|
||
| let is_scalar = len.is_none(); | ||
|
|
||
| let args = ColumnarValue::values_to_arrays(args)?; | ||
|
|
||
| let result = (inner)(&args); | ||
|
|
||
| if is_scalar { | ||
| // If all inputs are scalar, keeps output as scalar | ||
| let result = result.and_then(|arr| ScalarValue::try_from_array(&arr, 0)); | ||
| result.map(ColumnarValue::Scalar) | ||
| } else { | ||
| result.map(ColumnarValue::Array) | ||
| } | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -980,6 +980,23 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper { | |
| } | ||
| } | ||
|
|
||
| test("Chr with null character") { | ||
| // test compatibility with Spark, spark supports chr(0) | ||
| Seq(false, true).foreach { dictionary => | ||
| withSQLConf( | ||
| "parquet.enable.dictionary" -> dictionary.toString, | ||
| CometConf.COMET_CAST_ALLOW_INCOMPATIBLE.key -> "true") { | ||
| val table = "test0" | ||
| withTable(table) { | ||
| sql(s"create table $table(c9 int, c4 int) using parquet") | ||
| sql(s"insert into $table values(0, 0), (66, null), (null, 70), (null, null)") | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd like to see a wider range of values being tested here such as large numbers and negative numbers
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Actually, ignore that. We have a separate issue related to large/negative numbers: #480 |
||
| val query = s"SELECT chr(c9), chr(c4) FROM $table" | ||
| checkSparkAnswerAndOperator(query) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| test("InitCap") { | ||
| Seq(false, true).foreach { dictionary => | ||
| withSQLConf("parquet.enable.dictionary" -> dictionary.toString) { | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.