Skip to content

ARROW-1511: [C++] Promote ArrayData, MakeArray to public API, deprecate MakePrimitiveArray #1087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wesm wants to merge 3 commits into from
Closed

ARROW-1511: [C++] Promote ArrayData, MakeArray to public API, deprecate MakePrimitiveArray #1087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eee4c2f
Promote ArrayData, MakeArray to public API, deprecate MakePrimitiveArray
wesm Sep 11, 2017
da7d9e9
Add docstring for MakeArray
wesm Sep 11, 2017
67e2996
Remove internal:: symbols for ArrayData, MakeArray
wesm Sep 11, 2017
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
49 changes: 25 additions & 24 deletions cpp/src/arrow/array.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@

namespace arrow {

using internal::ArrayData;

// ----------------------------------------------------------------------
// Base array class

Expand Down Expand Up @@ -159,15 +157,15 @@ const uint8_t* PrimitiveArray::raw_values() const {
}

template <typename T>
NumericArray<T>::NumericArray(const std::shared_ptr<internal::ArrayData>& data)
NumericArray<T>::NumericArray(const std::shared_ptr<ArrayData>& data)
: PrimitiveArray(data) {
DCHECK_EQ(data->type->id(), T::type_id);
}

// ----------------------------------------------------------------------
// BooleanArray

BooleanArray::BooleanArray(const std::shared_ptr<internal::ArrayData>& data)
BooleanArray::BooleanArray(const std::shared_ptr<ArrayData>& data)
: PrimitiveArray(data) {
DCHECK_EQ(data->type->id(), Type::BOOL);
}
Expand Down Expand Up @@ -215,9 +213,9 @@ Status ListArray::FromArrays(const Array& offsets, const Array& values, MemoryPo
static_cast<const Int32Array&>(offsets).values()};

auto list_type = list(values.type());
auto internal_data = std::make_shared<internal::ArrayData>(
list_type, offsets.length() - 1, std::move(buffers), offsets.null_count(),
offsets.offset());
auto internal_data =
std::make_shared<ArrayData>(list_type, offsets.length() - 1, std::move(buffers),
offsets.null_count(), offsets.offset());
internal_data->child_data.push_back(values.data());

*out = std::make_shared<ListArray>(internal_data);
Expand All @@ -230,7 +228,7 @@ void ListArray::SetData(const std::shared_ptr<ArrayData>& data) {
raw_value_offsets_ = value_offsets == nullptr
? nullptr
: reinterpret_cast<const int32_t*>(value_offsets->data());
DCHECK(internal::MakeArray(data_->child_data[0], &values_).ok());
DCHECK(MakeArray(data_->child_data[0], &values_).ok());
}

std::shared_ptr<DataType> ListArray::value_type() const {
Expand All @@ -245,7 +243,7 @@ std::shared_ptr<Array> ListArray::values() const { return values_; }
static std::shared_ptr<DataType> kBinary = std::make_shared<BinaryType>();
static std::shared_ptr<DataType> kString = std::make_shared<StringType>();

BinaryArray::BinaryArray(const std::shared_ptr<internal::ArrayData>& data) {
BinaryArray::BinaryArray(const std::shared_ptr<ArrayData>& data) {
DCHECK_EQ(data->type->id(), Type::BINARY);
SetData(data);
}
Expand Down Expand Up @@ -277,7 +275,7 @@ BinaryArray::BinaryArray(const std::shared_ptr<DataType>& type, int64_t length,
std::make_shared<ArrayData>(type, length, std::move(buffers), null_count, offset));
}

StringArray::StringArray(const std::shared_ptr<internal::ArrayData>& data) {
StringArray::StringArray(const std::shared_ptr<ArrayData>& data) {
DCHECK_EQ(data->type->id(), Type::STRING);
SetData(data);
}
Expand All @@ -292,8 +290,7 @@ StringArray::StringArray(int64_t length, const std::shared_ptr<Buffer>& value_of
// ----------------------------------------------------------------------
// Fixed width binary

FixedSizeBinaryArray::FixedSizeBinaryArray(
const std::shared_ptr<internal::ArrayData>& data) {
FixedSizeBinaryArray::FixedSizeBinaryArray(const std::shared_ptr<ArrayData>& data) {
SetData(data);
}

Expand All @@ -312,7 +309,7 @@ const uint8_t* FixedSizeBinaryArray::GetValue(int64_t i) const {
// ----------------------------------------------------------------------
// Decimal

DecimalArray::DecimalArray(const std::shared_ptr<internal::ArrayData>& data)
DecimalArray::DecimalArray(const std::shared_ptr<ArrayData>& data)
: FixedSizeBinaryArray(data) {
DCHECK_EQ(data->type->id(), Type::DECIMAL);
}
Expand Down Expand Up @@ -347,7 +344,7 @@ StructArray::StructArray(const std::shared_ptr<DataType>& type, int64_t length,

std::shared_ptr<Array> StructArray::field(int i) const {
if (!boxed_fields_[i]) {
DCHECK(internal::MakeArray(data_->child_data[i], &boxed_fields_[i]).ok());
DCHECK(MakeArray(data_->child_data[i], &boxed_fields_[i]).ok());
}
return boxed_fields_[i];
}
Expand Down Expand Up @@ -390,7 +387,7 @@ UnionArray::UnionArray(const std::shared_ptr<DataType>& type, int64_t length,

std::shared_ptr<Array> UnionArray::child(int i) const {
if (!boxed_fields_[i]) {
DCHECK(internal::MakeArray(data_->child_data[i], &boxed_fields_[i]).ok());
DCHECK(MakeArray(data_->child_data[i], &boxed_fields_[i]).ok());
}
return boxed_fields_[i];
}
Expand Down Expand Up @@ -419,7 +416,7 @@ void DictionaryArray::SetData(const std::shared_ptr<ArrayData>& data) {
auto indices_data = data_->ShallowCopy();
indices_data->type = dict_type_->index_type();
std::shared_ptr<Array> result;
DCHECK(internal::MakeArray(indices_data, &indices_).ok());
DCHECK(MakeArray(indices_data, &indices_).ok());
}

std::shared_ptr<Array> DictionaryArray::indices() const { return indices_; }
Expand Down Expand Up @@ -599,31 +596,35 @@ class ArrayDataWrapper {
std::shared_ptr<Array>* out_;
};

} // namespace internal

// Remove enclosing namespace after 0.7.0
Status MakeArray(const std::shared_ptr<ArrayData>& data, std::shared_ptr<Array>* out) {
ArrayDataWrapper wrapper_visitor(data, out);
internal::ArrayDataWrapper wrapper_visitor(data, out);
return VisitTypeInline(*data->type, &wrapper_visitor);
}

} // namespace internal

#ifndef ARROW_NO_DEPRECATED_API
// \deprecated Since 0.7.0
Status MakePrimitiveArray(const std::shared_ptr<DataType>& type, int64_t length,
const std::shared_ptr<Buffer>& data,
const std::shared_ptr<Buffer>& null_bitmap, int64_t null_count,
int64_t offset, std::shared_ptr<Array>* out) {
BufferVector buffers = {null_bitmap, data};
auto internal_data = std::make_shared<internal::ArrayData>(
type, length, std::move(buffers), null_count, offset);
return internal::MakeArray(internal_data, out);
auto internal_data =
std::make_shared<ArrayData>(type, length, std::move(buffers), null_count, offset);
return MakeArray(internal_data, out);
}

Status MakePrimitiveArray(const std::shared_ptr<DataType>& type,
const std::vector<std::shared_ptr<Buffer>>& buffers,
int64_t length, int64_t null_count, int64_t offset,
std::shared_ptr<Array>* out) {
auto internal_data =
std::make_shared<internal::ArrayData>(type, length, buffers, null_count, offset);
return internal::MakeArray(internal_data, out);
std::make_shared<ArrayData>(type, length, buffers, null_count, offset);
return MakeArray(internal_data, out);
}
#endif

// ----------------------------------------------------------------------
// Instantiate templates
Expand Down
Loading