Skip to content

Commit 0d2c5fc

Browse files
kazantsev-maksimKazantsev Maksim
andauthored
Use DataFusion impl of bit_get function (#2466)
Co-authored-by: Kazantsev Maksim <[email protected]>
1 parent b5e8316 commit 0d2c5fc

File tree

4 files changed

+3
-321
lines changed

4 files changed

+3
-321
lines changed

native/core/src/execution/jni_api.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ use datafusion::{
4040
prelude::{SessionConfig, SessionContext},
4141
};
4242
use datafusion_comet_proto::spark_operator::Operator;
43+
use datafusion_spark::function::bitwise::bit_get::SparkBitGet;
4344
use datafusion_spark::function::hash::sha2::SparkSha2;
4445
use datafusion_spark::function::math::expm1::SparkExpm1;
4546
use datafusion_spark::function::string::char::CharFunc;
@@ -301,6 +302,7 @@ fn prepare_datafusion_session_context(
301302
session_ctx.register_udf(ScalarUDF::new_from_impl(SparkExpm1::default()));
302303
session_ctx.register_udf(ScalarUDF::new_from_impl(SparkSha2::default()));
303304
session_ctx.register_udf(ScalarUDF::new_from_impl(CharFunc::default()));
305+
session_ctx.register_udf(ScalarUDF::new_from_impl(SparkBitGet::default()));
304306

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

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

Lines changed: 0 additions & 317 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,9 +16,7 @@
1616
// under the License.
1717

1818
mod bitwise_count;
19-
mod bitwise_get;
2019
mod bitwise_not;
2120

2221
pub use bitwise_count::SparkBitwiseCount;
23-
pub use bitwise_get::SparkBitwiseGet;
2422
pub use bitwise_not::SparkBitwiseNot;

native/spark-expr/src/comet_scalar_funcs.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use crate::{
2222
spark_array_repeat, spark_ceil, spark_date_add, spark_date_sub, spark_decimal_div,
2323
spark_decimal_integral_div, spark_floor, spark_hex, spark_isnan, spark_make_decimal,
2424
spark_read_side_padding, spark_round, spark_rpad, spark_unhex, spark_unscaled_value, EvalMode,
25-
SparkBitwiseCount, SparkBitwiseGet, SparkBitwiseNot, SparkDateTrunc, SparkStringSpace,
25+
SparkBitwiseCount, SparkBitwiseNot, SparkDateTrunc, SparkStringSpace,
2626
};
2727
use arrow::datatypes::DataType;
2828
use datafusion::common::{DataFusionError, Result as DataFusionResult};
@@ -195,7 +195,6 @@ fn all_scalar_functions() -> Vec<Arc<ScalarUDF>> {
195195
vec![
196196
Arc::new(ScalarUDF::new_from_impl(SparkBitwiseNot::default())),
197197
Arc::new(ScalarUDF::new_from_impl(SparkBitwiseCount::default())),
198-
Arc::new(ScalarUDF::new_from_impl(SparkBitwiseGet::default())),
199198
Arc::new(ScalarUDF::new_from_impl(SparkDateTrunc::default())),
200199
Arc::new(ScalarUDF::new_from_impl(SparkStringSpace::default())),
201200
]

0 commit comments

Comments
 (0)