Skip to content
Closed
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions c_glib/test/helper/buildable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ def build_string_array(values)
build_array(Arrow::StringArrayBuilder.new, values)
end

def build_list_array(value_data_type, values_list)
value_field = Arrow::Field.new("value", value_data_type)
def build_list_array(value_data_type, values_list, field_name: "value")
value_field = Arrow::Field.new(field_name, value_data_type)
data_type = Arrow::ListDataType.new(value_field)
builder = Arrow::ListArrayBuilder.new(data_type)
values_list.each do |values|
Expand Down
2 changes: 1 addition & 1 deletion c_glib/test/test-list-array.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class TestListArray < Test::Unit::TestCase
include Helper::Buildable

def test_new
field = Arrow::Field.new("item", Arrow::Int8DataType.new)
field = Arrow::Field.new("value", Arrow::Int8DataType.new)
data_type = Arrow::ListDataType.new(field)
value_offsets = Arrow::Buffer.new([0, 2, 5, 5].pack("l*"))
data = Arrow::Buffer.new([1, 2, 3, 4, 5].pack("c*"))
Expand Down
4 changes: 2 additions & 2 deletions c_glib/test/test-orc-file-reader.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def item_data_type
end

def build_items_array(items_array)
build_list_array(item_data_type, items_array)
build_list_array(item_data_type, items_array, field_name: "item")
end

def items_data_type
Expand Down Expand Up @@ -93,7 +93,7 @@ def key_value_data_type
end

def build_key_value_array(key_value_array)
build_list_array(key_value_data_type, key_value_array)
build_list_array(key_value_data_type, key_value_array, field_name: "item")
end

def middle_array
Expand Down
17 changes: 17 additions & 0 deletions cpp/src/arrow/array-list-test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -296,4 +296,21 @@ TEST_F(TestListArray, TestZeroLength) {
ASSERT_OK(ValidateArray(*result_));
}

TEST_F(TestListArray, TestBuilderPreserveFieleName) {
auto list_type_with_name = list(field("counts", int32()));

std::unique_ptr<ArrayBuilder> tmp;
ASSERT_OK(MakeBuilder(pool_, list_type_with_name, &tmp));
builder_.reset(checked_cast<ListBuilder*>(tmp.release()));

vector<int32_t> values = {1, 2, 4, 8};
ASSERT_OK(builder_->AppendValues(values.data(), values.size()));

std::shared_ptr<Array> list_array;
ASSERT_OK(builder_->Finish(&list_array));

const auto& type = checked_cast<ListType&>(*list_array->type());
ASSERT_EQ("counts", type.value_field()->name());
}

} // namespace arrow
2 changes: 1 addition & 1 deletion cpp/src/arrow/builder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Status MakeBuilder(MemoryPool* pool, const std::shared_ptr<DataType>& type,
std::shared_ptr<DataType> value_type =
internal::checked_cast<const ListType&>(*type).value_type();
RETURN_NOT_OK(MakeBuilder(pool, value_type, &value_builder));
out->reset(new ListBuilder(pool, std::move(value_builder)));
out->reset(new ListBuilder(pool, std::move(value_builder), type));
return Status::OK();
}

Expand Down