Skip to content

Commit 434a127

Browse files
committed
refactor: skip an implied ordering that cannot be derived instead of returning an error
1 parent 96a7399 commit 434a127

26 files changed

Lines changed: 137 additions & 177 deletions

File tree

‎datafusion/core/tests/execution/coop.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,7 @@ fn make_lazy_exec_with_range(
148148
exec.add_ordering(vec![PhysicalSortExpr::new(
149149
Arc::new(Column::new(column_name, 0)),
150150
SortOptions::new(false, true),
151-
)])
152-
.unwrap();
151+
)]);
153152

154153
exec
155154
}

‎datafusion/core/tests/fuzz_cases/equivalence/ordering.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ fn test_ordering_satisfy_all_null_ordered_column() -> Result<()> {
347347
eq_properties.add_ordering([
348348
PhysicalSortExpr::new(Arc::clone(col_a), options),
349349
PhysicalSortExpr::new(Arc::clone(col_b), options),
350-
])?;
350+
]);
351351
let batch = RecordBatch::try_new(
352352
Arc::clone(&schema),
353353
vec![
@@ -392,8 +392,7 @@ fn test_ordering_satisfy_null_constant_operand() -> Result<()> {
392392
as Arc<dyn PhysicalExpr>;
393393
for options in ALL_SORT_OPTIONS {
394394
let mut eq_properties = EquivalenceProperties::new(Arc::clone(&schema));
395-
eq_properties
396-
.add_ordering([PhysicalSortExpr::new(col("a", &schema)?, options)])?;
395+
eq_properties.add_ordering([PhysicalSortExpr::new(col("a", &schema)?, options)]);
397396
let batch = RecordBatch::try_new(
398397
Arc::clone(&schema),
399398
vec![sorted_f64_array(options, 2)?],

‎datafusion/core/tests/fuzz_cases/equivalence/utils.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ pub fn create_random_schema(
119119
options: random_sort_options(&mut rng),
120120
});
121121

122-
eq_properties.add_ordering(ordering)?;
122+
eq_properties.add_ordering(ordering);
123123
}
124124

125125
Ok((test_schema, eq_properties))
@@ -408,7 +408,7 @@ pub fn create_test_params() -> Result<(SchemaRef, EquivalenceProperties)> {
408408
],
409409
];
410410
let orderings = convert_to_orderings(&orderings);
411-
eq_properties.add_orderings(orderings)?;
411+
eq_properties.add_orderings(orderings);
412412
Ok((test_schema, eq_properties))
413413
}
414414

@@ -669,7 +669,7 @@ pub fn create_random_table_with_casts_and_windows(
669669
ALL_SORT_OPTIONS.map(|options| vec![sort(&k, opts_k), sort(&w, options)]),
670670
);
671671
orderings.shuffle(&mut rng);
672-
eq_properties.add_orderings(orderings)?;
672+
eq_properties.add_orderings(orderings);
673673

674674
let keys = vec![
675675
(Arc::clone(&k), Some(opts_k)),

‎datafusion/core/tests/fuzz_cases/sort_preserving_repartition_fuzz.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ mod sp_repartition_fuzz_tests {
9090
options: options_asc,
9191
});
9292

93-
eq_properties.add_ordering(ordering)?;
93+
eq_properties.add_ordering(ordering);
9494
}
9595

9696
Ok((test_schema, eq_properties))

‎datafusion/core/tests/physical_optimizer/ensure_requirements.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ impl MockMultiPartitionExec {
8787
nulls_first: false,
8888
},
8989
)]) {
90-
eq.add_orderings(vec![ordering.into_iter().collect::<Vec<_>>()])
91-
.unwrap();
90+
eq.add_orderings(vec![ordering.into_iter().collect::<Vec<_>>()]);
9291
}
9392
let properties = PlanProperties::new(
9493
eq,

‎datafusion/datasource-parquet/src/source.rs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,7 +1014,7 @@ impl FileSource for ParquetSource {
10141014
.collect::<Vec<_>>()
10151015
})
10161016
.collect::<Vec<_>>();
1017-
new.add_orderings(reversed_orderings)?;
1017+
new.add_orderings(reversed_orderings);
10181018
new
10191019
};
10201020
let reversed_satisfies =
@@ -1712,8 +1712,7 @@ mod tests {
17121712
let source = ParquetSource::new(Arc::clone(&schema));
17131713
// Source declares `[a DESC]`.
17141714
let mut eq = EquivalenceProperties::new(Arc::clone(&schema));
1715-
eq.add_ordering(vec![sort_expr_on(&schema, "a", true)])
1716-
.unwrap();
1715+
eq.add_ordering(vec![sort_expr_on(&schema, "a", true)]);
17171716
// Request `[a ASC]`.
17181717
let order = vec![sort_expr_on(&schema, "a", false)];
17191718

@@ -1786,7 +1785,7 @@ mod tests {
17861785
};
17871786
let declared = request_expr.reverse();
17881787
let mut eq = EquivalenceProperties::new(Arc::clone(&full_schema));
1789-
eq.add_ordering(vec![declared]).unwrap();
1788+
eq.add_ordering(vec![declared]);
17901789
let order = vec![request_expr];
17911790

17921791
let result = source.try_pushdown_sort(&order, &eq).unwrap();
@@ -1848,8 +1847,7 @@ mod tests {
18481847
nulls_first: false,
18491848
},
18501849
},
1851-
])
1852-
.unwrap();
1850+
]);
18531851

