Skip to content

Commit 88dbe0b

Browse files
backport
1 parent f93d2da commit 88dbe0b

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

datafusion/expr/src/expr_fn.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ use arrow::datatypes::{DataType, Field, FieldRef};
4242
use datafusion_common::{plan_err, Column, Result, ScalarValue, Spans, TableReference};
4343
use datafusion_functions_window_common::field::WindowUDFFieldArgs;
4444
use datafusion_functions_window_common::partition::PartitionEvaluatorArgs;
45-
use sqlparser::ast::NullTreatment;
4645
use datafusion_physical_expr_common::physical_expr::PhysicalExpr;
46+
use sqlparser::ast::NullTreatment;
4747
use std::any::Any;
4848
use std::fmt::Debug;
4949
use std::hash::Hash;

datafusion/expr/src/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,8 @@ pub use udaf::{
111111
pub use udf::{
112112
scalar_doc_sections, ReturnFieldArgs, ScalarFunctionArgs, ScalarUDF, ScalarUDFImpl,
113113
};
114-
pub use udwf::{window_doc_sections, ReversedUDWF, WindowUDF, WindowUDFImpl};
115-
pub use udf::{ReturnFieldArgs, ScalarFunctionArgs, ScalarUDF, ScalarUDFImpl};
116-
pub use udwf::{LimitEffect, ReversedUDWF, WindowUDF, WindowUDFImpl};
114+
pub use udwf::{window_doc_sections, ReversedUDWF, WindowUDF};
115+
pub use udwf::{LimitEffect, WindowUDFImpl};
117116
pub use window_frame::{WindowFrame, WindowFrameBound, WindowFrameUnits};
118117

119118
#[cfg(test)]

datafusion/physical-optimizer/src/limit_pushdown_past_window.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ use datafusion_physical_plan::execution_plan::CardinalityEffect;
2828
use datafusion_physical_plan::limit::GlobalLimitExec;
2929
use datafusion_physical_plan::repartition::RepartitionExec;
3030
use datafusion_physical_plan::sorts::sort::SortExec;
31+
use datafusion_physical_plan::sorts::sort_preserving_merge::SortPreservingMergeExec;
3132
use datafusion_physical_plan::windows::{BoundedWindowAggExec, WindowUDFExpr};
3233
use datafusion_physical_plan::{ExecutionPlan, ExecutionPlanProperties};
3334
use std::cmp;

datafusion/proto/tests/cases/roundtrip_logical_plan.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,9 @@ use datafusion_expr::expr::{
7777
use datafusion_expr::logical_plan::{Extension, UserDefinedLogicalNodeCore};
7878
use datafusion_expr::{
7979
Accumulator, AggregateUDF, ColumnarValue, ExprFunctionExt, ExprSchemable,
80-
LimitEffect, Literal, LogicalPlan, Operator, PartitionEvaluator,
81-
ScalarUDF, Signature, TryCast, Volatility,
82-
WindowFrame, WindowFrameBound,
83-
WindowFrameUnits, WindowFunctionDefinition, WindowUDF,
84-
WindowUDFImpl,
80+
LimitEffect, Literal, LogicalPlan, Operator, PartitionEvaluator, ScalarUDF,
81+
Signature, TryCast, Volatility, WindowFrame, WindowFrameBound, WindowFrameUnits,
82+
WindowFunctionDefinition, WindowUDF, WindowUDFImpl,
8583
};
8684
use datafusion_functions_aggregate::average::avg_udaf;
8785
use datafusion_functions_aggregate::expr_fn::{

0 commit comments

Comments
 (0)