@@ -157,96 +157,7 @@ type PartitionedBatches = Vec<Vec<RecordBatch>>;
157157type StreamGenerator = Box < dyn Fn ( bool ) -> PartitionedBatches > ;
158158
159159fn criterion_benchmark ( c : & mut Criterion ) {
160- for & ( input_size, size_label) in INPUT_SIZES {
161- let cases: Vec < ( & str , StreamGenerator ) > = vec ! [
162- (
163- "i64" ,
164- Box :: new( move |sorted| i64_streams( sorted, input_size) ) ,
165- ) ,
166- (
167- "f64" ,
168- Box :: new( move |sorted| f64_streams( sorted, input_size) ) ,
169- ) ,
170- (
171- "utf8 low cardinality" ,
172- Box :: new( move |sorted| utf8_low_cardinality_streams( sorted, input_size) ) ,
173- ) ,
174- (
175- "utf8 high cardinality" ,
176- Box :: new( move |sorted| utf8_high_cardinality_streams( sorted, input_size) ) ,
177- ) ,
178- (
179- "utf8 view low cardinality" ,
180- Box :: new( move |sorted| {
181- utf8_view_low_cardinality_streams( sorted, input_size)
182- } ) ,
183- ) ,
184- (
185- "utf8 view high cardinality" ,
186- Box :: new( move |sorted| {
187- utf8_view_high_cardinality_streams( sorted, input_size)
188- } ) ,
189- ) ,
190- (
191- "utf8 tuple" ,
192- Box :: new( move |sorted| utf8_tuple_streams( sorted, input_size) ) ,
193- ) ,
194- (
195- "utf8 view tuple" ,
196- Box :: new( move |sorted| utf8_view_tuple_streams( sorted, input_size) ) ,
197- ) ,
198- (
199- "utf8 dictionary" ,
200- Box :: new( move |sorted| dictionary_streams( sorted, input_size) ) ,
201- ) ,
202- (
203- "utf8 dictionary tuple" ,
204- Box :: new( move |sorted| dictionary_tuple_streams( sorted, input_size) ) ,
205- ) ,
206- (
207- "mixed dictionary tuple" ,
208- Box :: new( move |sorted| {
209- mixed_dictionary_tuple_streams( sorted, input_size)
210- } ) ,
211- ) ,
212- (
213- "mixed tuple" ,
214- Box :: new( move |sorted| mixed_tuple_streams( sorted, input_size) ) ,
215- ) ,
216- (
217- "mixed tuple with utf8 view" ,
218- Box :: new( move |sorted| {
219- mixed_tuple_with_utf8_view_streams( sorted, input_size)
220- } ) ,
221- ) ,
222- ] ;
223-
224- for ( name, f) in & cases {
225- c. bench_function ( & format ! ( "merge sorted {name} {size_label}" ) , |b| {
226- let data = f ( true ) ;
227- let case = BenchCase :: merge_sorted ( & data) ;
228- b. iter ( move || case. run ( ) )
229- } ) ;
230-
231- c. bench_function ( & format ! ( "sort merge {name} {size_label}" ) , |b| {
232- let data = f ( false ) ;
233- let case = BenchCase :: sort_merge ( & data) ;
234- b. iter ( move || case. run ( ) )
235- } ) ;
236-
237- c. bench_function ( & format ! ( "sort {name} {size_label}" ) , |b| {
238- let data = f ( false ) ;
239- let case = BenchCase :: sort ( & data) ;
240- b. iter ( move || case. run ( ) )
241- } ) ;
242-
243- c. bench_function ( & format ! ( "sort partitioned {name} {size_label}" ) , |b| {
244- let data = f ( false ) ;
245- let case = BenchCase :: sort_partitioned ( & data) ;
246- b. iter ( move || case. run ( ) )
247- } ) ;
248- }
249- }
160+ // s.be
250161}
251162
252163/// Encapsulates running each test case
@@ -989,5 +900,5 @@ fn with_extra_columns(batches: PartitionedBatches, n: usize) -> PartitionedBatch
989900 . collect ( )
990901}
991902
992- criterion_group ! ( benches, criterion_benchmark, sort_axis_benchmark ) ;
903+ criterion_group ! ( benches, criterion_benchmark) ;
993904criterion_main ! ( benches) ;
0 commit comments