18541852
// Request `[a DESC, b ASC NULLS LAST, c DESC]` — three columns;
18551853
// source's two-column declaration is a strict prefix.

‎datafusion/functions-table/src/generate_series.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ impl TableProvider for GenerateSeriesTable {
730730
.with_projection(projection.map(|p| p.to_vec()));
731731

732732
if let Some(ordering) = self.output_ordering(exec.schema().as_ref()) {
733-
exec.add_ordering([ordering])?;
733+
exec.add_ordering([ordering]);
734734
}
735735

736736
Ok(Arc::new(exec))

‎datafusion/physical-expr/benches/equivalence_properties.rs‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,11 @@ fn asc(i: usize) -> PhysicalSortExpr {
6464
fn properties(n_classes: usize) -> EquivalenceProperties {
6565
let schema = schema(8 + 2 * n_classes);
6666
let mut props = EquivalenceProperties::new(schema);
67-
props
68-
.add_orderings([
69-
vec![asc(0), asc(1), asc(2), asc(3)],
70-
vec![asc(4), asc(5)],
71-
vec![asc(6)],
72-
])
73-
.unwrap();
67+
props.add_orderings([
68+
vec![asc(0), asc(1), asc(2), asc(3)],
69+
vec![asc(4), asc(5)],
70+
vec![asc(6)],
71+
]);
7472
for i in 0..n_classes {
7573
props
7674
.add_equal_conditions(col(8 + 2 * i), col(9 + 2 * i))
@@ -227,7 +225,7 @@ fn bench_shapes(c: &mut Criterion) {
227225
]);
228226
}
229227
}
230-
props.add_orderings(orderings).unwrap();
228+
props.add_orderings(orderings);
231229
let keys = vec![
232230
PhysicalSortExpr::new(col(0), asc_nulls_last),
233231
PhysicalSortExpr::new(col(1), asc_nulls_last),
@@ -309,12 +307,10 @@ fn bench_project_wide_struct_fields(c: &mut Criterion) {
309307
let mut group = c.benchmark_group("equivalence_properties");
310308
for (suffix, sort_col) in [("", col_a), ("/ordered_by_s", col_s)] {
311309
let mut props = EquivalenceProperties::new(Arc::clone(&schema));
312-
props
313-
.add_orderings([vec![PhysicalSortExpr::new(
314-
sort_col,
315-
SortOptions::default(),
316-
)]])
317-
.unwrap();
310+
props.add_orderings([vec![PhysicalSortExpr::new(
311+
sort_col,
312+
SortOptions::default(),
313+
)]]);
318314
group.bench_function(
319315
format!("project/wide_struct_fields/{READ}_of_{FIELDS}{suffix}"),
320316
|b| b.iter(|| props.project(&mapping, Arc::clone(&output))),

‎datafusion/physical-expr/src/equivalence/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ mod tests {
137137
],
138138
];
139139
let orderings = convert_to_orderings(&orderings);
140-
eq_properties.add_orderings(orderings)?;
140+
eq_properties.add_orderings(orderings);
141141
Ok((test_schema, eq_properties))
142142
}
143143

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ mod tests {
662662
);
663663
let mut eq_properties = EquivalenceProperties::new(Arc::clone(&test_schema));
664664
let orderings = convert_to_orderings(&orderings);
665-
eq_properties.add_orderings(orderings)?;
665+
eq_properties.add_orderings(orderings);
666666
let classes = eq_group
667667
.into_iter()
668668
.map(|eq_class| EquivalenceClass::new(eq_class.into_iter().cloned()));
@@ -706,7 +706,7 @@ mod tests {
706706
let orderings = convert_to_orderings(&orderings);
707707

708708
// Column [a ASC], [e ASC], [d ASC, f ASC] are all valid orderings for the schema.
709-
eq_properties.add_orderings(orderings)?;
709+
eq_properties.add_orderings(orderings);
710710

711711
// First entry in the tuple is required ordering, second entry is the expected flag
712712
// that indicates whether this required ordering is satisfied.

0 commit comments

Comments
 (0)