@@ -953,7 +953,7 @@ mod tests {
953
953
use super :: * ;
954
954
use arrow:: datatypes:: { Field , Int32Type } ;
955
955
use arrow_array:: { GenericListArray , OffsetSizeTrait , StringArray } ;
956
- use arrow_buffer:: { BooleanBufferBuilder , NullBuffer , OffsetBuffer } ;
956
+ use arrow_buffer:: { NullBuffer , NullBufferBuilder , OffsetBuffer } ;
957
957
use datafusion_common:: assert_batches_eq;
958
958
959
959
// Create a GenericListArray with the following list values:
@@ -964,43 +964,43 @@ mod tests {
964
964
{
965
965
let mut values = vec ! [ ] ;
966
966
let mut offsets: Vec < OffsetSize > = vec ! [ OffsetSize :: zero( ) ] ;
967
- let mut valid = BooleanBufferBuilder :: new ( 6 ) ;
967
+ let mut valid = NullBufferBuilder :: new ( 6 ) ;
968
968
969
969
// [A, B, C]
970
970
values. extend_from_slice ( & [ Some ( "A" ) , Some ( "B" ) , Some ( "C" ) ] ) ;
971
971
offsets. push ( OffsetSize :: from_usize ( values. len ( ) ) . unwrap ( ) ) ;
972
- valid. append ( true ) ;
972
+ valid. append_non_null ( ) ;
973
973
974
974
// []
975
975
offsets. push ( OffsetSize :: from_usize ( values. len ( ) ) . unwrap ( ) ) ;
976
- valid. append ( true ) ;
976
+ valid. append_non_null ( ) ;
977
977
978
978
// NULL with non-zero value length
979
979
// Issue https://github.com/apache/datafusion/issues/9932
980
980
values. push ( Some ( "?" ) ) ;
981
981
offsets. push ( OffsetSize :: from_usize ( values. len ( ) ) . unwrap ( ) ) ;
982
- valid. append ( false ) ;
982
+ valid. append_null ( ) ;
983
983
984
984
// [D]
985
985
values. push ( Some ( "D" ) ) ;
986
986
offsets. push ( OffsetSize :: from_usize ( values. len ( ) ) . unwrap ( ) ) ;
987
- valid. append ( true ) ;
987
+ valid. append_non_null ( ) ;
988
988
989
989
// Another NULL with zero value length
990
990
offsets. push ( OffsetSize :: from_usize ( values. len ( ) ) . unwrap ( ) ) ;
991
- valid. append ( false ) ;
991
+ valid. append_null ( ) ;
992
992
993
993
// [NULL, F]
994
994
values. extend_from_slice ( & [ None , Some ( "F" ) ] ) ;
995
995
offsets. push ( OffsetSize :: from_usize ( values. len ( ) ) . unwrap ( ) ) ;
996
- valid. append ( true ) ;
996
+ valid. append_non_null ( ) ;
997
997
998
998
let field = Arc :: new ( Field :: new_list_field ( DataType :: Utf8 , true ) ) ;
999
999
GenericListArray :: < OffsetSize > :: new (
1000
1000
field,
1001
1001
OffsetBuffer :: new ( offsets. into ( ) ) ,
1002
1002
Arc :: new ( StringArray :: from ( values) ) ,
1003
- Some ( NullBuffer :: new ( valid. finish ( ) ) ) ,
1003
+ valid. finish ( ) ,
1004
1004
)
1005
1005
}
1006
1006
@@ -1055,10 +1055,10 @@ mod tests {
1055
1055
1056
1056
let list_arr1_ref = Arc :: new ( list_arr1) as ArrayRef ;
1057
1057
let offsets = OffsetBuffer :: from_lengths ( [ 3 , 3 , 0 ] ) ;
1058
- let mut nulls = BooleanBufferBuilder :: new ( 3 ) ;
1059
- nulls. append ( true ) ;
1060
- nulls. append ( true ) ;
1061
- nulls. append ( false ) ;
1058
+ let mut nulls = NullBufferBuilder :: new ( 3 ) ;
1059
+ nulls. append_non_null ( ) ;
1060
+ nulls. append_non_null ( ) ;
1061
+ nulls. append_null ( ) ;
1062
1062
// list<list<int32>>
1063
1063
let col1_field = Field :: new_list_field (
1064
1064
DataType :: List ( Arc :: new ( Field :: new_list_field (
@@ -1074,7 +1074,7 @@ mod tests {
1074
1074
) ) ,
1075
1075
offsets,
1076
1076
list_arr1_ref,
1077
- Some ( NullBuffer :: new ( nulls. finish ( ) ) ) ,
1077
+ nulls. finish ( ) ,
1078
1078
) ;
1079
1079
1080
1080
let list_arr2 = StringArray :: from ( vec ! [
@@ -1086,8 +1086,8 @@ mod tests {
1086
1086
] ) ;
1087
1087
1088
1088
let offsets = OffsetBuffer :: from_lengths ( [ 2 , 2 , 1 ] ) ;
1089
- let mut nulls = BooleanBufferBuilder :: new ( 3 ) ;
1090
- nulls. append_n ( 3 , true ) ;
1089
+ let mut nulls = NullBufferBuilder :: new ( 3 ) ;
1090
+ nulls. append_n_non_nulls ( 3 ) ;
1091
1091
let col2_field = Field :: new (
1092
1092
"col2" ,
1093
1093
DataType :: List ( Arc :: new ( Field :: new_list_field ( DataType :: Utf8 , true ) ) ) ,
@@ -1097,7 +1097,7 @@ mod tests {
1097
1097
Arc :: new ( Field :: new_list_field ( DataType :: Utf8 , true ) ) ,
1098
1098
OffsetBuffer :: new ( offsets. into ( ) ) ,
1099
1099
Arc :: new ( list_arr2) ,
1100
- Some ( NullBuffer :: new ( nulls. finish ( ) ) ) ,
1100
+ nulls. finish ( ) ,
1101
1101
) ;
1102
1102
// convert col1 and col2 to a record batch
1103
1103
let schema = Arc :: new ( Schema :: new ( vec ! [ col1_field, col2_field] ) ) ;
0 commit comments