@@ -63,13 +63,13 @@ impl DeferredAdd {
6363struct ValidOnlyIdentity ;
6464
6565#[ derive( Clone ) ]
66- struct FilterAndScatterIdentity ;
66+ struct FilteredIdentity ;
6767
6868#[ derive( Clone ) ]
6969struct DenseRetryIncrement ;
7070
7171#[ derive( Clone ) ]
72- struct FilterAndScatterRepeat ;
72+ struct FilteredRepeat ;
7373
7474#[ derive( Clone ) ]
7575struct InvalidKernelOutput ;
@@ -245,7 +245,8 @@ impl OutputElement for NullProducingI64 {
245245struct I64Sink ( BufferMut < i64 > ) ;
246246
247247// SAFETY: every row is initialized by `BufferMut::zeroed`, and the sink exposes exactly that
248- // initialized slice. The `()` write token therefore proves no additional invariant.
248+ // initialized slice. The `()` write token therefore proves no additional invariant, and the
249+ // default skipped-row initializer only rewrites the zeroes.
249250unsafe impl OutputSink for I64Sink {
250251 type Params = ( ) ;
251252 type Rows < ' a > = & ' a mut [ i64 ] ;
@@ -365,14 +366,14 @@ impl RowFn for ValidOnlyIdentity {
365366 }
366367}
367368
368- impl RowFn for FilterAndScatterIdentity {
369+ impl RowFn for FilteredIdentity {
369370 type Options = EmptyOptions ;
370371
371372 const ARG_NAMES : & ' static [ & ' static str ] = & [ "value" ] ;
372373 const INFALLIBLE : bool = false ;
373374
374375 fn id ( & self ) -> ScalarFnId {
375- static ID : CachedId = CachedId :: new ( "test.filter_and_scatter_identity " ) ;
376+ static ID : CachedId = CachedId :: new ( "test.filtered_identity " ) ;
376377 * ID
377378 }
378379
@@ -416,14 +417,14 @@ impl RowFn for DenseRetryIncrement {
416417 }
417418}
418419
419- impl RowFn for FilterAndScatterRepeat {
420+ impl RowFn for FilteredRepeat {
420421 type Options = usize ;
421422
422423 const ARG_NAMES : & ' static [ & ' static str ] = & [ "value" ] ;
423424 const INFALLIBLE : bool = true ;
424425
425426 fn id ( & self ) -> ScalarFnId {
426- static ID : CachedId = CachedId :: new ( "test.filter_and_scatter_repeat " ) ;
427+ static ID : CachedId = CachedId :: new ( "test.filtered_repeat " ) ;
427428 * ID
428429 }
429430
@@ -436,7 +437,7 @@ impl RowFn for FilterAndScatterRepeat {
436437 vortex_ensure ! (
437438 u32 :: try_from( * width) . is_ok( ) ,
438439 InvalidArgument :
439- "test.filter_and_scatter_repeat width must fit in u32, got {width}" ,
440+ "test.filtered_repeat width must fit in u32, got {width}" ,
440441 ) ;
441442
442443 visitor
@@ -789,14 +790,14 @@ fn test_valid_only_bool_output_skips_invalid_rows() -> VortexResult<()> {
789790}
790791
791792#[ test]
792- fn test_filter_and_scatter_skips_invalid_decode_payloads ( ) -> VortexResult < ( ) > {
793+ fn test_filtered_execution_skips_invalid_decode_payloads ( ) -> VortexResult < ( ) > {
793794 let validity = Validity :: from_iter ( [ false , true , false , true ] ) ;
794795 let input =
795796 PrimitiveArray :: new ( vec ! [ i64 :: MIN , 10 , i64 :: MIN , 30 ] , validity. clone ( ) ) . into_array ( ) ;
796797 let args = VecExecutionArgs :: new ( vec ! [ input] , 4 ) ;
797798 let mut ctx = array_session ( ) . create_execution_ctx ( ) ;
798799
799- let actual = execute_rows ( & FilterAndScatterIdentity , & EmptyOptions , & args, & mut ctx) ?;
800+ let actual = execute_rows ( & FilteredIdentity , & EmptyOptions , & args, & mut ctx) ?;
800801 let expected = PrimitiveArray :: new ( vec ! [ 0_i64 , 10 , 0 , 30 ] , validity) . into_array ( ) ;
801802
802803 assert_arrays_eq ! ( & actual, & expected, & mut ctx) ;
@@ -806,7 +807,7 @@ fn test_filter_and_scatter_skips_invalid_decode_payloads() -> VortexResult<()> {
806807#[ rstest]
807808#[ case:: width_two( 2 , vec![ 0_i64 , 0 , 7 , 7 ] ) ]
808809#[ case:: zero_width( 0 , vec![ ] ) ]
809- fn test_filter_and_scatter_preserves_runtime_sink_params (
810+ fn test_filtered_execution_preserves_runtime_sink_params (
810811 #[ case] width : usize ,
811812 #[ case] expected_elements : Vec < i64 > ,
812813) -> VortexResult < ( ) > {
@@ -815,7 +816,7 @@ fn test_filter_and_scatter_preserves_runtime_sink_params(
815816 let args = VecExecutionArgs :: new ( vec ! [ input] , 2 ) ;
816817 let mut ctx = array_session ( ) . create_execution_ctx ( ) ;
817818
818- let actual = execute_rows ( & FilterAndScatterRepeat , & width, & args, & mut ctx) ?;
819+ let actual = execute_rows ( & FilteredRepeat , & width, & args, & mut ctx) ?;
819820 let expected = FixedSizeListArray :: new (
820821 PrimitiveArray :: from_iter ( expected_elements) . into_array ( ) ,
821822 u32:: try_from ( width)
0 commit comments