Skip to content

Commit 9b55465

Browse files
committed
clippy
1 parent d1c1b09 commit 9b55465

File tree

6 files changed

+22
-39
lines changed

6 files changed

+22
-39
lines changed

datafusion/core/tests/physical_optimizer/enforce_sorting.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,19 @@ use std::sync::Arc;
2020
use crate::physical_optimizer::test_utils::{
2121
aggregate_exec, bounded_window_exec, check_integrity, coalesce_batches_exec,
2222
coalesce_partitions_exec, create_test_schema, create_test_schema2,
23-
create_test_schema3, create_test_schema4, filter_exec, global_limit_exec,
24-
hash_join_exec, limit_exec, local_limit_exec, memory_exec, parquet_exec,
25-
repartition_exec, sort_exec, sort_expr, sort_expr_options, sort_merge_join_exec,
26-
sort_preserving_merge_exec, sort_preserving_merge_exec_with_fetch,
27-
spr_repartition_exec, stream_exec_ordered, union_exec, RequirementsTestExec,
23+
create_test_schema3, filter_exec, global_limit_exec, hash_join_exec, limit_exec,
24+
local_limit_exec, memory_exec, parquet_exec, repartition_exec, sort_exec, sort_expr,
25+
sort_expr_options, sort_merge_join_exec, sort_preserving_merge_exec,
26+
sort_preserving_merge_exec_with_fetch, spr_repartition_exec, stream_exec_ordered,
27+
union_exec, RequirementsTestExec,
2828
};
2929

