Skip to content

Commit 9095c86

Browse files
kazantsev-maksimKazantsev Maksim
andauthored
chore: Refactor bit_not (apache#2896)
Co-authored-by: Kazantsev Maksim <mn.kazantsev@gmail.com>
1 parent 7282d57 commit 9095c86

5 files changed

Lines changed: 5 additions & 156 deletions

File tree

native/core/src/execution/jni_api.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ use datafusion::{
4141
};
4242
use datafusion_comet_proto::spark_operator::Operator;
4343
use datafusion_spark::function::bitwise::bit_get::SparkBitGet;
44+
use datafusion_spark::function::bitwise::bitwise_not::SparkBitwiseNot;
4445
use datafusion_spark::function::datetime::date_add::SparkDateAdd;
4546
use datafusion_spark::function::datetime::date_sub::SparkDateSub;
4647
use datafusion_spark::function::hash::sha1::SparkSha1;
@@ -335,6 +336,7 @@ fn register_datafusion_spark_function(session_ctx: &SessionContext) {
335336
session_ctx.register_udf(ScalarUDF::new_from_impl(SparkDateSub::default()));
336337
session_ctx.register_udf(ScalarUDF::new_from_impl(SparkSha1::default()));
337338
session_ctx.register_udf(ScalarUDF::new_from_impl(SparkConcat::default()));
339+
session_ctx.register_udf(ScalarUDF::new_from_impl(SparkBitwiseNot::default()));
338340
}
339341

340342
/// Prepares arrow arrays for output.

native/spark-expr/src/bitwise_funcs/bitwise_not.rs

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

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,5 @@
1616
// under the License.
1717

1818
mod bitwise_count;
19-
mod bitwise_not;
2019

2120
pub use bitwise_count::SparkBitwiseCount;
22-
pub use bitwise_not::SparkBitwiseNot;

native/spark-expr/src/comet_scalar_funcs.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ use crate::math_funcs::modulo_expr::spark_modulo;
2222
use crate::{
2323
spark_array_repeat, spark_ceil, spark_decimal_div, spark_decimal_integral_div, spark_floor,
2424
spark_hex, spark_isnan, spark_lpad, spark_make_decimal, spark_read_side_padding, spark_round,
25-
spark_rpad, spark_unhex, spark_unscaled_value, EvalMode, SparkBitwiseCount, SparkBitwiseNot,
26-
SparkDateTrunc, SparkStringSpace,
25+
spark_rpad, spark_unhex, spark_unscaled_value, EvalMode, SparkBitwiseCount, SparkDateTrunc,
26+
SparkStringSpace,
2727
};
2828
use arrow::datatypes::DataType;
2929
use datafusion::common::{DataFusionError, Result as DataFusionResult};
@@ -195,7 +195,6 @@ pub fn create_comet_physical_fun_with_eval_mode(
195195

196196
fn all_scalar_functions() -> Vec<Arc<ScalarUDF>> {
197197
vec![
198-
Arc::new(ScalarUDF::new_from_impl(SparkBitwiseNot::default())),
199198
Arc::new(ScalarUDF::new_from_impl(SparkBitwiseCount::default())),
200199
Arc::new(ScalarUDF::new_from_impl(SparkDateTrunc::default())),
201200
Arc::new(ScalarUDF::new_from_impl(SparkStringSpace::default())),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ object CometBitwiseNot extends CometExpressionSerde[BitwiseNot] {
4646
binding: Boolean): Option[ExprOuterClass.Expr] = {
4747
val childProto = exprToProto(expr.child, inputs, binding)
4848
val bitNotScalarExpr =
49-
scalarFunctionExprToProto("bit_not", childProto)
49+
scalarFunctionExprToProto("bitwise_not", childProto)
5050
optExprWithInfo(bitNotScalarExpr, expr, expr.children: _*)
5151
}
5252
}

0 commit comments

Comments
 (0)