You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@arrow.apache.org by GitBox <gi...@apache.org> on 2022/10/16 06:07:26 UTC
[GitHub] [arrow-rs] tustvold opened a new pull request, #2886: Simplify ListArray::from_iter_primitive
tustvold opened a new pull request, #2886:
URL: https://github.com/apache/arrow-rs/pull/2886
# 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.
-->
Drive by cleanup
# 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] tustvold commented on a diff in pull request #2886: Simplify ListArray::from_iter_primitive
Posted by GitBox <gi...@apache.org>.
tustvold commented on code in PR #2886:
URL: https://github.com/apache/arrow-rs/pull/2886#discussion_r996394519
##########
arrow-array/src/array/list_array.rs:
##########
@@ -157,47 +157,26 @@ impl<OffsetSize: OffsetSizeTrait> GenericListArray<OffsetSize> {
pub fn from_iter_primitive<T, P, I>(iter: I) -> Self
where
T: ArrowPrimitiveType,
- P: AsRef<[Option<<T as ArrowPrimitiveType>::Native>]>
Review Comment:
This AsRef constraint is rather constraining
##########
arrow-array/src/array/list_array.rs:
##########
@@ -157,47 +157,26 @@ impl<OffsetSize: OffsetSizeTrait> GenericListArray<OffsetSize> {
pub fn from_iter_primitive<T, P, I>(iter: I) -> Self
where
T: ArrowPrimitiveType,
- P: AsRef<[Option<<T as ArrowPrimitiveType>::Native>]>
Review Comment:
This AsRef constraint is rather constraining, it is good to see it gone
--
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 #2886: Simplify ListArray::from_iter_primitive
Posted by GitBox <gi...@apache.org>.
tustvold merged PR #2886:
URL: https://github.com/apache/arrow-rs/pull/2886
--
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 pull request #2886: Simplify ListArray::from_iter_primitive
Posted by GitBox <gi...@apache.org>.
tustvold commented on PR #2886:
URL: https://github.com/apache/arrow-rs/pull/2886#issuecomment-1282813389
> This is also an API change as well, is it not
Not sure, as it is only removing a trait bound not adding a new one. So it should be backwards compatible
--
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] alamb commented on a diff in pull request #2886: Simplify ListArray::from_iter_primitive
Posted by GitBox <gi...@apache.org>.
alamb commented on code in PR #2886:
URL: https://github.com/apache/arrow-rs/pull/2886#discussion_r998545852
##########
arrow-array/src/array/list_array.rs:
##########
@@ -157,47 +157,26 @@ impl<OffsetSize: OffsetSizeTrait> GenericListArray<OffsetSize> {
pub fn from_iter_primitive<T, P, I>(iter: I) -> Self
where
T: ArrowPrimitiveType,
- P: AsRef<[Option<<T as ArrowPrimitiveType>::Native>]>
- + IntoIterator<Item = Option<<T as ArrowPrimitiveType>::Native>>,
+ P: IntoIterator<Item = Option<<T as ArrowPrimitiveType>::Native>>,
I: IntoIterator<Item = Option<P>>,
{
- let iterator = iter.into_iter();
- let (lower, _) = iterator.size_hint();
-
- let mut offsets =
- MutableBuffer::new((lower + 1) * std::mem::size_of::<OffsetSize>());
- let mut length_so_far = OffsetSize::zero();
- offsets.push(length_so_far);
-
- let mut null_buf = BooleanBufferBuilder::new(lower);
-
- let values: PrimitiveArray<T> = iterator
- .filter_map(|maybe_slice| {
- // regardless of whether the item is Some, the offsets and null buffers must be updated.
- match &maybe_slice {
- Some(x) => {
- length_so_far +=
- OffsetSize::from_usize(x.as_ref().len()).unwrap();
- null_buf.append(true);
+ let iter = iter.into_iter();
+ let size_hint = iter.size_hint().0;
+ let mut builder =
+ GenericListBuilder::with_capacity(PrimitiveBuilder::<T>::new(), size_hint);
+
+ for i in iter {
+ match i {
+ Some(p) => {
+ for t in p {
+ builder.values().append_option(t);
}
- None => null_buf.append(false),
- };
- offsets.push(length_so_far);
- maybe_slice
- })
- .flatten()
- .collect();
-
- let field = Box::new(Field::new("item", T::DATA_TYPE, true));
- let data_type = Self::DATA_TYPE_CONSTRUCTOR(field);
- let array_data = ArrayData::builder(data_type)
- .len(null_buf.len())
- .add_buffer(offsets.into())
- .add_child_data(values.into_data())
- .null_bit_buffer(Some(null_buf.into()));
- let array_data = unsafe { array_data.build_unchecked() };
-
- Self::from(array_data)
+ builder.append(true);
+ }
+ None => builder.append(false),
Review Comment:
does this need
```
builder.values().append_nulls(l);
```
As was added in https://github.com/apache/arrow-rs/pull/2887?
--
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 #2886: Simplify ListArray::from_iter_primitive
Posted by GitBox <gi...@apache.org>.
tustvold commented on code in PR #2886:
URL: https://github.com/apache/arrow-rs/pull/2886#discussion_r998563192
##########
arrow-array/src/array/list_array.rs:
##########
@@ -157,47 +157,26 @@ impl<OffsetSize: OffsetSizeTrait> GenericListArray<OffsetSize> {
pub fn from_iter_primitive<T, P, I>(iter: I) -> Self
where
T: ArrowPrimitiveType,
- P: AsRef<[Option<<T as ArrowPrimitiveType>::Native>]>
- + IntoIterator<Item = Option<<T as ArrowPrimitiveType>::Native>>,
+ P: IntoIterator<Item = Option<<T as ArrowPrimitiveType>::Native>>,
I: IntoIterator<Item = Option<P>>,
{
- let iterator = iter.into_iter();
- let (lower, _) = iterator.size_hint();
-
- let mut offsets =
- MutableBuffer::new((lower + 1) * std::mem::size_of::<OffsetSize>());
- let mut length_so_far = OffsetSize::zero();
- offsets.push(length_so_far);
-
- let mut null_buf = BooleanBufferBuilder::new(lower);
-
- let values: PrimitiveArray<T> = iterator
- .filter_map(|maybe_slice| {
- // regardless of whether the item is Some, the offsets and null buffers must be updated.
- match &maybe_slice {
- Some(x) => {
- length_so_far +=
- OffsetSize::from_usize(x.as_ref().len()).unwrap();
- null_buf.append(true);
+ let iter = iter.into_iter();
+ let size_hint = iter.size_hint().0;
+ let mut builder =
+ GenericListBuilder::with_capacity(PrimitiveBuilder::<T>::new(), size_hint);
+
+ for i in iter {
+ match i {
+ Some(p) => {
+ for t in p {
+ builder.values().append_option(t);
}
- None => null_buf.append(false),
- };
- offsets.push(length_so_far);
- maybe_slice
- })
- .flatten()
- .collect();
-
- let field = Box::new(Field::new("item", T::DATA_TYPE, true));
- let data_type = Self::DATA_TYPE_CONSTRUCTOR(field);
- let array_data = ArrayData::builder(data_type)
- .len(null_buf.len())
- .add_buffer(offsets.into())
- .add_child_data(values.into_data())
- .null_bit_buffer(Some(null_buf.into()));
- let array_data = unsafe { array_data.build_unchecked() };
-
- Self::from(array_data)
+ builder.append(true);
+ }
+ None => builder.append(false),
Review Comment:
No, that was only needed because nulls in a fixed size list take up the same amount of space as non-null values
--
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