Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions cpp/src/arrow/ipc/test_common.cc
Original file line number Diff line number Diff line change
Expand Up @@ -172,15 +172,19 @@ Status MakeListArray(const std::shared_ptr<Array>& child_array, int num_lists,

offsets[num_lists] = static_cast<offset_type>(child_array->length());

/// TODO(wesm): Implement support for nulls in ListArray::FromArrays
std::shared_ptr<Buffer> null_bitmap, offsets_buffer;
// Create offsets array
using OffsetArrowType = typename TypeTraits<TypeClass>::OffsetType;
std::shared_ptr<Array> offsets_array;
ArrayFromVector<OffsetArrowType, offset_type>(offsets, &offsets_array);

// Create null bitmap
std::shared_ptr<Buffer> null_bitmap;
RETURN_NOT_OK(GetBitmapFromVector(valid_lists, &null_bitmap));
RETURN_NOT_OK(CopyBufferFromVector(offsets, pool, &offsets_buffer));

*out = std::make_shared<ArrayType>(std::make_shared<TypeClass>(child_array->type()),
num_lists, offsets_buffer, child_array, null_bitmap,
kUnknownNullCount);
return (**out).Validate();
// Use FromArrays which supports nulls via null_bitmap parameter
ARROW_ASSIGN_OR_RAISE(*out, ArrayType::FromArrays(*offsets_array, *child_array, pool,
null_bitmap, kUnknownNullCount));
return Status::OK();
}

Status MakeRandomListViewArray(const std::shared_ptr<Array>& child_array, int num_lists,
Expand Down
Loading