cargo fix

kwai · Jan 8, 2025 · 40c6ff6 · 40c6ff6
1 parent 5a00013
commit 40c6ff6
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/native-engine/blaze-serde/src/from_proto.rs b/native-engine/blaze-serde/src/from_proto.rs
@@ -1144,9 +1144,7 @@ pub fn parse_protobuf_partitioning(
             ))
         })?;
         match plan {
-            RepartitionType::SingleRepartition(..) => {
-                Ok(Some(Partitioning::SinglePartitioning()))
-            }
+            RepartitionType::SingleRepartition(..) => Ok(Some(Partitioning::SinglePartitioning())),
             RepartitionType::HashRepartition(hash_part) => {
                 // let hash_part = p.hash_repartition;
                 let expr = hash_part

diff --git a/native-engine/datafusion-ext-plans/src/rss_shuffle_writer_exec.rs b/native-engine/datafusion-ext-plans/src/rss_shuffle_writer_exec.rs
@@ -18,11 +18,18 @@ use std::{any::Any, fmt::Debug, sync::Arc};
 
 use async_trait::async_trait;
 use blaze_jni_bridge::{jni_call_static, jni_new_global_ref, jni_new_string};
-use datafusion::{arrow::datatypes::SchemaRef, error::{DataFusionError, Result}, execution::context::TaskContext, physical_expr::EquivalenceProperties, physical_plan::{
-    metrics::{ExecutionPlanMetricsSet, MetricsSet},
-    DisplayAs, DisplayFormatType, ExecutionMode, ExecutionPlan, PlanProperties,
-    SendableRecordBatchStream, Statistics,
-}, physical_plan};
+use datafusion::{
+    arrow::datatypes::SchemaRef,
+    error::{DataFusionError, Result},
+    execution::context::TaskContext,
+    physical_expr::EquivalenceProperties,
+    physical_plan,
+    physical_plan::{
+        metrics::{ExecutionPlanMetricsSet, MetricsSet},
+        DisplayAs, DisplayFormatType, ExecutionMode, ExecutionPlan, PlanProperties,
+        SendableRecordBatchStream, Statistics,
+    },
+};
 use once_cell::sync::OnceCell;
 
 use crate::{

diff --git a/native-engine/datafusion-ext-plans/src/shuffle/mod.rs b/native-engine/datafusion-ext-plans/src/shuffle/mod.rs
@@ -128,9 +128,7 @@ impl Partitioning {
     pub fn partition_count(&self) -> usize {
         use Partitioning::*;
         match self {
-            RoundRobinPartitioning(n)
-            | HashPartitioning(_, n)
-            | RangePartitioning(_, n, _) => *n,
+            RoundRobinPartitioning(n) | HashPartitioning(_, n) | RangePartitioning(_, n, _) => *n,
             SinglePartitioning() => 1,
         }
     }

diff --git a/native-engine/datafusion-ext-plans/src/shuffle_writer_exec.rs b/native-engine/datafusion-ext-plans/src/shuffle_writer_exec.rs
@@ -18,11 +18,17 @@ use std::{any::Any, fmt::Debug, sync::Arc};
 
 use arrow::datatypes::SchemaRef;
 use async_trait::async_trait;
-use datafusion::{error::Result, execution::context::TaskContext, physical_expr::{expressions::Column, EquivalenceProperties, PhysicalSortExpr}, physical_plan::{
-    metrics::{ExecutionPlanMetricsSet, MetricsSet},
-    DisplayAs, DisplayFormatType, ExecutionMode, ExecutionPlan, PlanProperties,
-    SendableRecordBatchStream, Statistics,
-}, physical_plan};
+use datafusion::{
+    error::Result,
+    execution::context::TaskContext,
+    physical_expr::{expressions::Column, EquivalenceProperties, PhysicalSortExpr},
+    physical_plan,
+    physical_plan::{
+        metrics::{ExecutionPlanMetricsSet, MetricsSet},
+        DisplayAs, DisplayFormatType, ExecutionMode, ExecutionPlan, PlanProperties,
+        SendableRecordBatchStream, Statistics,
+    },
+};
 use datafusion_ext_commons::df_execution_err;
 use once_cell::sync::OnceCell;