@@ -64,13 +64,11 @@ fn asc(i: usize) -> PhysicalSortExpr {
6464fn 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) ) ) ,
0 commit comments