fixup! fixup! WIP

apache · Aug 26, 2024 · e67b44b · e67b44b
1 parent eef0084
commit e67b44b
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 26 deletions.
diff --git a/datafusion-examples/examples/file_stream_provider.rs b/datafusion-examples/examples/file_stream_provider.rs
@@ -39,7 +39,7 @@ mod non_windows {
     use datafusion::datasource::TableProvider;
     use datafusion::prelude::{SessionConfig, SessionContext};
     use datafusion_common::{exec_err, Result};
-    use datafusion_expr::{SortExpr};
+    use datafusion_expr::SortExpr;
 
     // Number of lines written to FIFO
     const TEST_BATCH_SIZE: usize = 5;

diff --git a/datafusion/core/src/datasource/memory.rs b/datafusion/core/src/datasource/memory.rs
@@ -43,12 +43,12 @@ use datafusion_physical_plan::metrics::MetricsSet;
 
 use async_trait::async_trait;
 use datafusion_catalog::Session;
+use datafusion_expr::SortExpr;
 use futures::StreamExt;
 use log::debug;
 use parking_lot::Mutex;
 use tokio::sync::RwLock;
 use tokio::task::JoinSet;
-use datafusion_expr::SortExpr;
 
 /// Type alias for partition data
 pub type PartitionData = Arc<RwLock<Vec<RecordBatch>>>;

diff --git a/datafusion/core/src/datasource/mod.rs b/datafusion/core/src/datasource/mod.rs
@@ -78,9 +78,11 @@ fn create_ordering(
                     // since rest of the orderings are violated
                     Err(_) => break,
                 },
-                expr => return plan_err!(
+                expr => {
+                    return plan_err!(
                     "Expected single column references in output_ordering, got {expr}"
-                ),
+                )
+                }
             }
         }
         if !sort_exprs.is_empty() {

diff --git a/datafusion/core/tests/fifo/mod.rs b/datafusion/core/tests/fifo/mod.rs
@@ -38,7 +38,7 @@ mod unix_test {
     };
     use datafusion_common::instant::Instant;
     use datafusion_common::{exec_err, Result};
-    use datafusion_expr::{SortExpr};
+    use datafusion_expr::SortExpr;
 
     use futures::StreamExt;
     use nix::sys::stat;

diff --git a/datafusion/core/tests/user_defined/user_defined_plan.rs b/datafusion/core/tests/user_defined/user_defined_plan.rs
@@ -97,8 +97,8 @@ use datafusion::{
 use datafusion_common::config::ConfigOptions;
 use datafusion_common::tree_node::{Transformed, TransformedResult, TreeNode};
 use datafusion_common::ScalarValue;
-use datafusion_expr::{Projection, SortExpr};
 use datafusion_expr::tree_node::replace_sort_expression;
+use datafusion_expr::{Projection, SortExpr};
 use datafusion_optimizer::optimizer::ApplyOrder;
 use datafusion_optimizer::AnalyzerRule;
 

diff --git a/datafusion/expr/src/tree_node.rs b/datafusion/expr/src/tree_node.rs
@@ -423,4 +423,4 @@ pub fn replace_sort_expression(sort: Sort, new_expr: Expr) -> Sort {
         expr: Box::new(new_expr),
         ..sort
     }
-}
+}
diff --git a/datafusion/expr/src/utils.rs b/datafusion/expr/src/utils.rs
@@ -1361,8 +1361,7 @@ mod tests {
     use crate::{
         col, cube, expr, expr_vec_fmt, grouping_set, lit, rollup,
         test::function_stub::max_udaf, test::function_stub::min_udaf,
-        test::function_stub::sum_udaf, Cast, ExprFunctionExt,
-        WindowFunctionDefinition,
+        test::function_stub::sum_udaf, Cast, ExprFunctionExt, WindowFunctionDefinition,
     };
 
     #[test]

diff --git a/datafusion/proto/src/logical_plan/from_proto.rs b/datafusion/proto/src/logical_plan/from_proto.rs
@@ -24,7 +24,7 @@ use datafusion_common::{
 };
 use datafusion_expr::expr::{Alias, Placeholder, Sort};
 use datafusion_expr::expr::{Unnest, WildcardOptions};
-use datafusion_expr::{ExprFunctionExt};
+use datafusion_expr::ExprFunctionExt;
 use datafusion_expr::{
     expr::{self, InList, WindowFunction},
     logical_plan::{PlanType, StringifiedPlan},
@@ -644,8 +644,7 @@ pub fn parse_sort(
     sort: &protobuf::SortExprNode,
     registry: &dyn FunctionRegistry,
     codec: &dyn LogicalExtensionCodec,
-) -> Result<Sort, Error>
-{
+) -> Result<Sort, Error> {
     Ok(Sort::new(
         Box::new(parse_required_expr(
             sort.expr.as_deref(),

diff --git a/datafusion/proto/src/logical_plan/mod.rs b/datafusion/proto/src/logical_plan/mod.rs
@@ -54,18 +54,23 @@ use datafusion_common::{
     context, internal_datafusion_err, internal_err, not_impl_err, DataFusionError,
     Result, TableReference,
 };
-use datafusion_expr::{dml, logical_plan::{
-    builder::project, Aggregate, CreateCatalog, CreateCatalogSchema,
-    CreateExternalTable, CreateView, CrossJoin, DdlStatement, Distinct,
-    EmptyRelation, Extension, Join, JoinConstraint, Limit, Prepare, Projection,
-    Repartition, Sort, SubqueryAlias, TableScan, Values, Window,
-}, DistinctOn, DropView, Expr, LogicalPlan, LogicalPlanBuilder, ScalarUDF, WindowUDF, SortExpr};
+use datafusion_expr::{
+    dml,
+    logical_plan::{
+        builder::project, Aggregate, CreateCatalog, CreateCatalogSchema,
+        CreateExternalTable, CreateView, CrossJoin, DdlStatement, Distinct,
+        EmptyRelation, Extension, Join, JoinConstraint, Limit, Prepare, Projection,
+        Repartition, Sort, SubqueryAlias, TableScan, Values, Window,
+    },
+    DistinctOn, DropView, Expr, LogicalPlan, LogicalPlanBuilder, ScalarUDF, SortExpr,
+    WindowUDF,
+};
 use datafusion_expr::{AggregateUDF, Unnest};
 
 use self::to_proto::{serialize_expr, serialize_exprs};
+use crate::logical_plan::to_proto::serialize_sorts;
 use prost::bytes::BufMut;
 use prost::Message;
-use crate::logical_plan::to_proto::serialize_sorts;
 
 pub mod file_formats;
 pub mod from_proto;

diff --git a/datafusion/proto/src/logical_plan/to_proto.rs b/datafusion/proto/src/logical_plan/to_proto.rs
@@ -24,7 +24,11 @@ use datafusion_expr::expr::{
     self, Alias, Between, BinaryExpr, Cast, GroupingSet, InList, Like, Placeholder,
     ScalarFunction, Unnest,
 };
-use datafusion_expr::{logical_plan::PlanType, logical_plan::StringifiedPlan, BuiltInWindowFunction, Expr, JoinConstraint, JoinType, TryCast, WindowFrame, WindowFrameBound, WindowFrameUnits, WindowFunctionDefinition, SortExpr};
+use datafusion_expr::{
+    logical_plan::PlanType, logical_plan::StringifiedPlan, BuiltInWindowFunction, Expr,
+    JoinConstraint, JoinType, SortExpr, TryCast, WindowFrame, WindowFrameBound,
+    WindowFrameUnits, WindowFunctionDefinition,
+};
 
 use crate::protobuf::{
     self,

diff --git a/datafusion/sql/src/unparser/expr.rs b/datafusion/sql/src/unparser/expr.rs
@@ -1761,11 +1761,7 @@ mod tests {
                     fun: WindowFunctionDefinition::AggregateUDF(count_udaf()),
                     args: vec![wildcard()],
                     partition_by: vec![],
-                    order_by: vec![Sort::new(
-                        Box::new(col("a")),
-                        false,
-                        true,
-                    )],
+                    order_by: vec![Sort::new(Box::new(col("a")), false, true)],
                     window_frame: WindowFrame::new_bounds(
                         datafusion_expr::WindowFrameUnits::Range,
                         datafusion_expr::WindowFrameBound::Preceding(

diff --git a/datafusion/substrait/src/logical_plan/consumer.rs b/datafusion/substrait/src/logical_plan/consumer.rs
@@ -29,7 +29,10 @@ use datafusion::common::{
 use datafusion::execution::FunctionRegistry;
 use datafusion::logical_expr::expr::{Exists, InSubquery, Sort};
 
-use datafusion::logical_expr::{expr::find_df_window_func, Aggregate, BinaryExpr, Case, EmptyRelation, Expr, ExprSchemable, LogicalPlan, Operator, Projection, Values, SortExpr};
+use datafusion::logical_expr::{
+    expr::find_df_window_func, Aggregate, BinaryExpr, Case, EmptyRelation, Expr,
+    ExprSchemable, LogicalPlan, Operator, Projection, SortExpr, Values,
+};
 use substrait::proto::expression::subquery::set_predicate::PredicateOp;
 use url::Url;
-Original file line number
+Diff line change
@@ Expand Up @@
             expr: Box::new(new_expr),
             ..sort
         }
-    }
+    }