@@ -5,8 +5,8 @@ use vortex_error::VortexResult;
55use vortex_error:: vortex_panic;
66use vortex_mask:: Mask ;
77
8- use super :: super :: Batch ;
9- use super :: super :: args:: BorrowedExecutionArgs ;
8+ use super :: super :: RowFnExecutionArgs ;
9+ use super :: super :: args:: BorrowedRowFnArgs ;
1010use crate :: ArrayRef ;
1111use crate :: ExecutionCtx ;
1212use crate :: IntoArray ;
@@ -23,7 +23,7 @@ enum ResolvedValidity {
2323 PartiallyValid ( Mask ) ,
2424}
2525
26- impl Batch {
26+ impl RowFnExecutionArgs {
2727 /// Resolve validity, then execute valid rows over the original inputs.
2828 ///
2929 /// # Panics
@@ -32,9 +32,9 @@ impl Batch {
3232 /// support null-tolerant decoding, and output sinks must initialize skipped rows.
3333 pub ( super ) fn execute_valid_only (
3434 & self ,
35- kernel : impl Fn ( BorrowedExecutionArgs < ' _ > , & mut ExecutionCtx ) -> VortexResult < ArrayRef > ,
35+ kernel : impl Fn ( BorrowedRowFnArgs < ' _ > , & mut ExecutionCtx ) -> VortexResult < ArrayRef > ,
3636 try_valid_rows : impl FnOnce (
37- BorrowedExecutionArgs < ' _ > ,
37+ BorrowedRowFnArgs < ' _ > ,
3838 & Mask ,
3939 & mut ExecutionCtx ,
4040 ) -> VortexResult < Option < ArrayRef > > ,
@@ -58,14 +58,14 @@ impl Batch {
5858 /// Materialize validity and handle all-valid or all-null batches.
5959 fn resolve_validity (
6060 & self ,
61- kernel : & impl Fn ( BorrowedExecutionArgs < ' _ > , & mut ExecutionCtx ) -> VortexResult < ArrayRef > ,
61+ kernel : & impl Fn ( BorrowedRowFnArgs < ' _ > , & mut ExecutionCtx ) -> VortexResult < ArrayRef > ,
6262 ctx : & mut ExecutionCtx ,
6363 ) -> VortexResult < ResolvedValidity > {
6464 let valid = self . validity . clone ( ) . execute_mask ( self . row_count , ctx) ?;
6565
6666 // An array-backed validity can materialize to all valid even though the cheap checks in
67- // `Batch ::execute` could not prove that. Run the full-row kernel in that case. Check
68- // all-true before all-false because an empty mask is both.
67+ // `RowFnExecutionArgs ::execute` could not prove that. Run the full-row kernel in that
68+ // case. Check all-true before all-false because an empty mask is both.
6969 if valid. all_true ( ) {
7070 let values = kernel ( self . execution_args ( & self . inputs , self . row_count ) , ctx) ?;
7171 let values = self . validate_kernel_output ( values, self . row_count , ctx) ?;
@@ -85,7 +85,7 @@ impl Batch {
8585 fn try_execute_valid_rows (
8686 & self ,
8787 try_valid_rows : impl FnOnce (
88- BorrowedExecutionArgs < ' _ > ,
88+ BorrowedRowFnArgs < ' _ > ,
8989 & Mask ,
9090 & mut ExecutionCtx ,
9191 ) -> VortexResult < Option < ArrayRef > > ,
0 commit comments