Skip to content

Commit a943de5

Browse files
committed
style: apply make format
1 parent 862ed2e commit a943de5

3 files changed

Lines changed: 11 additions & 10 deletions

File tree

native/core/src/execution/planner.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,10 @@ use datafusion_comet_proto::{
122122
spark_partitioning::{partitioning::PartitioningStruct, Partitioning as SparkPartitioning},
123123
};
124124
use datafusion_comet_spark_expr::{
125-
jvm_udf::JvmScalarUdfExpr,
126-
ArrayInsert, Avg, AvgDecimal, Cast, CheckOverflow, Correlation, Covariance, CreateNamedStruct,
127-
DecimalRescaleCheckOverflow, GetArrayStructFields, GetStructField, IfExpr, ListExtract,
128-
NormalizeNaNAndZero, SparkCastOptions, Stddev, SumDecimal, ToJson, UnboundColumn, Variance,
129-
WideDecimalBinaryExpr, WideDecimalOp,
125+
jvm_udf::JvmScalarUdfExpr, ArrayInsert, Avg, AvgDecimal, Cast, CheckOverflow, Correlation,
126+
Covariance, CreateNamedStruct, DecimalRescaleCheckOverflow, GetArrayStructFields,
127+
GetStructField, IfExpr, ListExtract, NormalizeNaNAndZero, SparkCastOptions, Stddev, SumDecimal,
128+
ToJson, UnboundColumn, Variance, WideDecimalBinaryExpr, WideDecimalOp,
130129
};
131130
use itertools::Itertools;
132131
use jni::objects::{Global, JObject};
@@ -708,9 +707,10 @@ impl PhysicalPlanner {
708707
.iter()
709708
.map(|e| self.create_expr(e, Arc::clone(&input_schema)))
710709
.collect::<Result<Vec<_>, _>>()?;
711-
let return_type = to_arrow_datatype(udf.return_type.as_ref().ok_or_else(|| {
712-
GeneralError("JvmScalarUdf missing return_type".to_string())
713-
})?);
710+
let return_type =
711+
to_arrow_datatype(udf.return_type.as_ref().ok_or_else(|| {
712+
GeneralError("JvmScalarUdf missing return_type".to_string())
713+
})?);
714714
Ok(Arc::new(JvmScalarUdfExpr::new(
715715
udf.class_name.clone(),
716716
args,

native/spark-expr/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ pub use cast::{spark_cast, Cast, SparkCastOptions};
5555
mod bloom_filter;
5656
pub use bloom_filter::{BloomFilterAgg, BloomFilterMightContain};
5757

58-
pub mod jvm_udf;
5958
mod conditional_funcs;
6059
mod conversion_funcs;
60+
pub mod jvm_udf;
6161
mod map_funcs;
6262
pub use map_funcs::spark_map_sort;
6363
mod math_funcs;

spark/src/test/scala/org/apache/comet/CometRegExpJvmSuite.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@
1919

2020
package org.apache.comet
2121

22+
import org.apache.spark.SparkConf
2223
import org.apache.spark.sql.CometTestBase
2324
import org.apache.spark.sql.comet.CometProjectExec
2425
import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper
2526

2627
class CometRegExpJvmSuite extends CometTestBase with AdaptiveSparkPlanHelper {
2728

28-
override protected def sparkConf =
29+
override protected def sparkConf: SparkConf =
2930
super.sparkConf.set("spark.comet.exec.regexp.useJVM", "true")
3031

3132
test("rlike: Java regex semantics, with flag on") {

0 commit comments

Comments
 (0)