@@ -39,13 +39,15 @@ impl DynGroupedAggregateKernel for PrimitiveGroupedExtremaEncodingKernel {
3939 groups : & GroupedArray ,
4040 ctx : & mut ExecutionCtx ,
4141 ) -> VortexResult < Option < ArrayRef > > {
42- if let Some ( options) = aggregate_fn. as_opt :: < Min > ( ) {
43- return try_grouped_extreme ( groups, ctx, options. skip_nans , Extreme :: Min ) ;
44- }
45- if let Some ( options) = aggregate_fn. as_opt :: < Max > ( ) {
46- return try_grouped_extreme ( groups, ctx, options. skip_nans , Extreme :: Max ) ;
47- }
48- Ok ( None )
42+ let ( skip_nans, extreme) = if let Some ( options) = aggregate_fn. as_opt :: < Min > ( ) {
43+ ( options. skip_nans , Extreme :: Min )
44+ } else if let Some ( options) = aggregate_fn. as_opt :: < Max > ( ) {
45+ ( options. skip_nans , Extreme :: Max )
46+ } else {
47+ return Ok ( None ) ;
48+ } ;
49+
50+ try_grouped_extreme ( groups, ctx, skip_nans, extreme)
4951 }
5052}
5153
@@ -477,27 +479,23 @@ fn reduce_nullable_word_scalar<T: NativePType>(
477479 mut word : u64 ,
478480 skip_nans : bool ,
479481 is_better : & impl Fn ( T , T ) -> bool ,
480- ) -> bool {
481- let valid_mask = if values. is_empty ( ) {
482- 0
483- } else {
484- ( 1u64 << values. len ( ) ) - 1
485- } ;
482+ ) {
483+ let valid_mask = ( 1u64 << values. len ( ) ) - 1 ;
486484 word &= valid_mask;
487485
488486 if word == valid_mask {
489- return reduce_scalar_run ( best, values, skip_nans, is_better) ;
487+ reduce_scalar_run ( best, values, skip_nans, is_better) ;
488+ return ;
490489 }
491490
492491 while word != 0 {
493492 let start = word. trailing_zeros ( ) as usize ;
494493 let run_len = ( word >> start) . trailing_ones ( ) as usize ;
495494 if reduce_scalar_run ( best, & values[ start..start + run_len] , skip_nans, is_better) {
496- return true ;
495+ return ;
497496 }
498497 word &= !( ( ( 1u64 << run_len) - 1 ) << start) ;
499498 }
500- false
501499}
502500
503501#[ inline]
0 commit comments