@@ -228,9 +228,15 @@ fn map_extract_inner(args: &[ArrayRef]) -> Result<ArrayRef> {
228228mod tests {
229229 use super :: * ;
230230 use arrow:: array:: { Float64Array , Int32Array , StructArray } ;
231+ use arrow:: buffer:: NullBuffer ;
231232 use arrow:: datatypes:: Int32Type ;
232233
233- fn make_map ( keys : ArrayRef , values : Vec < i32 > , offsets : Vec < i32 > ) -> MapArray {
234+ fn make_map (
235+ keys : ArrayRef ,
236+ values : Vec < i32 > ,
237+ offsets : Vec < i32 > ,
238+ nulls : Option < NullBuffer > ,
239+ ) -> MapArray {
234240 let entries = StructArray :: from ( vec ! [
235241 (
236242 Arc :: new( Field :: new( "key" , keys. data_type( ) . clone( ) , false ) ) ,
@@ -245,7 +251,7 @@ mod tests {
245251 Arc :: new ( Field :: new ( "entries" , entries. data_type ( ) . clone ( ) , false ) ) ,
246252 OffsetBuffer :: new ( offsets. into ( ) ) ,
247253 entries,
248- None ,
254+ nulls ,
249255 false ,
250256 )
251257 }
@@ -256,6 +262,7 @@ mod tests {
256262 Arc :: new ( Int32Array :: from ( vec ! [ 0 , 1 , 2 , 3 ] ) ) ,
257263 vec ! [ 0 , 10 , 20 , 30 ] ,
258264 vec ! [ 0 , 1 , 3 , 4 ] ,
265+ None ,
259266 ) ;
260267 let query_keys = Int32Array :: from ( vec ! [ 0 , 2 , 9 ] ) ;
261268
@@ -275,6 +282,23 @@ mod tests {
275282 Ok ( ( ) )
276283 }
277284
285+ #[ test]
286+ fn map_extract_all_empty_maps_with_nulls ( ) -> Result < ( ) > {
287+ // No entries exist to scan, but the null map must still produce NULL
288+ // rather than an empty list.
289+ let map = make_map (
290+ Arc :: new ( Int32Array :: from ( Vec :: < i32 > :: new ( ) ) ) ,
291+ vec ! [ ] ,
292+ vec ! [ 0 , 0 , 0 ] ,
293+ Some ( NullBuffer :: from ( vec ! [ true , false ] ) ) ,
294+ ) ;
295+ let result = general_map_extract_inner ( & map, & Int32Array :: from ( vec ! [ 1 , 1 ] ) ) ?;
296+ let expected =
297+ ListArray :: from_iter_primitive :: < Int32Type , _ , _ > ( [ Some ( vec ! [ ] ) , None ] ) ;
298+ assert_eq ! ( result. as_ref( ) , & expected) ;
299+ Ok ( ( ) )
300+ }
301+
278302 #[ test]
279303 fn map_extract_float_keys ( ) -> Result < ( ) > {
280304 let nan = f64:: NAN ;
@@ -283,6 +307,7 @@ mod tests {
283307 Arc :: new ( Float64Array :: from ( vec ! [ -0.0 , 0.0 , nan, other_nan] ) ) ,
284308 vec ! [ 1 , 2 , 3 , 4 ] ,
285309 vec ! [ 0 , 4 ] ,
310+ None ,
286311 ) ;
287312
288313 // Signed zeros and distinct NaN payloads identify different keys.
0 commit comments