You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@arrow.apache.org by "tustvold (via GitHub)" <gi...@apache.org> on 2023/02/08 14:10:27 UTC
[GitHub] [arrow-rs] tustvold opened a new pull request, #3676: Add ArrayData::new_null and DataType::primitive_width
tustvold opened a new pull request, #3676:
URL: https://github.com/apache/arrow-rs/pull/3676
# Which issue does this PR close?
<!--
We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123.
-->
Closes #.
# Rationale for this change
<!--
Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed.
Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes.
-->
This makes it easier to create a null array of a concrete type, adds support for more types of null array (e.g. UnionArray and RunArray), and reduces some code duplication
# What changes are included in this PR?
<!--
There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR.
-->
# Are there any user-facing changes?
<!--
If there are user-facing changes then we may require documentation to be updated before approving the PR.
-->
<!---
If there are any breaking changes to public APIs, please add the `breaking change` label.
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] viirya commented on a diff in pull request #3676: Add ArrayData::new_null and DataType::primitive_width
Posted by "viirya (via GitHub)" <gi...@apache.org>.
viirya commented on code in PR #3676:
URL: https://github.com/apache/arrow-rs/pull/3676#discussion_r1100616947
##########
arrow-data/src/data.rs:
##########
@@ -667,83 +589,121 @@ impl ArrayData {
&values.1[self.offset..]
}
- /// Returns a new empty [ArrayData] valid for `data_type`.
- pub fn new_empty(data_type: &DataType) -> Self {
- let buffers = new_buffers(data_type, 0);
- let [buffer1, buffer2] = buffers;
- let buffers = into_buffers(data_type, buffer1, buffer2);
-
- let child_data = match data_type {
- DataType::Null
- | DataType::Boolean
- | DataType::UInt8
- | DataType::UInt16
- | DataType::UInt32
- | DataType::UInt64
- | DataType::Int8
- | DataType::Int16
- | DataType::Int32
- | DataType::Int64
- | DataType::Float16
- | DataType::Float32
- | DataType::Float64
- | DataType::Date32
- | DataType::Date64
- | DataType::Time32(_)
- | DataType::Time64(_)
- | DataType::Duration(_)
- | DataType::Timestamp(_, _)
- | DataType::Utf8
- | DataType::Binary
- | DataType::LargeUtf8
- | DataType::LargeBinary
- | DataType::Interval(_)
- | DataType::FixedSizeBinary(_)
- | DataType::Decimal128(_, _)
- | DataType::Decimal256(_, _) => vec![],
- DataType::List(field) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::FixedSizeList(field, _) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::LargeList(field) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::Struct(fields) => fields
- .iter()
- .map(|field| Self::new_empty(field.data_type()))
- .collect(),
- DataType::Map(field, _) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::Union(fields, _, _) => fields
- .iter()
- .map(|field| Self::new_empty(field.data_type()))
- .collect(),
- DataType::Dictionary(_, data_type) => {
- vec![Self::new_empty(data_type)]
- }
- DataType::RunEndEncoded(run_ends, values) => {
- vec![
- Self::new_empty(run_ends.data_type()),
- Self::new_empty(values.data_type()),
- ]
- }
+ /// Returns a new [`ArrayData`] valid for `data_type` containing `len` null values
+ pub fn new_null(data_type: &DataType, len: usize) -> Self {
+ let bit_len = bit_util::ceil(len, 8);
+ let zeroed = |len: usize| Buffer::from(MutableBuffer::from_len_zeroed(len));
+
+ let (buffers, child_data, has_nulls) = match data_type.primitive_width() {
+ Some(width) => (vec![zeroed(width * len)], vec![], true),
+ None => match data_type {
+ DataType::Null => (vec![], vec![], false),
+ DataType::Boolean => (vec![zeroed(bit_len)], vec![], true),
+ DataType::Binary | DataType::Utf8 => {
+ (vec![zeroed((len + 1) * 4), zeroed(0)], vec![], true)
+ }
+ DataType::LargeBinary | DataType::LargeUtf8 => {
+ (vec![zeroed((len + 1) * 8), zeroed(0)], vec![], true)
+ }
+ DataType::FixedSizeBinary(i) => {
+ (vec![zeroed(*i as usize * len)], vec![], true)
+ }
+ DataType::List(f) | DataType::Map(f, _) => (
+ vec![zeroed((len + 1) * 4)],
+ vec![ArrayData::new_empty(f.data_type())],
+ true,
+ ),
+ DataType::LargeList(f) => (
+ vec![zeroed((len + 1) * 8)],
+ vec![ArrayData::new_empty(f.data_type())],
+ true,
+ ),
+ DataType::FixedSizeList(f, list_len) => (
+ vec![],
+ vec![ArrayData::new_null(f.data_type(), *list_len as usize * len)],
+ true,
+ ),
+ DataType::Struct(fields) => (
+ vec![],
+ fields
+ .iter()
+ .map(|f| Self::new_null(f.data_type(), len))
+ .collect(),
+ true,
+ ),
+ DataType::Dictionary(k, v) => (
+ vec![zeroed(k.primitive_width().unwrap() * len)],
+ vec![ArrayData::new_empty(v.as_ref())],
+ true,
+ ),
+ DataType::Union(f, i, mode) => {
+ let ids = Buffer::from_iter(std::iter::repeat(i[0]).take(len));
Review Comment:
Ha. 😄
Just wondering if it will cause issue later, e.g. interoperate with other arrow libraries?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] tustvold merged pull request #3676: Add ArrayData::new_null and DataType::primitive_width
Posted by "tustvold (via GitHub)" <gi...@apache.org>.
tustvold merged PR #3676:
URL: https://github.com/apache/arrow-rs/pull/3676
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] askoa commented on a diff in pull request #3676: Add ArrayData::new_null and DataType::primitive_width
Posted by "askoa (via GitHub)" <gi...@apache.org>.
askoa commented on code in PR #3676:
URL: https://github.com/apache/arrow-rs/pull/3676#discussion_r1100460994
##########
arrow-data/src/data.rs:
##########
@@ -667,83 +589,121 @@ impl ArrayData {
&values.1[self.offset..]
}
- /// Returns a new empty [ArrayData] valid for `data_type`.
- pub fn new_empty(data_type: &DataType) -> Self {
- let buffers = new_buffers(data_type, 0);
- let [buffer1, buffer2] = buffers;
- let buffers = into_buffers(data_type, buffer1, buffer2);
-
- let child_data = match data_type {
- DataType::Null
- | DataType::Boolean
- | DataType::UInt8
- | DataType::UInt16
- | DataType::UInt32
- | DataType::UInt64
- | DataType::Int8
- | DataType::Int16
- | DataType::Int32
- | DataType::Int64
- | DataType::Float16
- | DataType::Float32
- | DataType::Float64
- | DataType::Date32
- | DataType::Date64
- | DataType::Time32(_)
- | DataType::Time64(_)
- | DataType::Duration(_)
- | DataType::Timestamp(_, _)
- | DataType::Utf8
- | DataType::Binary
- | DataType::LargeUtf8
- | DataType::LargeBinary
- | DataType::Interval(_)
- | DataType::FixedSizeBinary(_)
- | DataType::Decimal128(_, _)
- | DataType::Decimal256(_, _) => vec![],
- DataType::List(field) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::FixedSizeList(field, _) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::LargeList(field) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::Struct(fields) => fields
- .iter()
- .map(|field| Self::new_empty(field.data_type()))
- .collect(),
- DataType::Map(field, _) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::Union(fields, _, _) => fields
- .iter()
- .map(|field| Self::new_empty(field.data_type()))
- .collect(),
- DataType::Dictionary(_, data_type) => {
- vec![Self::new_empty(data_type)]
- }
- DataType::RunEndEncoded(run_ends, values) => {
- vec![
- Self::new_empty(run_ends.data_type()),
- Self::new_empty(values.data_type()),
- ]
- }
+ /// Returns a new [`ArrayData`] valid for `data_type` containing `len` null values
+ pub fn new_null(data_type: &DataType, len: usize) -> Self {
+ let bit_len = bit_util::ceil(len, 8);
+ let zeroed = |len: usize| Buffer::from(MutableBuffer::from_len_zeroed(len));
+
+ let (buffers, child_data, has_nulls) = match data_type.primitive_width() {
+ Some(width) => (vec![zeroed(width * len)], vec![], true),
+ None => match data_type {
+ DataType::Null => (vec![], vec![], false),
+ DataType::Boolean => (vec![zeroed(bit_len)], vec![], true),
+ DataType::Binary | DataType::Utf8 => {
+ (vec![zeroed((len + 1) * 4), zeroed(0)], vec![], true)
+ }
+ DataType::LargeBinary | DataType::LargeUtf8 => {
+ (vec![zeroed((len + 1) * 8), zeroed(0)], vec![], true)
+ }
+ DataType::FixedSizeBinary(i) => {
+ (vec![zeroed(*i as usize * len)], vec![], true)
+ }
+ DataType::List(f) | DataType::Map(f, _) => (
+ vec![zeroed((len + 1) * 4)],
+ vec![ArrayData::new_empty(f.data_type())],
+ true,
+ ),
+ DataType::LargeList(f) => (
+ vec![zeroed((len + 1) * 8)],
+ vec![ArrayData::new_empty(f.data_type())],
+ true,
+ ),
+ DataType::FixedSizeList(f, list_len) => (
+ vec![],
+ vec![ArrayData::new_null(f.data_type(), *list_len as usize * len)],
+ true,
+ ),
+ DataType::Struct(fields) => (
+ vec![],
+ fields
+ .iter()
+ .map(|f| Self::new_null(f.data_type(), len))
+ .collect(),
+ true,
+ ),
+ DataType::Dictionary(k, v) => (
+ vec![zeroed(k.primitive_width().unwrap() * len)],
+ vec![ArrayData::new_empty(v.as_ref())],
+ true,
+ ),
+ DataType::Union(f, i, mode) => {
+ let ids = Buffer::from_iter(std::iter::repeat(i[0]).take(len));
+ let buffers = match mode {
+ UnionMode::Sparse => vec![ids],
+ UnionMode::Dense => {
+ let end_offset = i32::from_usize(len).unwrap();
+ vec![ids, Buffer::from_iter(0_i32..end_offset)]
+ }
+ };
+
+ let children = f
+ .iter()
+ .map(|f| Self::new_null(f.data_type(), len))
+ .collect();
+
+ (buffers, children, false)
+ }
+ DataType::RunEndEncoded(r, v) => {
+ let runs = match r.data_type() {
+ DataType::Int16 => {
+ let i = i16::from_usize(len).expect("run overflow");
+ Buffer::from_slice_ref([i])
+ }
+ DataType::Int32 => {
+ let i = i32::from_usize(len).expect("run overflow");
+ Buffer::from_slice_ref([i])
+ }
+ DataType::Int64 => {
+ let i = i64::from_usize(len).expect("run overflow");
+ Buffer::from_slice_ref([i])
+ }
+ _ => unreachable!(),
Review Comment:
```suggestion
dt => unreachable!("Invalid run ends data type {dt}"),
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] ursabot commented on pull request #3676: Add ArrayData::new_null and DataType::primitive_width
Posted by "ursabot (via GitHub)" <gi...@apache.org>.
ursabot commented on PR #3676:
URL: https://github.com/apache/arrow-rs/pull/3676#issuecomment-1424197296
Benchmark runs are scheduled for baseline = 6ec7226cdcafa9326d7f11a3e421e1e1038ca677 and contender = 7cd29d7353369589c18377de4300c44f91a54462. 7cd29d7353369589c18377de4300c44f91a54462 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Skipped :warning: Benchmarking of arrow-rs-commits is not supported on ec2-t3-xlarge-us-east-2] [ec2-t3-xlarge-us-east-2](https://conbench.ursa.dev/compare/runs/4cd6f763d3854543807efb24d79464fc...9b26c312f17247348590cc49538f167f/)
[Skipped :warning: Benchmarking of arrow-rs-commits is not supported on test-mac-arm] [test-mac-arm](https://conbench.ursa.dev/compare/runs/5a5f083e4dac44faae021963722add9d...44bed87a65b84e7096c49b21a8d4909e/)
[Skipped :warning: Benchmarking of arrow-rs-commits is not supported on ursa-i9-9960x] [ursa-i9-9960x](https://conbench.ursa.dev/compare/runs/7f8dc2fdacd04690bd38b537090a548f...24c87750dc1b4fe8a9b38c513db4eed9/)
[Skipped :warning: Benchmarking of arrow-rs-commits is not supported on ursa-thinkcentre-m75q] [ursa-thinkcentre-m75q](https://conbench.ursa.dev/compare/runs/4c0149a398f9494384bc604dc6881298...1a7ced0582a24b50a0085ce2aac75221/)
Buildkite builds:
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] tustvold commented on a diff in pull request #3676: Add ArrayData::new_null and DataType::primitive_width
Posted by "tustvold (via GitHub)" <gi...@apache.org>.
tustvold commented on code in PR #3676:
URL: https://github.com/apache/arrow-rs/pull/3676#discussion_r1100605048
##########
arrow-data/src/data.rs:
##########
@@ -667,83 +589,121 @@ impl ArrayData {
&values.1[self.offset..]
}
- /// Returns a new empty [ArrayData] valid for `data_type`.
- pub fn new_empty(data_type: &DataType) -> Self {
- let buffers = new_buffers(data_type, 0);
- let [buffer1, buffer2] = buffers;
- let buffers = into_buffers(data_type, buffer1, buffer2);
-
- let child_data = match data_type {
- DataType::Null
- | DataType::Boolean
- | DataType::UInt8
- | DataType::UInt16
- | DataType::UInt32
- | DataType::UInt64
- | DataType::Int8
- | DataType::Int16
- | DataType::Int32
- | DataType::Int64
- | DataType::Float16
- | DataType::Float32
- | DataType::Float64
- | DataType::Date32
- | DataType::Date64
- | DataType::Time32(_)
- | DataType::Time64(_)
- | DataType::Duration(_)
- | DataType::Timestamp(_, _)
- | DataType::Utf8
- | DataType::Binary
- | DataType::LargeUtf8
- | DataType::LargeBinary
- | DataType::Interval(_)
- | DataType::FixedSizeBinary(_)
- | DataType::Decimal128(_, _)
- | DataType::Decimal256(_, _) => vec![],
- DataType::List(field) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::FixedSizeList(field, _) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::LargeList(field) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::Struct(fields) => fields
- .iter()
- .map(|field| Self::new_empty(field.data_type()))
- .collect(),
- DataType::Map(field, _) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::Union(fields, _, _) => fields
- .iter()
- .map(|field| Self::new_empty(field.data_type()))
- .collect(),
- DataType::Dictionary(_, data_type) => {
- vec![Self::new_empty(data_type)]
- }
- DataType::RunEndEncoded(run_ends, values) => {
- vec![
- Self::new_empty(run_ends.data_type()),
- Self::new_empty(values.data_type()),
- ]
- }
+ /// Returns a new [`ArrayData`] valid for `data_type` containing `len` null values
+ pub fn new_null(data_type: &DataType, len: usize) -> Self {
+ let bit_len = bit_util::ceil(len, 8);
+ let zeroed = |len: usize| Buffer::from(MutableBuffer::from_len_zeroed(len));
+
+ let (buffers, child_data, has_nulls) = match data_type.primitive_width() {
+ Some(width) => (vec![zeroed(width * len)], vec![], true),
+ None => match data_type {
+ DataType::Null => (vec![], vec![], false),
+ DataType::Boolean => (vec![zeroed(bit_len)], vec![], true),
+ DataType::Binary | DataType::Utf8 => {
+ (vec![zeroed((len + 1) * 4), zeroed(0)], vec![], true)
+ }
+ DataType::LargeBinary | DataType::LargeUtf8 => {
+ (vec![zeroed((len + 1) * 8), zeroed(0)], vec![], true)
+ }
+ DataType::FixedSizeBinary(i) => {
+ (vec![zeroed(*i as usize * len)], vec![], true)
+ }
+ DataType::List(f) | DataType::Map(f, _) => (
+ vec![zeroed((len + 1) * 4)],
+ vec![ArrayData::new_empty(f.data_type())],
+ true,
+ ),
+ DataType::LargeList(f) => (
+ vec![zeroed((len + 1) * 8)],
+ vec![ArrayData::new_empty(f.data_type())],
+ true,
+ ),
+ DataType::FixedSizeList(f, list_len) => (
+ vec![],
+ vec![ArrayData::new_null(f.data_type(), *list_len as usize * len)],
+ true,
+ ),
+ DataType::Struct(fields) => (
+ vec![],
+ fields
+ .iter()
+ .map(|f| Self::new_null(f.data_type(), len))
+ .collect(),
+ true,
+ ),
+ DataType::Dictionary(k, v) => (
+ vec![zeroed(k.primitive_width().unwrap() * len)],
+ vec![ArrayData::new_empty(v.as_ref())],
+ true,
+ ),
+ DataType::Union(f, i, mode) => {
+ let ids = Buffer::from_iter(std::iter::repeat(i[0]).take(len));
Review Comment:
I was being lazy :laughing:
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] viirya commented on a diff in pull request #3676: Add ArrayData::new_null and DataType::primitive_width
Posted by "viirya (via GitHub)" <gi...@apache.org>.
viirya commented on code in PR #3676:
URL: https://github.com/apache/arrow-rs/pull/3676#discussion_r1100603418
##########
arrow-data/src/data.rs:
##########
@@ -667,83 +589,121 @@ impl ArrayData {
&values.1[self.offset..]
}
- /// Returns a new empty [ArrayData] valid for `data_type`.
- pub fn new_empty(data_type: &DataType) -> Self {
- let buffers = new_buffers(data_type, 0);
- let [buffer1, buffer2] = buffers;
- let buffers = into_buffers(data_type, buffer1, buffer2);
-
- let child_data = match data_type {
- DataType::Null
- | DataType::Boolean
- | DataType::UInt8
- | DataType::UInt16
- | DataType::UInt32
- | DataType::UInt64
- | DataType::Int8
- | DataType::Int16
- | DataType::Int32
- | DataType::Int64
- | DataType::Float16
- | DataType::Float32
- | DataType::Float64
- | DataType::Date32
- | DataType::Date64
- | DataType::Time32(_)
- | DataType::Time64(_)
- | DataType::Duration(_)
- | DataType::Timestamp(_, _)
- | DataType::Utf8
- | DataType::Binary
- | DataType::LargeUtf8
- | DataType::LargeBinary
- | DataType::Interval(_)
- | DataType::FixedSizeBinary(_)
- | DataType::Decimal128(_, _)
- | DataType::Decimal256(_, _) => vec![],
- DataType::List(field) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::FixedSizeList(field, _) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::LargeList(field) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::Struct(fields) => fields
- .iter()
- .map(|field| Self::new_empty(field.data_type()))
- .collect(),
- DataType::Map(field, _) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::Union(fields, _, _) => fields
- .iter()
- .map(|field| Self::new_empty(field.data_type()))
- .collect(),
- DataType::Dictionary(_, data_type) => {
- vec![Self::new_empty(data_type)]
- }
- DataType::RunEndEncoded(run_ends, values) => {
- vec![
- Self::new_empty(run_ends.data_type()),
- Self::new_empty(values.data_type()),
- ]
- }
+ /// Returns a new [`ArrayData`] valid for `data_type` containing `len` null values
+ pub fn new_null(data_type: &DataType, len: usize) -> Self {
+ let bit_len = bit_util::ceil(len, 8);
+ let zeroed = |len: usize| Buffer::from(MutableBuffer::from_len_zeroed(len));
+
+ let (buffers, child_data, has_nulls) = match data_type.primitive_width() {
+ Some(width) => (vec![zeroed(width * len)], vec![], true),
+ None => match data_type {
+ DataType::Null => (vec![], vec![], false),
+ DataType::Boolean => (vec![zeroed(bit_len)], vec![], true),
+ DataType::Binary | DataType::Utf8 => {
+ (vec![zeroed((len + 1) * 4), zeroed(0)], vec![], true)
+ }
+ DataType::LargeBinary | DataType::LargeUtf8 => {
+ (vec![zeroed((len + 1) * 8), zeroed(0)], vec![], true)
+ }
+ DataType::FixedSizeBinary(i) => {
+ (vec![zeroed(*i as usize * len)], vec![], true)
+ }
+ DataType::List(f) | DataType::Map(f, _) => (
+ vec![zeroed((len + 1) * 4)],
+ vec![ArrayData::new_empty(f.data_type())],
+ true,
+ ),
+ DataType::LargeList(f) => (
+ vec![zeroed((len + 1) * 8)],
+ vec![ArrayData::new_empty(f.data_type())],
+ true,
+ ),
+ DataType::FixedSizeList(f, list_len) => (
+ vec![],
+ vec![ArrayData::new_null(f.data_type(), *list_len as usize * len)],
+ true,
+ ),
+ DataType::Struct(fields) => (
+ vec![],
+ fields
+ .iter()
+ .map(|f| Self::new_null(f.data_type(), len))
+ .collect(),
+ true,
+ ),
+ DataType::Dictionary(k, v) => (
+ vec![zeroed(k.primitive_width().unwrap() * len)],
+ vec![ArrayData::new_empty(v.as_ref())],
+ true,
+ ),
+ DataType::Union(f, i, mode) => {
+ let ids = Buffer::from_iter(std::iter::repeat(i[0]).take(len));
Review Comment:
Is it correct? Why repeating same type id? I think this indicates all values in the UnionArray are from same child array (`id[0]`)? But looks like you still produce all children null array?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow-rs] tustvold commented on a diff in pull request #3676: Add ArrayData::new_null and DataType::primitive_width
Posted by "tustvold (via GitHub)" <gi...@apache.org>.
tustvold commented on code in PR #3676:
URL: https://github.com/apache/arrow-rs/pull/3676#discussion_r1100605048
##########
arrow-data/src/data.rs:
##########
@@ -667,83 +589,121 @@ impl ArrayData {
&values.1[self.offset..]
}
- /// Returns a new empty [ArrayData] valid for `data_type`.
- pub fn new_empty(data_type: &DataType) -> Self {
- let buffers = new_buffers(data_type, 0);
- let [buffer1, buffer2] = buffers;
- let buffers = into_buffers(data_type, buffer1, buffer2);
-
- let child_data = match data_type {
- DataType::Null
- | DataType::Boolean
- | DataType::UInt8
- | DataType::UInt16
- | DataType::UInt32
- | DataType::UInt64
- | DataType::Int8
- | DataType::Int16
- | DataType::Int32
- | DataType::Int64
- | DataType::Float16
- | DataType::Float32
- | DataType::Float64
- | DataType::Date32
- | DataType::Date64
- | DataType::Time32(_)
- | DataType::Time64(_)
- | DataType::Duration(_)
- | DataType::Timestamp(_, _)
- | DataType::Utf8
- | DataType::Binary
- | DataType::LargeUtf8
- | DataType::LargeBinary
- | DataType::Interval(_)
- | DataType::FixedSizeBinary(_)
- | DataType::Decimal128(_, _)
- | DataType::Decimal256(_, _) => vec![],
- DataType::List(field) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::FixedSizeList(field, _) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::LargeList(field) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::Struct(fields) => fields
- .iter()
- .map(|field| Self::new_empty(field.data_type()))
- .collect(),
- DataType::Map(field, _) => {
- vec![Self::new_empty(field.data_type())]
- }
- DataType::Union(fields, _, _) => fields
- .iter()
- .map(|field| Self::new_empty(field.data_type()))
- .collect(),
- DataType::Dictionary(_, data_type) => {
- vec![Self::new_empty(data_type)]
- }
- DataType::RunEndEncoded(run_ends, values) => {
- vec![
- Self::new_empty(run_ends.data_type()),
- Self::new_empty(values.data_type()),
- ]
- }
+ /// Returns a new [`ArrayData`] valid for `data_type` containing `len` null values
+ pub fn new_null(data_type: &DataType, len: usize) -> Self {
+ let bit_len = bit_util::ceil(len, 8);
+ let zeroed = |len: usize| Buffer::from(MutableBuffer::from_len_zeroed(len));
+
+ let (buffers, child_data, has_nulls) = match data_type.primitive_width() {
+ Some(width) => (vec![zeroed(width * len)], vec![], true),
+ None => match data_type {
+ DataType::Null => (vec![], vec![], false),
+ DataType::Boolean => (vec![zeroed(bit_len)], vec![], true),
+ DataType::Binary | DataType::Utf8 => {
+ (vec![zeroed((len + 1) * 4), zeroed(0)], vec![], true)
+ }
+ DataType::LargeBinary | DataType::LargeUtf8 => {
+ (vec![zeroed((len + 1) * 8), zeroed(0)], vec![], true)
+ }
+ DataType::FixedSizeBinary(i) => {
+ (vec![zeroed(*i as usize * len)], vec![], true)
+ }
+ DataType::List(f) | DataType::Map(f, _) => (
+ vec![zeroed((len + 1) * 4)],
+ vec![ArrayData::new_empty(f.data_type())],
+ true,
+ ),
+ DataType::LargeList(f) => (
+ vec![zeroed((len + 1) * 8)],
+ vec![ArrayData::new_empty(f.data_type())],
+ true,
+ ),
+ DataType::FixedSizeList(f, list_len) => (
+ vec![],
+ vec![ArrayData::new_null(f.data_type(), *list_len as usize * len)],
+ true,
+ ),
+ DataType::Struct(fields) => (
+ vec![],
+ fields
+ .iter()
+ .map(|f| Self::new_null(f.data_type(), len))
+ .collect(),
+ true,
+ ),
+ DataType::Dictionary(k, v) => (
+ vec![zeroed(k.primitive_width().unwrap() * len)],
+ vec![ArrayData::new_empty(v.as_ref())],
+ true,
+ ),
+ DataType::Union(f, i, mode) => {
+ let ids = Buffer::from_iter(std::iter::repeat(i[0]).take(len));
Review Comment:
I was being lazy :laughing: It should be harmless for the children to have more data than they technically need.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org