@@ -130,21 +130,13 @@ impl ScalarUDFImpl for JavaScalarUdf {
130130 let ty = signature_types[ i] . clone ( ) ;
131131 match cv {
132132 ColumnarValue :: Array ( a) => {
133- array_fields. push ( Field :: new (
134- format ! ( "arg{}" , array_arrays. len( ) ) ,
135- ty,
136- true ,
137- ) ) ;
133+ array_fields. push ( Field :: new ( format ! ( "arg{}" , array_arrays. len( ) ) , ty, true ) ) ;
138134 array_arrays. push ( a. clone ( ) ) ;
139135 arg_kinds. push ( 0 ) ;
140136 }
141137 ColumnarValue :: Scalar ( s) => {
142138 let arr = s. to_array_of_size ( 1 ) ?;
143- scalar_fields. push ( Field :: new (
144- format ! ( "arg{}" , scalar_arrays. len( ) ) ,
145- ty,
146- true ,
147- ) ) ;
139+ scalar_fields. push ( Field :: new ( format ! ( "arg{}" , scalar_arrays. len( ) ) , ty, true ) ) ;
148140 scalar_arrays. push ( arr) ;
149141 arg_kinds. push ( 1 ) ;
150142 }
@@ -160,13 +152,9 @@ impl ScalarUDFImpl for JavaScalarUdf {
160152 number_rows,
161153 )
162154 . map_err ( |e| DataFusionError :: ArrowError ( Box :: new ( e) , None ) ) ?;
163- let scalar_struct = StructArray :: try_new_with_length (
164- Fields :: from ( scalar_fields) ,
165- scalar_arrays,
166- None ,
167- 1 ,
168- )
169- . map_err ( |e| DataFusionError :: ArrowError ( Box :: new ( e) , None ) ) ?;
155+ let scalar_struct =
156+ StructArray :: try_new_with_length ( Fields :: from ( scalar_fields) , scalar_arrays, None , 1 )
157+ . map_err ( |e| DataFusionError :: ArrowError ( Box :: new ( e) , None ) ) ?;
170158
171159 let ( array_ffi_arr, array_ffi_sch) = to_ffi ( & array_struct. into_data ( ) )
172160 . map_err ( |e| DataFusionError :: ArrowError ( Box :: new ( e) , None ) ) ?;
@@ -198,11 +186,9 @@ impl ScalarUDFImpl for JavaScalarUdf {
198186 . map_err ( |e| DataFusionError :: Execution ( format ! ( "JNI attach failed: {}" , e) ) ) ?;
199187
200188 // 6. Build the byte[] for argKinds inside the JVM heap. JNI local; freed when env drops.
201- let arg_kinds_array = env
202- . byte_array_from_slice ( & arg_kinds)
203- . map_err ( |e| {
204- DataFusionError :: Execution ( format ! ( "byte_array_from_slice failed: {}" , e) )
205- } ) ?;
189+ let arg_kinds_array = env. byte_array_from_slice ( & arg_kinds) . map_err ( |e| {
190+ DataFusionError :: Execution ( format ! ( "byte_array_from_slice failed: {}" , e) )
191+ } ) ?;
206192
207193 let expected_rows = i32:: try_from ( number_rows) . map_err ( |_| {
208194 DataFusionError :: Execution ( format ! (
@@ -214,12 +200,16 @@ impl ScalarUDFImpl for JavaScalarUdf {
214200 let udf_jobject = self . udf_global_ref . as_obj ( ) ;
215201 // SAFETY: udf_global_ref and arg_kinds_array are alive for the duration of this call.
216202 let call_args: [ jvalue ; 9 ] = [
217- jvalue { l : udf_jobject. as_raw ( ) } ,
203+ jvalue {
204+ l : udf_jobject. as_raw ( ) ,
205+ } ,
218206 jvalue { j : array_arr_addr } ,
219207 jvalue { j : array_sch_addr } ,
220208 jvalue { j : scalar_arr_addr } ,
221209 jvalue { j : scalar_sch_addr } ,
222- jvalue { l : arg_kinds_array. as_raw ( ) } ,
210+ jvalue {
211+ l : arg_kinds_array. as_raw ( ) ,
212+ } ,
223213 jvalue { j : result_arr_addr } ,
224214 jvalue { j : result_sch_addr } ,
225215 jvalue { i : expected_rows } ,
0 commit comments