Skip to content

Chore: refactor bit_count #2553

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Chore: refactor bit_count #2553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions native/core/src/execution/jni_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ use datafusion::{
prelude::{SessionConfig, SessionContext},
};
use datafusion_comet_proto::spark_operator::Operator;
use datafusion_spark::function::bitwise::bit_count::SparkBitCount;
use datafusion_spark::function::bitwise::bit_get::SparkBitGet;
use datafusion_spark::function::datetime::date_add::SparkDateAdd;
use datafusion_spark::function::datetime::date_sub::SparkDateSub;
Expand Down Expand Up @@ -332,6 +333,7 @@ fn prepare_datafusion_session_context(
session_ctx.register_udf(ScalarUDF::new_from_impl(SparkBitGet::default()));
session_ctx.register_udf(ScalarUDF::new_from_impl(SparkDateAdd::default()));
session_ctx.register_udf(ScalarUDF::new_from_impl(SparkDateSub::default()));
session_ctx.register_udf(ScalarUDF::new_from_impl(SparkBitCount::default()));

// Must be the last one to override existing functions with the same name
datafusion_comet_spark_expr::register_all_comet_functions(&mut session_ctx)?;
Expand Down
148 changes: 0 additions & 148 deletions native/spark-expr/src/bitwise_funcs/bitwise_count.rs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions native/spark-expr/src/bitwise_funcs/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
// specific language governing permissions and limitations
// under the License.

mod bitwise_count;
mod bitwise_not;

pub use bitwise_count::SparkBitwiseCount;
pub use bitwise_not::SparkBitwiseNot;
5 changes: 2 additions & 3 deletions native/spark-expr/src/comet_scalar_funcs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ use crate::math_funcs::modulo_expr::spark_modulo;
use crate::{
spark_array_repeat, spark_ceil, spark_decimal_div, spark_decimal_integral_div, spark_floor,
spark_hex, spark_isnan, spark_lpad, spark_make_decimal, spark_read_side_padding, spark_round,
spark_rpad, spark_unhex, spark_unscaled_value, EvalMode, SparkBitwiseCount, SparkBitwiseNot,
SparkDateTrunc, SparkStringSpace,
spark_rpad, spark_unhex, spark_unscaled_value, EvalMode, SparkBitwiseNot, SparkDateTrunc,
SparkStringSpace,
};
use arrow::datatypes::DataType;
use datafusion::common::{DataFusionError, Result as DataFusionResult};
Expand Down Expand Up @@ -191,7 +191,6 @@ pub fn create_comet_physical_fun_with_eval_mode(
fn all_scalar_functions() -> Vec<Arc<ScalarUDF>> {
vec![
Arc::new(ScalarUDF::new_from_impl(SparkBitwiseNot::default())),
Arc::new(ScalarUDF::new_from_impl(SparkBitwiseCount::default())),
Arc::new(ScalarUDF::new_from_impl(SparkDateTrunc::default())),
Arc::new(ScalarUDF::new_from_impl(SparkStringSpace::default())),
]
Expand Down
25 changes: 2 additions & 23 deletions spark/src/main/scala/org/apache/comet/serde/bitwise.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,27 +127,6 @@ object CometShiftLeft extends CometExpressionSerde[ShiftLeft] {
}
}

object CometBitwiseGet extends CometExpressionSerde[BitwiseGet] {
override def convert(
expr: BitwiseGet,
inputs: Seq[Attribute],
binding: Boolean): Option[ExprOuterClass.Expr] = {
val argProto = exprToProto(expr.left, inputs, binding)
val posProto = exprToProto(expr.right, inputs, binding)
val bitGetScalarExpr =
scalarFunctionExprToProtoWithReturnType("bit_get", ByteType, argProto, posProto)
optExprWithInfo(bitGetScalarExpr, expr, expr.children: _*)
}
}
object CometBitwiseGet extends CometScalarFunction[BitwiseGet]("bit_get")

object CometBitwiseCount extends CometExpressionSerde[BitwiseCount] {
override def convert(
expr: BitwiseCount,
inputs: Seq[Attribute],
binding: Boolean): Option[ExprOuterClass.Expr] = {
val childProto = exprToProto(expr.child, inputs, binding)
val bitCountScalarExpr =
scalarFunctionExprToProtoWithReturnType("bit_count", IntegerType, childProto)
optExprWithInfo(bitCountScalarExpr, expr, expr.children: _*)
}
}
object CometBitwiseCount extends CometScalarFunction[BitwiseCount]("bit_count")
Loading