Skip to content

Commit 3a991e6

Browse files
Chen-Yuan-LaiCheng-Yuan-Lai
and
Cheng-Yuan-Lai
authored
refactor: switch BooleanBufferBuilder to NullBufferBuilder in unit tests for unnest (#14321)
Co-authored-by: Cheng-Yuan-Lai <a186235@g,ail.com>
1 parent f8063e8 commit 3a991e6

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

datafusion/physical-plan/src/unnest.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,7 @@ mod tests {
953953
use super::*;
954954
use arrow::datatypes::{Field, Int32Type};
955955
use arrow_array::{GenericListArray, OffsetSizeTrait, StringArray};
956-
use arrow_buffer::{BooleanBufferBuilder, NullBuffer, OffsetBuffer};
956+
use arrow_buffer::{NullBuffer, NullBufferBuilder, OffsetBuffer};
957957
use datafusion_common::assert_batches_eq;
958958

959959
// Create a GenericListArray with the following list values:
@@ -964,43 +964,43 @@ mod tests {
964964
{
965965
let mut values = vec![];
966966
let mut offsets: Vec<OffsetSize> = vec![OffsetSize::zero()];
967-
let mut valid = BooleanBufferBuilder::new(6);
967+
let mut valid = NullBufferBuilder::new(6);
968968

969969
// [A, B, C]
970970
values.extend_from_slice(&[Some("A"), Some("B"), Some("C")]);
971971
offsets.push(OffsetSize::from_usize(values.len()).unwrap());
972-
valid.append(true);
972+
valid.append_non_null();
973973

974974
// []
975975
offsets.push(OffsetSize::from_usize(values.len()).unwrap());
976-
valid.append(true);
976+
valid.append_non_null();
977977

978978
// NULL with non-zero value length
979979
// Issue https://github.com/apache/datafusion/issues/9932
980980
values.push(Some("?"));
981981
offsets.push(OffsetSize::from_usize(values.len()).unwrap());
982-
valid.append(false);
982+
valid.append_null();
983983

984984
// [D]
985985
values.push(Some("D"));
986986
offsets.push(OffsetSize::from_usize(values.len()).unwrap());
987-
valid.append(true);
987+
valid.append_non_null();
988988

989989
// Another NULL with zero value length
990990
offsets.push(OffsetSize::from_usize(values.len()).unwrap());
991-
valid.append(false);
991+
valid.append_null();
992992

993993
// [NULL, F]
994994
values.extend_from_slice(&[None, Some("F")]);
995995
offsets.push(OffsetSize::from_usize(values.len()).unwrap());
996-
valid.append(true);
996+
valid.append_non_null();
997997

998998
let field = Arc::new(Field::new_list_field(DataType::Utf8, true));
999999
GenericListArray::<OffsetSize>::new(
10001000
field,
10011001
OffsetBuffer::new(offsets.into()),
10021002
Arc::new(StringArray::from(values)),
1003-
Some(NullBuffer::new(valid.finish())),
1003+
valid.finish(),
10041004
)
10051005
}
10061006

@@ -1055,10 +1055,10 @@ mod tests {
10551055

10561056
let list_arr1_ref = Arc::new(list_arr1) as ArrayRef;
10571057
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();
10621062
// list<list<int32>>
10631063
let col1_field = Field::new_list_field(
10641064
DataType::List(Arc::new(Field::new_list_field(
@@ -1074,7 +1074,7 @@ mod tests {
10741074
)),
10751075
offsets,
10761076
list_arr1_ref,
1077-
Some(NullBuffer::new(nulls.finish())),
1077+
nulls.finish(),
10781078
);
10791079

10801080
let list_arr2 = StringArray::from(vec![
@@ -1086,8 +1086,8 @@ mod tests {
10861086
]);
10871087

10881088
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);
10911091
let col2_field = Field::new(
10921092
"col2",
10931093
DataType::List(Arc::new(Field::new_list_field(DataType::Utf8, true))),
@@ -1097,7 +1097,7 @@ mod tests {
10971097
Arc::new(Field::new_list_field(DataType::Utf8, true)),
10981098
OffsetBuffer::new(offsets.into()),
10991099
Arc::new(list_arr2),
1100-
Some(NullBuffer::new(nulls.finish())),
1100+
nulls.finish(),
11011101
);
11021102
// convert col1 and col2 to a record batch
11031103
let schema = Arc::new(Schema::new(vec![col1_field, col2_field]));

0 commit comments

Comments
 (0)