@@ -85,9 +85,14 @@ mod tests {
8585 use crate :: arrays:: scalar_fn:: array:: ScalarFnData ;
8686 use crate :: arrays:: scalar_fn:: vtable:: ScalarFn ;
8787 use crate :: assert_arrays_eq;
88+ use crate :: dtype:: DType ;
89+ use crate :: dtype:: Nullability ;
90+ use crate :: dtype:: PType ;
8891 use crate :: scalar:: Scalar ;
8992 use crate :: scalar_fn:: TypedScalarFnInstance ;
9093 use crate :: scalar_fn:: fns:: binary:: Binary ;
94+ use crate :: scalar_fn:: fns:: list_contains:: PreparedSet ;
95+ use crate :: scalar_fn:: fns:: list_contains:: PreparedSetData ;
9196 use crate :: scalar_fn:: fns:: literal:: Literal ;
9297 use crate :: scalar_fn:: fns:: operators:: Operator ;
9398 use crate :: validity:: Validity ;
@@ -170,7 +175,14 @@ mod tests {
170175
171176 #[ test]
172177 fn test_scalar_fn_without_children_requires_explicit_len ( ) -> VortexResult < ( ) > {
173- let scalar_fn = TypedScalarFnInstance :: new ( Literal , Scalar :: from ( 1i32 ) ) . erased ( ) ;
178+ let list = Scalar :: list (
179+ DType :: Primitive ( PType :: I32 , Nullability :: NonNullable ) ,
180+ vec ! [ Scalar :: from( 1i32 ) ] ,
181+ Nullability :: NonNullable ,
182+ ) ;
183+ let scalar_fn =
184+ TypedScalarFnInstance :: new ( PreparedSet , PreparedSetData :: try_new ( list. clone ( ) ) ?)
185+ . erased ( ) ;
174186
175187 let Err ( err) = ScalarFnArray :: try_new ( scalar_fn. clone ( ) , vec ! [ ] ) else {
176188 panic ! ( "ScalarFnArray::try_new should reject zero children" ) ;
@@ -185,13 +197,38 @@ mod tests {
185197 assert_eq ! ( scalar_fn_array. child_count( ) , 0 ) ;
186198 assert_arrays_eq ! (
187199 scalar_fn_array,
188- ConstantArray :: new( 1i32 , 3 ) ,
200+ ConstantArray :: new( list , 3 ) ,
189201 & mut array_session( ) . create_execution_ctx( )
190202 ) ;
191203
192204 Ok ( ( ) )
193205 }
194206
207+ #[ test]
208+ fn rejects_literal ( ) {
209+ let scalar_fn = TypedScalarFnInstance :: new ( Literal , Scalar :: from ( 1i32 ) ) . erased ( ) ;
210+
211+ let Err ( err) = ScalarFnArray :: try_new_with_len ( scalar_fn. clone ( ) , vec ! [ ] , 3 ) else {
212+ panic ! ( "ScalarFnArray::try_new_with_len must reject a literal" ) ;
213+ } ;
214+ assert ! (
215+ err. to_string( )
216+ . contains( "ScalarFnArray cannot wrap a literal" )
217+ ) ;
218+
219+ let vtable = ScalarFn { id : scalar_fn. id ( ) } ;
220+ let data = ScalarFnData { scalar_fn } ;
221+ let parts = ArrayParts :: new ( vtable, PType :: I32 . into ( ) , 3 , data, ArraySlots :: new ( ) ) ;
222+
223+ let Err ( err) = Array :: < ScalarFn > :: try_from_parts ( parts) else {
224+ panic ! ( "ScalarFnArray must reject a literal from parts" ) ;
225+ } ;
226+ assert ! (
227+ err. to_string( )
228+ . contains( "ScalarFnArray cannot wrap a literal" )
229+ ) ;
230+ }
231+
195232 #[ test]
196233 fn test_scalar_fn_mul ( ) -> VortexResult < ( ) > {
197234 let mut ctx = array_session ( ) . create_execution_ctx ( ) ;
0 commit comments