@@ -43,9 +43,11 @@ use crate::layouts::chunked::ChunkedLayout;
4343use crate :: layouts:: dict:: DictLayout ;
4444use crate :: layouts:: flat:: FlatLayout ;
4545use crate :: layouts:: struct_:: StructLayout ;
46+ use crate :: plan:: physical:: ConcatPlan ;
4647use crate :: plan:: physical:: EvalPlan ;
4748use crate :: plan:: physical:: Filter ;
4849use crate :: plan:: physical:: PackPlan ;
50+ use crate :: plan:: physical:: PlanChildren ;
4951use crate :: plan:: physical:: PlanRef ;
5052use crate :: plan:: physical:: SegmentScan ;
5153use crate :: plan:: physical:: Take ;
@@ -60,6 +62,7 @@ use crate::plan::physical::operator::SourceReady;
6062use crate :: plan:: physical:: operator:: Step ;
6163use crate :: plan:: physical:: operators:: PackSource ;
6264use crate :: plan:: physical:: optimize;
65+ use crate :: plan:: physical:: selection:: selected;
6366use crate :: segments:: SegmentId ;
6467use crate :: test:: SESSION ;
6568
@@ -834,3 +837,88 @@ fn pack_readiness_tracks_changes_and_consumption(
834837 }
835838 Ok ( ( ) )
836839}
840+
841+ #[ rstest]
842+ #[ case:: sparse( 2 ..19 , vec![ 0 , 5 , 14 , 16 ] ) ]
843+ #[ case:: contiguous( 2 ..19 , ( 5 ..10 ) . collect( ) ) ]
844+ #[ case:: empty( 2 ..19 , vec![ ] ) ]
845+ fn bound_selection_matches_projection (
846+ #[ case] rows : Range < u64 > ,
847+ #[ case] indices : Vec < usize > ,
848+ ) -> VortexResult < ( ) > {
849+ let mut store = Store :: default ( ) ;
850+ let ( plan, expected) = fixture ( & mut store) ?;
851+ let mask = Mask :: from_indices ( ( rows. end - rows. start ) as usize , indices) ;
852+ let plan = selected ( plan, rows. clone ( ) , mask. clone ( ) ) ;
853+ let result = run (
854+ & store,
855+ & plan,
856+ rows. clone ( ) ,
857+ Mask :: new_true ( mask. len ( ) ) ,
858+ delivery ( Delivery :: Lifo ) ,
859+ ) ?;
860+ assert_view ( & expected, & rows, & mask, result. arrays )
861+ }
862+
863+ #[ test]
864+ fn bound_selection_never_initializes_skipped_chunks ( ) -> VortexResult < ( ) > {
865+ let mut store = Store :: default ( ) ;
866+ let array = PrimitiveArray :: from_iter ( 0 ..20i32 ) . into_array ( ) ;
867+ let first = lower ( & store. flat ( & array. slice ( 0 ..5 ) ?) ?) ?;
868+ let last = lower ( & store. flat ( & array. slice ( 15 ..20 ) ?) ?) ?;
869+ let children = PlanChildren :: lazy ( 4 , move |index| match index {
870+ 0 => Ok ( first. clone ( ) ) ,
871+ 3 => Ok ( last. clone ( ) ) ,
872+ _ => Err ( vortex_err ! ( "unselected chunk {index} was initialized" ) ) ,
873+ } ) ;
874+ // SAFETY: All four logical chunks have five rows of the same primitive dtype. The two
875+ // unselected initializers deliberately fail to detect discovery as well as compilation.
876+ let plan = unsafe {
877+ ConcatPlan :: from_children_unchecked (
878+ array. dtype ( ) . clone ( ) ,
879+ 20 ,
880+ vec ! [ 0 , 5 , 10 , 15 ] . into ( ) ,
881+ children,
882+ )
883+ }
884+ . into_plan ( ) ;
885+ let mask = Mask :: from_indices ( 20 , [ 2 , 17 ] ) ;
886+ let plan = selected ( plan, 0 ..20 , mask. clone ( ) ) ;
887+ let result = run (
888+ & store,
889+ & plan,
890+ 0 ..20 ,
891+ Mask :: new_true ( 20 ) ,
892+ delivery ( Delivery :: Fifo ) ,
893+ ) ?;
894+ assert_eq ! ( reads( & result. events) , 2 ) ;
895+ assert_view ( & array, & ( 0 ..20 ) , & mask, result. arrays )
896+ }
897+
898+ #[ test]
899+ fn bound_selection_keeps_whole_dictionary_values ( ) -> VortexResult < ( ) > {
900+ let mut store = Store :: default ( ) ;
901+ let values = PrimitiveArray :: from_iter ( 100 ..120i32 ) . into_array ( ) ;
902+ let codes = PrimitiveArray :: from_iter ( ( 0 ..20u32 ) . rev ( ) ) . into_array ( ) ;
903+ let layout = DictLayout :: new (
904+ store. chunked ( & values, & [ 5 , 5 , 5 , 5 ] ) ?,
905+ store. chunked ( & codes, & [ 5 , 5 , 5 , 5 ] ) ?,
906+ )
907+ . into_layout ( ) ;
908+ let mask = Mask :: from_indices ( 20 , [ 1 , 18 ] ) ;
909+ let plan = selected ( lower ( & layout) ?, 0 ..20 , mask) ;
910+ let result = run (
911+ & store,
912+ & plan,
913+ 0 ..20 ,
914+ Mask :: new_true ( 20 ) ,
915+ delivery ( Delivery :: Lifo ) ,
916+ ) ?;
917+ assert_eq ! ( reads( & result. events) , 6 , "all values and two code chunks" ) ;
918+ assert_arrays_eq ! (
919+ join( values. dtype( ) , result. arrays) ?,
920+ PrimitiveArray :: from_iter( [ 118 , 101 ] ) . into_array( ) ,
921+ & mut SESSION . create_execution_ctx( )
922+ ) ;
923+ Ok ( ( ) )
924+ }
0 commit comments