3030
use datafusion_physical_plan::{displayable, InputOrderMode};
3131
use arrow::compute::SortOptions;
3232
use arrow::datatypes::SchemaRef;
33-
use datafusion_common::Result;
34-
use datafusion_expr::JoinType;
33+
use arrow_schema::DataType;
34+
use datafusion_common::{Result, ScalarValue};
35+
use datafusion_expr::{JoinType, WindowFrame, WindowFrameBound, WindowFrameUnits, WindowFunctionDefinition};
3536
use datafusion_physical_expr::expressions::{col, Column, NotExpr};
3637
use datafusion_physical_optimizer::PhysicalOptimizerRule;
3738
use datafusion_physical_expr::Partitioning;
@@ -3318,7 +3319,6 @@ async fn test_window_partial_constant_and_set_monotonicity() -> Result<()> {
33183319
case.partition_by,
33193320
)?) as _
33203321
};
3321-
33223322
let output_schema = window_exec.schema();
33233323
let sort_expr = case
33243324
.required_sort_columns
@@ -3335,6 +3335,7 @@ async fn test_window_partial_constant_and_set_monotonicity() -> Result<()> {
33353335
})
33363336
.collect::<Vec<_>>();
33373337
let physical_plan = sort_exec(sort_expr, window_exec);
3338+
33383339
assert_optimized!(
33393340
case.initial_plan,
33403341
case.expected_plan,

datafusion/core/tests/physical_optimizer/test_utils.rs

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -194,33 +194,20 @@ pub fn bounded_window_exec(
194194
col_name: &str,
195195
sort_exprs: impl IntoIterator<Item = PhysicalSortExpr>,
196196
input: Arc<dyn ExecutionPlan>,
197-
) -> Arc<dyn ExecutionPlan> {
198-
bounded_window_exec_with_partition(col_name, sort_exprs, &[], input, false)
199-
}
200-
201-
pub fn bounded_window_exec_with_partition(
202-
col_name: &str,
203-
sort_exprs: impl IntoIterator<Item = PhysicalSortExpr>,
204-
partition_by: &[Arc<dyn PhysicalExpr>],
205-
input: Arc<dyn ExecutionPlan>,
206-
should_reverse: bool,
207197
) -> Arc<dyn ExecutionPlan> {
208198
let sort_exprs: LexOrdering = sort_exprs.into_iter().collect();
209199
let schema = input.schema();
210-
let mut window_expr = create_window_expr(
200+
let window_expr = create_window_expr(
211201
&WindowFunctionDefinition::AggregateUDF(count_udaf()),
212202
"count".to_owned(),
213203
&[col(col_name, &schema).unwrap()],
214-
partition_by,
204+
&[],
215205
sort_exprs.as_ref(),
216206
Arc::new(WindowFrame::new(Some(false))),
217207
schema.as_ref(),
218208
false,
219209
)
220210
.unwrap();
221-
if should_reverse {
222-
window_expr = window_expr.get_reverse_expr().unwrap();
223-
}
224211

225212
Arc::new(
226213
BoundedWindowAggExec::try_new(

datafusion/physical-expr/src/equivalence/ordering.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -243,11 +243,7 @@ impl OrderingEquivalenceClass {
243243
count += 1;
244244
}
245245
}
246-
if count == 4 {
247-
true
248-
} else {
249-
false
250-
}
246+
count == 4
251247
}
252248
}
253249

datafusion/physical-expr/src/equivalence/properties.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,11 +1464,10 @@ fn update_properties(
14641464
let normalized_expr = eq_properties
14651465
.eq_group
14661466
.normalize_expr(Arc::clone(&node.expr));
1467-
if eq_properties.is_expr_constant(&normalized_expr) {
1468-
node.data.sort_properties = SortProperties::Singleton;
1469-
} else if eq_properties
1470-
.normalized_oeq_class()
1471-
.singleton_options(&normalized_expr)
1467+
if eq_properties.is_expr_constant(&normalized_expr)
1468+
|| eq_properties
1469+
.normalized_oeq_class()
1470+
.singleton_options(&normalized_expr)
14721471
{
14731472
node.data.sort_properties = SortProperties::Singleton;
14741473
} else if let Some(options) = eq_properties

datafusion/physical-optimizer/src/enforce_sorting/sort_pushdown.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,13 @@ use crate::utils::{
2424

2525
use arrow::datatypes::SchemaRef;
2626
use datafusion_common::tree_node::{
27-
ConcreteTreeNode, Transformed, TreeNode, TreeNodeRecursion, TreeNodeVisitor,
27+
ConcreteTreeNode, Transformed, TreeNode, TreeNodeRecursion,
2828
};
2929
use datafusion_common::{plan_err, HashSet, JoinSide, Result};
3030
use datafusion_expr::JoinType;
3131
use datafusion_physical_expr::expressions::Column;
3232
use datafusion_physical_expr::utils::collect_columns;
3333
use datafusion_physical_expr::PhysicalSortRequirement;
34-
use datafusion_physical_expr_common::physical_expr::PhysicalExpr;
3534
use datafusion_physical_expr_common::sort_expr::{LexOrdering, LexRequirement};
3635
use datafusion_physical_plan::filter::FilterExec;
3736
use datafusion_physical_plan::joins::utils::{

datafusion/physical-plan/src/windows/mod.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ use crate::{
3737
};
3838

3939
use arrow::datatypes::{DataType, Field, Schema, SchemaRef};
40+
use arrow_schema::SortOptions;
4041
use datafusion_common::{exec_err, Result};
4142
use datafusion_expr::{
4243
PartitionEvaluator, ReversedUDWF, SetMonotonicity, WindowFrame,
@@ -359,7 +360,7 @@ pub(crate) fn window_equivalence_properties(
359360
partition_by_order.into_iter().multi_cartesian_product();
360361
let mut all_lexs = all_orders_cartesian
361362
.into_iter()
362-
.map(|inner| LexOrdering::new(inner))
363+
.map(LexOrdering::new)
363364
.collect::<Vec<_>>();
364365
if !expr.partition_by().is_empty()
365366
&& all_lexs
@@ -498,15 +499,15 @@ pub(crate) fn window_equivalence_properties(
498499
.map(|pb| {
499500
vec![
500501
PhysicalSortExpr::new(
501-
pb.clone(),
502+
Arc::clone(&pb),
502503
SortOptions::new(false, false),
503504
),
504505
PhysicalSortExpr::new(
505-
pb.clone(),
506+
Arc::clone(&pb),
506507
SortOptions::new(false, true),
507508
),
508509
PhysicalSortExpr::new(
509-
pb.clone(),
510+
Arc::clone(&pb),
510511
SortOptions::new(true, false),
511512
),
512513
PhysicalSortExpr::new(pb, SortOptions::new(true, true)),

0 commit comments

Comments
 (0)