Skip to content

Commit d8c62f3

Browse files
authored
chore: Use chr function from datafusion-spark (#2080)
1 parent 78ea0bf commit d8c62f3

File tree

5 files changed

+4
-133
lines changed

5 files changed

+4
-133
lines changed

native/core/src/execution/jni_api.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ use datafusion::{
4242
use datafusion_comet_proto::spark_operator::Operator;
4343
use datafusion_spark::function::hash::sha2::SparkSha2;
4444
use datafusion_spark::function::math::expm1::SparkExpm1;
45+
use datafusion_spark::function::string::char::SparkChar;
4546
use futures::poll;
4647
use futures::stream::StreamExt;
4748
use jni::objects::JByteBuffer;
@@ -290,6 +291,7 @@ fn prepare_datafusion_session_context(
290291
// register UDFs from datafusion-spark crate
291292
session_ctx.register_udf(ScalarUDF::new_from_impl(SparkExpm1::default()));
292293
session_ctx.register_udf(ScalarUDF::new_from_impl(SparkSha2::default()));
294+
session_ctx.register_udf(ScalarUDF::new_from_impl(SparkChar::default()));
293295

294296
// Must be the last one to override existing functions with the same name
295297
datafusion_comet_spark_expr::register_all_comet_functions(&mut session_ctx)?;

native/spark-expr/src/comet_scalar_funcs.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ use crate::{
2121
spark_array_repeat, spark_ceil, spark_date_add, spark_date_sub, spark_decimal_div,
2222
spark_decimal_integral_div, spark_floor, spark_hex, spark_isnan, spark_make_decimal,
2323
spark_read_side_padding, spark_round, spark_rpad, spark_unhex, spark_unscaled_value,
24-
SparkBitwiseCount, SparkBitwiseGet, SparkBitwiseNot, SparkChrFunc, SparkDateTrunc,
25-
SparkStringSpace,
24+
SparkBitwiseCount, SparkBitwiseGet, SparkBitwiseNot, SparkDateTrunc, SparkStringSpace,
2625
};
2726
use arrow::datatypes::DataType;
2827
use datafusion::common::{DataFusionError, Result as DataFusionResult};
@@ -155,7 +154,6 @@ pub fn create_comet_physical_fun(
155154

156155
fn all_scalar_functions() -> Vec<Arc<ScalarUDF>> {
157156
vec![
158-
Arc::new(ScalarUDF::new_from_impl(SparkChrFunc::default())),
159157
Arc::new(ScalarUDF::new_from_impl(SparkBitwiseNot::default())),
160158
Arc::new(ScalarUDF::new_from_impl(SparkBitwiseCount::default())),
161159
Arc::new(ScalarUDF::new_from_impl(SparkBitwiseGet::default())),

native/spark-expr/src/string_funcs/chr.rs

Lines changed: 0 additions & 127 deletions
This file was deleted.

native/spark-expr/src/string_funcs/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
mod chr;
1918
mod string_space;
2019
mod substring;
2120

22-
pub use chr::SparkChrFunc;
2321
pub use string_space::SparkStringSpace;
2422
pub use substring::SubstringExpr;

spark/src/main/scala/org/apache/comet/serde/strings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ object CometChr extends CometExpressionSerde {
287287
binding: Boolean): Option[Expr] = {
288288
val child = expr.children.head
289289
val childExpr = exprToProtoInternal(child, inputs, binding)
290-
val optExpr = scalarFunctionExprToProto("chr", childExpr)
290+
val optExpr = scalarFunctionExprToProto("char", childExpr)
291291
optExprWithInfo(optExpr, expr, child)
292292
}
293293
}

0 commit comments

Comments
 (0)