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/05/10 08:13:48 UTC
[GitHub] [arrow-rs] HaoYang670 opened a new pull request, #1684: simplify offsets checking
HaoYang670 opened a new pull request, #1684:
URL: https://github.com/apache/arrow-rs/pull/1684
Signed-off-by: remzi <13...@gmail.com>
# 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 #1675.
# 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.
-->
# 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] HaoYang670 commented on a diff in pull request #1684: simplify offsets checking
Posted by GitBox <gi...@apache.org>.
HaoYang670 commented on code in PR #1684:
URL: https://github.com/apache/arrow-rs/pull/1684#discussion_r869015456
##########
arrow/src/array/data.rs:
##########
@@ -1033,72 +1035,61 @@ impl ArrayData {
}
/// Calls the `validate(item_index, range)` function for each of
- /// the ranges specified in the arrow offset buffer of type
+ /// the ranges specified in the arrow offsets buffer of type
/// `T`. Also validates that each offset is smaller than
- /// `max_offset`
+ /// `offset_limit`
+ ///
+ /// For an empty array, the offsets buffer can either be empty
+ /// or contain a single `0`.
///
- /// For example, the offset buffer contained `[1, 2, 4]`, this
+ /// For example, the offsets buffer contained `[1, 2, 4]`, this
/// function would call `validate([1,2])`, and `validate([2,4])`
fn validate_each_offset<T, V>(
&self,
- offset_buffer: &Buffer,
+ offsets_buffer: &Buffer,
offset_limit: usize,
validate: V,
) -> Result<()>
where
T: ArrowNativeType + std::convert::TryInto<usize> + num::Num + std::fmt::Display,
V: Fn(usize, Range<usize>) -> Result<()>,
{
- // An empty binary-like array can have 0 offsets
- if self.len == 0 && offset_buffer.is_empty() {
- return Ok(());
- }
-
- let offsets = self.typed_offsets::<T>(offset_buffer)?;
-
- offsets
+ let offsets = self.typed_offsets::<T>(offsets_buffer)?
.iter()
- .zip(offsets.iter().skip(1))
.enumerate()
- .map(|(i, (&start_offset, &end_offset))| {
- let start_offset: usize = start_offset
- .try_into()
- .map_err(|_| {
- ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: could not convert start_offset {} to usize in slot {}",
- start_offset, i))
- })?;
- let end_offset: usize = end_offset
- .try_into()
- .map_err(|_| {
- ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: Could not convert end_offset {} to usize in slot {}",
- end_offset, i+1))
- })?;
-
- if start_offset > offset_limit {
- return Err(ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: offset for slot {} out of bounds: {} > {}",
- i, start_offset, offset_limit))
- );
- }
-
- if end_offset > offset_limit {
- return Err(ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: offset for slot {} out of bounds: {} > {}",
- i, end_offset, offset_limit))
+ .map(|(i, x)| {
+ // check if the offset can be converted to usize
+ let r = x.to_usize().ok_or_else(|| {
+ ArrowError::InvalidArgumentError(format!(
+ "Offset invariant failure: Could not convert offset {} to usize at position {}",
+ x, i))}
);
+ // check if the offset exceeds the limit
+ match r {
+ Ok(n) if n <= offset_limit => Ok(n),
+ Ok(_) => Err(ArrowError::InvalidArgumentError(format!(
+ "Offset invariant failure: offset at position {} out of bounds: {} > {}",
+ i, x, offset_limit))
+ ),
+ err => err,
}
+ })
+ .collect::<Result<Vec<usize>>>()?;
Review Comment:
collect the result because I want to use the `windows` method
--
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] HaoYang670 commented on pull request #1684: simplify offsets checking
Posted by GitBox <gi...@apache.org>.
HaoYang670 commented on PR #1684:
URL: https://github.com/apache/arrow-rs/pull/1684#issuecomment-1123283421
Actually, I think we could do more. Because there is some redundant checking (such as comparing each offset with `offset_limit`). However, as a number of tests rely on that checking, I do not remove it.
--
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 #1684: simplify offsets checking
Posted by GitBox <gi...@apache.org>.
viirya commented on code in PR #1684:
URL: https://github.com/apache/arrow-rs/pull/1684#discussion_r869952421
##########
arrow/src/array/data.rs:
##########
@@ -1033,76 +1035,64 @@ impl ArrayData {
}
/// Calls the `validate(item_index, range)` function for each of
- /// the ranges specified in the arrow offset buffer of type
+ /// the ranges specified in the arrow offsets buffer of type
/// `T`. Also validates that each offset is smaller than
- /// `max_offset`
+ /// `offset_limit`
+ ///
+ /// For an empty array, the offsets buffer can either be empty
+ /// or contain a single `0`.
///
- /// For example, the offset buffer contained `[1, 2, 4]`, this
+ /// For example, the offsets buffer contained `[1, 2, 4]`, this
/// function would call `validate([1,2])`, and `validate([2,4])`
fn validate_each_offset<T, V>(
&self,
- offset_buffer: &Buffer,
+ offsets_buffer: &Buffer,
offset_limit: usize,
validate: V,
) -> Result<()>
where
T: ArrowNativeType + std::convert::TryInto<usize> + num::Num + std::fmt::Display,
V: Fn(usize, Range<usize>) -> Result<()>,
{
- // An empty binary-like array can have 0 offsets
- if self.len == 0 && offset_buffer.is_empty() {
- return Ok(());
- }
-
- let offsets = self.typed_offsets::<T>(offset_buffer)?;
-
- offsets
+ self.typed_offsets::<T>(offsets_buffer)?
.iter()
- .zip(offsets.iter().skip(1))
.enumerate()
- .map(|(i, (&start_offset, &end_offset))| {
- let start_offset: usize = start_offset
- .try_into()
- .map_err(|_| {
- ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: could not convert start_offset {} to usize in slot {}",
- start_offset, i))
- })?;
- let end_offset: usize = end_offset
- .try_into()
- .map_err(|_| {
- ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: Could not convert end_offset {} to usize in slot {}",
- end_offset, i+1))
- })?;
-
- if start_offset > offset_limit {
- return Err(ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: offset for slot {} out of bounds: {} > {}",
- i, start_offset, offset_limit))
- );
- }
-
- if end_offset > offset_limit {
- return Err(ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: offset for slot {} out of bounds: {} > {}",
- i, end_offset, offset_limit))
+ .map(|(i, x)| {
+ // check if the offset can be converted to usize
+ let r = x.to_usize().ok_or_else(|| {
+ ArrowError::InvalidArgumentError(format!(
+ "Offset invariant failure: Could not convert offset {} to usize at position {}",
+ x, i))}
);
+ // check if the offset exceeds the limit
+ match r {
+ Ok(n) if n <= offset_limit => Ok((i, n)),
+ Ok(_) => Err(ArrowError::InvalidArgumentError(format!(
+ "Offset invariant failure: offset at position {} out of bounds: {} > {}",
+ i, x, offset_limit))
+ ),
+ Err(e) => Err(e),
}
-
- // check range actually is low -> high
- if start_offset > end_offset {
- return Err(ArrowError::InvalidArgumentError(format!(
+ })
+ .scan(0_usize, |start, end| {
+ // check offsets are monotonically increasing
+ match end {
+ Ok((i, end)) if *start <= end => {
+ let range = Some(Ok((i, *start..end)));
+ *start = end;
+ range
+ }
+ Ok((i, end)) => Some(Err(ArrowError::InvalidArgumentError(format!(
"Offset invariant failure: non-monotonic offset at slot {}: {} > {}",
- i, start_offset, end_offset))
- );
+ i-1, start, end))
+ )),
+ Err(err) => Some(Err(err)),
}
-
- Ok((i, start_offset..end_offset))
})
+ .skip(1)// the first element is meaningless
Review Comment:
nit:
```suggestion
.skip(1) // the first element is meaningless
```
--
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 pull request #1684: simplify offsets checking
Posted by GitBox <gi...@apache.org>.
viirya commented on PR #1684:
URL: https://github.com/apache/arrow-rs/pull/1684#issuecomment-1123279715
Thanks @HaoYang670. The performance numbers look good!
--
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 merged pull request #1684: Speed up the offsets checking
Posted by GitBox <gi...@apache.org>.
viirya merged PR #1684:
URL: https://github.com/apache/arrow-rs/pull/1684
--
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] HaoYang670 commented on pull request #1684: simplify offsets checking
Posted by GitBox <gi...@apache.org>.
HaoYang670 commented on PR #1684:
URL: https://github.com/apache/arrow-rs/pull/1684#issuecomment-1126834304
Could we merge this PR?
--
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 pull request #1684: Speed up the offsets checking
Posted by GitBox <gi...@apache.org>.
viirya commented on PR #1684:
URL: https://github.com/apache/arrow-rs/pull/1684#issuecomment-1126847066
Merged, thanks @HaoYang670 @alamb
--
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] HaoYang670 commented on a diff in pull request #1684: simplify offsets checking
Posted by GitBox <gi...@apache.org>.
HaoYang670 commented on code in PR #1684:
URL: https://github.com/apache/arrow-rs/pull/1684#discussion_r869902584
##########
arrow/src/array/data.rs:
##########
@@ -1033,72 +1035,61 @@ impl ArrayData {
}
/// Calls the `validate(item_index, range)` function for each of
- /// the ranges specified in the arrow offset buffer of type
+ /// the ranges specified in the arrow offsets buffer of type
/// `T`. Also validates that each offset is smaller than
- /// `max_offset`
+ /// `offset_limit`
+ ///
+ /// For an empty array, the offsets buffer can either be empty
+ /// or contain a single `0`.
///
- /// For example, the offset buffer contained `[1, 2, 4]`, this
+ /// For example, the offsets buffer contained `[1, 2, 4]`, this
/// function would call `validate([1,2])`, and `validate([2,4])`
fn validate_each_offset<T, V>(
&self,
- offset_buffer: &Buffer,
+ offsets_buffer: &Buffer,
offset_limit: usize,
validate: V,
) -> Result<()>
where
T: ArrowNativeType + std::convert::TryInto<usize> + num::Num + std::fmt::Display,
V: Fn(usize, Range<usize>) -> Result<()>,
{
- // An empty binary-like array can have 0 offsets
- if self.len == 0 && offset_buffer.is_empty() {
- return Ok(());
- }
-
- let offsets = self.typed_offsets::<T>(offset_buffer)?;
-
- offsets
+ let offsets = self.typed_offsets::<T>(offsets_buffer)?
.iter()
- .zip(offsets.iter().skip(1))
.enumerate()
- .map(|(i, (&start_offset, &end_offset))| {
- let start_offset: usize = start_offset
- .try_into()
- .map_err(|_| {
- ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: could not convert start_offset {} to usize in slot {}",
- start_offset, i))
- })?;
- let end_offset: usize = end_offset
- .try_into()
- .map_err(|_| {
- ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: Could not convert end_offset {} to usize in slot {}",
- end_offset, i+1))
- })?;
-
- if start_offset > offset_limit {
- return Err(ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: offset for slot {} out of bounds: {} > {}",
- i, start_offset, offset_limit))
- );
- }
-
- if end_offset > offset_limit {
- return Err(ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: offset for slot {} out of bounds: {} > {}",
- i, end_offset, offset_limit))
+ .map(|(i, x)| {
+ // check if the offset can be converted to usize
+ let r = x.to_usize().ok_or_else(|| {
+ ArrowError::InvalidArgumentError(format!(
+ "Offset invariant failure: Could not convert offset {} to usize at position {}",
+ x, i))}
);
+ // check if the offset exceeds the limit
+ match r {
+ Ok(n) if n <= offset_limit => Ok(n),
+ Ok(_) => Err(ArrowError::InvalidArgumentError(format!(
+ "Offset invariant failure: offset at position {} out of bounds: {} > {}",
+ i, x, offset_limit))
+ ),
+ err => err,
}
+ })
+ .collect::<Result<Vec<usize>>>()?;
Review Comment:
Has replaced with `iter::scan`, no `collect` now!
--
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] HaoYang670 commented on a diff in pull request #1684: simplify offsets checking
Posted by GitBox <gi...@apache.org>.
HaoYang670 commented on code in PR #1684:
URL: https://github.com/apache/arrow-rs/pull/1684#discussion_r869955221
##########
arrow/src/array/data.rs:
##########
@@ -1033,76 +1035,64 @@ impl ArrayData {
}
/// Calls the `validate(item_index, range)` function for each of
- /// the ranges specified in the arrow offset buffer of type
+ /// the ranges specified in the arrow offsets buffer of type
/// `T`. Also validates that each offset is smaller than
- /// `max_offset`
+ /// `offset_limit`
+ ///
+ /// For an empty array, the offsets buffer can either be empty
+ /// or contain a single `0`.
///
- /// For example, the offset buffer contained `[1, 2, 4]`, this
+ /// For example, the offsets buffer contained `[1, 2, 4]`, this
/// function would call `validate([1,2])`, and `validate([2,4])`
fn validate_each_offset<T, V>(
&self,
- offset_buffer: &Buffer,
+ offsets_buffer: &Buffer,
offset_limit: usize,
validate: V,
) -> Result<()>
where
T: ArrowNativeType + std::convert::TryInto<usize> + num::Num + std::fmt::Display,
V: Fn(usize, Range<usize>) -> Result<()>,
{
- // An empty binary-like array can have 0 offsets
- if self.len == 0 && offset_buffer.is_empty() {
- return Ok(());
- }
-
- let offsets = self.typed_offsets::<T>(offset_buffer)?;
-
- offsets
+ self.typed_offsets::<T>(offsets_buffer)?
.iter()
- .zip(offsets.iter().skip(1))
.enumerate()
- .map(|(i, (&start_offset, &end_offset))| {
- let start_offset: usize = start_offset
- .try_into()
- .map_err(|_| {
- ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: could not convert start_offset {} to usize in slot {}",
- start_offset, i))
- })?;
- let end_offset: usize = end_offset
- .try_into()
- .map_err(|_| {
- ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: Could not convert end_offset {} to usize in slot {}",
- end_offset, i+1))
- })?;
-
- if start_offset > offset_limit {
- return Err(ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: offset for slot {} out of bounds: {} > {}",
- i, start_offset, offset_limit))
- );
- }
-
- if end_offset > offset_limit {
- return Err(ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: offset for slot {} out of bounds: {} > {}",
- i, end_offset, offset_limit))
+ .map(|(i, x)| {
+ // check if the offset can be converted to usize
+ let r = x.to_usize().ok_or_else(|| {
+ ArrowError::InvalidArgumentError(format!(
+ "Offset invariant failure: Could not convert offset {} to usize at position {}",
+ x, i))}
);
+ // check if the offset exceeds the limit
+ match r {
+ Ok(n) if n <= offset_limit => Ok((i, n)),
+ Ok(_) => Err(ArrowError::InvalidArgumentError(format!(
+ "Offset invariant failure: offset at position {} out of bounds: {} > {}",
+ i, x, offset_limit))
+ ),
+ Err(e) => Err(e),
}
-
- // check range actually is low -> high
- if start_offset > end_offset {
- return Err(ArrowError::InvalidArgumentError(format!(
+ })
+ .scan(0_usize, |start, end| {
+ // check offsets are monotonically increasing
+ match end {
+ Ok((i, end)) if *start <= end => {
+ let range = Some(Ok((i, *start..end)));
+ *start = end;
+ range
+ }
+ Ok((i, end)) => Some(Err(ArrowError::InvalidArgumentError(format!(
"Offset invariant failure: non-monotonic offset at slot {}: {} > {}",
- i, start_offset, end_offset))
- );
+ i - 1, start, end))
Review Comment:
The `i - 1` here is a little ugly. I try to find a more elegant way
--
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 #1684: simplify offsets checking
Posted by GitBox <gi...@apache.org>.
alamb commented on code in PR #1684:
URL: https://github.com/apache/arrow-rs/pull/1684#discussion_r869644804
##########
arrow/src/array/data.rs:
##########
@@ -1033,72 +1035,61 @@ impl ArrayData {
}
/// Calls the `validate(item_index, range)` function for each of
- /// the ranges specified in the arrow offset buffer of type
+ /// the ranges specified in the arrow offsets buffer of type
/// `T`. Also validates that each offset is smaller than
- /// `max_offset`
+ /// `offset_limit`
+ ///
+ /// For an empty array, the offsets buffer can either be empty
+ /// or contain a single `0`.
///
- /// For example, the offset buffer contained `[1, 2, 4]`, this
+ /// For example, the offsets buffer contained `[1, 2, 4]`, this
/// function would call `validate([1,2])`, and `validate([2,4])`
fn validate_each_offset<T, V>(
&self,
- offset_buffer: &Buffer,
+ offsets_buffer: &Buffer,
offset_limit: usize,
validate: V,
) -> Result<()>
where
T: ArrowNativeType + std::convert::TryInto<usize> + num::Num + std::fmt::Display,
V: Fn(usize, Range<usize>) -> Result<()>,
{
- // An empty binary-like array can have 0 offsets
- if self.len == 0 && offset_buffer.is_empty() {
- return Ok(());
- }
-
- let offsets = self.typed_offsets::<T>(offset_buffer)?;
-
- offsets
+ let offsets = self.typed_offsets::<T>(offsets_buffer)?
.iter()
- .zip(offsets.iter().skip(1))
.enumerate()
- .map(|(i, (&start_offset, &end_offset))| {
- let start_offset: usize = start_offset
- .try_into()
- .map_err(|_| {
- ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: could not convert start_offset {} to usize in slot {}",
- start_offset, i))
- })?;
- let end_offset: usize = end_offset
- .try_into()
- .map_err(|_| {
- ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: Could not convert end_offset {} to usize in slot {}",
- end_offset, i+1))
- })?;
-
- if start_offset > offset_limit {
- return Err(ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: offset for slot {} out of bounds: {} > {}",
- i, start_offset, offset_limit))
- );
- }
-
- if end_offset > offset_limit {
- return Err(ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: offset for slot {} out of bounds: {} > {}",
- i, end_offset, offset_limit))
+ .map(|(i, x)| {
+ // check if the offset can be converted to usize
+ let r = x.to_usize().ok_or_else(|| {
+ ArrowError::InvalidArgumentError(format!(
+ "Offset invariant failure: Could not convert offset {} to usize at position {}",
+ x, i))}
);
+ // check if the offset exceeds the limit
+ match r {
+ Ok(n) if n <= offset_limit => Ok(n),
+ Ok(_) => Err(ArrowError::InvalidArgumentError(format!(
+ "Offset invariant failure: offset at position {} out of bounds: {} > {}",
+ i, x, offset_limit))
+ ),
+ err => err,
}
+ })
+ .collect::<Result<Vec<usize>>>()?;
Review Comment:
The downside of calling `collect()` is that it will buffer the intermediate result (aka allocate memory and save the offsets in another buffer)
##########
arrow/src/array/data.rs:
##########
@@ -1821,6 +1812,90 @@ mod tests {
.unwrap();
}
+ #[test]
+ fn test_empty_utf8_array_with_empty_offsets_buffer() {
+ let data_buffer = Buffer::from(&[]);
+ let offsets_buffer = Buffer::from(&[]);
+ ArrayData::try_new(
+ DataType::Utf8,
+ 0,
+ None,
+ None,
+ 0,
+ vec![offsets_buffer, data_buffer],
+ vec![],
+ )
+ .unwrap();
+ }
+
+ #[test]
+ fn test_empty_utf8_array_with_single_zero_offset() {
+ let data_buffer = Buffer::from(&[]);
+ let offsets_buffer = Buffer::from_slice_ref(&[0i32]);
+ ArrayData::try_new(
+ DataType::Utf8,
+ 0,
+ None,
+ None,
+ 0,
+ vec![offsets_buffer, data_buffer],
+ vec![],
+ )
+ .unwrap();
+ }
+
+ #[test]
+ #[should_panic(expected = "First offset 1 of Utf8 is larger than values length 0")]
+ fn test_empty_utf8_array_with_invalid_offset() {
+ let data_buffer = Buffer::from(&[]);
+ let offsets_buffer = Buffer::from_slice_ref(&[1i32]);
+ ArrayData::try_new(
+ DataType::Utf8,
+ 0,
+ None,
+ None,
+ 0,
+ vec![offsets_buffer, data_buffer],
+ vec![],
+ )
+ .unwrap();
+ }
+
+ #[test]
+ fn test_empty_utf8_array_with_non_zero_offset() {
+ let data_buffer = Buffer::from_slice_ref(&"abcdef".as_bytes());
+ let offsets_buffer = Buffer::from_slice_ref(&[0i32, 2, 6, 0]);
Review Comment:
yeah, I agree this is strange but ok
--
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 #1684: simplify offsets checking
Posted by GitBox <gi...@apache.org>.
viirya commented on code in PR #1684:
URL: https://github.com/apache/arrow-rs/pull/1684#discussion_r869659746
##########
arrow/src/array/data.rs:
##########
@@ -726,19 +726,21 @@ impl ArrayData {
/// Returns a reference to the data in `buffer` as a typed slice
/// (typically `&[i32]` or `&[i64]`) after validating. The
/// returned slice is guaranteed to have at least `self.len + 1`
- /// entries
+ /// entries.
+ ///
+ /// For an empty array, the `buffer` can also be empty`.
Review Comment:
A typo.
```suggestion
/// For an empty array, the `buffer` can also be empty.
```
--
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] codecov-commenter commented on pull request #1684: simplify offsets checking
Posted by GitBox <gi...@apache.org>.
codecov-commenter commented on PR #1684:
URL: https://github.com/apache/arrow-rs/pull/1684#issuecomment-1122095382
# [Codecov](https://codecov.io/gh/apache/arrow-rs/pull/1684?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#1684](https://codecov.io/gh/apache/arrow-rs/pull/1684?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (880d683) into [master](https://codecov.io/gh/apache/arrow-rs/commit/e0a527b25464d2c0fd7ada439632898fa305ae48?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (e0a527b) will **increase** coverage by `0.05%`.
> The diff coverage is `80.95%`.
```diff
@@ Coverage Diff @@
## master #1684 +/- ##
==========================================
+ Coverage 83.12% 83.18% +0.05%
==========================================
Files 193 193
Lines 55850 56092 +242
==========================================
+ Hits 46426 46660 +234
- Misses 9424 9432 +8
```
| [Impacted Files](https://codecov.io/gh/apache/arrow-rs/pull/1684?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [arrow/src/array/data.rs](https://codecov.io/gh/apache/arrow-rs/pull/1684/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-YXJyb3cvc3JjL2FycmF5L2RhdGEucnM=) | `83.82% <80.95%> (+0.76%)` | :arrow_up: |
| [parquet/src/arrow/array\_reader/test\_util.rs](https://codecov.io/gh/apache/arrow-rs/pull/1684/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGFycXVldC9zcmMvYXJyb3cvYXJyYXlfcmVhZGVyL3Rlc3RfdXRpbC5ycw==) | `81.08% <0.00%> (-2.26%)` | :arrow_down: |
| [arrow/src/compute/kernels/length.rs](https://codecov.io/gh/apache/arrow-rs/pull/1684/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-YXJyb3cvc3JjL2NvbXB1dGUva2VybmVscy9sZW5ndGgucnM=) | `99.04% <0.00%> (-0.96%)` | :arrow_down: |
| [arrow/src/compute/kernels/substring.rs](https://codecov.io/gh/apache/arrow-rs/pull/1684/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-YXJyb3cvc3JjL2NvbXB1dGUva2VybmVscy9zdWJzdHJpbmcucnM=) | `99.36% <0.00%> (-0.64%)` | :arrow_down: |
| [arrow/src/datatypes/datatype.rs](https://codecov.io/gh/apache/arrow-rs/pull/1684/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-YXJyb3cvc3JjL2RhdGF0eXBlcy9kYXRhdHlwZS5ycw==) | `66.40% <0.00%> (-0.40%)` | :arrow_down: |
| [arrow/src/ipc/reader.rs](https://codecov.io/gh/apache/arrow-rs/pull/1684/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-YXJyb3cvc3JjL2lwYy9yZWFkZXIucnM=) | `88.80% <0.00%> (-0.23%)` | :arrow_down: |
| [parquet/src/encodings/encoding.rs](https://codecov.io/gh/apache/arrow-rs/pull/1684/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGFycXVldC9zcmMvZW5jb2RpbmdzL2VuY29kaW5nLnJz) | `93.37% <0.00%> (-0.19%)` | :arrow_down: |
| [arrow/src/compute/kernels/take.rs](https://codecov.io/gh/apache/arrow-rs/pull/1684/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-YXJyb3cvc3JjL2NvbXB1dGUva2VybmVscy90YWtlLnJz) | `95.27% <0.00%> (-0.14%)` | :arrow_down: |
| [parquet/src/arrow/array\_reader.rs](https://codecov.io/gh/apache/arrow-rs/pull/1684/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-cGFycXVldC9zcmMvYXJyb3cvYXJyYXlfcmVhZGVyLnJz) | `89.76% <0.00%> (-0.07%)` | :arrow_down: |
| [arrow-flight/src/utils.rs](https://codecov.io/gh/apache/arrow-rs/pull/1684/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-YXJyb3ctZmxpZ2h0L3NyYy91dGlscy5ycw==) | `0.00% <0.00%> (ø)` | |
| ... and [11 more](https://codecov.io/gh/apache/arrow-rs/pull/1684/diff?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/arrow-rs/pull/1684?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/arrow-rs/pull/1684?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Last update [e0a527b...880d683](https://codecov.io/gh/apache/arrow-rs/pull/1684?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
--
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] HaoYang670 commented on a diff in pull request #1684: simplify offsets checking
Posted by GitBox <gi...@apache.org>.
HaoYang670 commented on code in PR #1684:
URL: https://github.com/apache/arrow-rs/pull/1684#discussion_r869015456
##########
arrow/src/array/data.rs:
##########
@@ -1033,72 +1035,61 @@ impl ArrayData {
}
/// Calls the `validate(item_index, range)` function for each of
- /// the ranges specified in the arrow offset buffer of type
+ /// the ranges specified in the arrow offsets buffer of type
/// `T`. Also validates that each offset is smaller than
- /// `max_offset`
+ /// `offset_limit`
+ ///
+ /// For an empty array, the offsets buffer can either be empty
+ /// or contain a single `0`.
///
- /// For example, the offset buffer contained `[1, 2, 4]`, this
+ /// For example, the offsets buffer contained `[1, 2, 4]`, this
/// function would call `validate([1,2])`, and `validate([2,4])`
fn validate_each_offset<T, V>(
&self,
- offset_buffer: &Buffer,
+ offsets_buffer: &Buffer,
offset_limit: usize,
validate: V,
) -> Result<()>
where
T: ArrowNativeType + std::convert::TryInto<usize> + num::Num + std::fmt::Display,
V: Fn(usize, Range<usize>) -> Result<()>,
{
- // An empty binary-like array can have 0 offsets
- if self.len == 0 && offset_buffer.is_empty() {
- return Ok(());
- }
-
- let offsets = self.typed_offsets::<T>(offset_buffer)?;
-
- offsets
+ let offsets = self.typed_offsets::<T>(offsets_buffer)?
.iter()
- .zip(offsets.iter().skip(1))
.enumerate()
- .map(|(i, (&start_offset, &end_offset))| {
- let start_offset: usize = start_offset
- .try_into()
- .map_err(|_| {
- ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: could not convert start_offset {} to usize in slot {}",
- start_offset, i))
- })?;
- let end_offset: usize = end_offset
- .try_into()
- .map_err(|_| {
- ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: Could not convert end_offset {} to usize in slot {}",
- end_offset, i+1))
- })?;
-
- if start_offset > offset_limit {
- return Err(ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: offset for slot {} out of bounds: {} > {}",
- i, start_offset, offset_limit))
- );
- }
-
- if end_offset > offset_limit {
- return Err(ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: offset for slot {} out of bounds: {} > {}",
- i, end_offset, offset_limit))
+ .map(|(i, x)| {
+ // check if the offset can be converted to usize
+ let r = x.to_usize().ok_or_else(|| {
+ ArrowError::InvalidArgumentError(format!(
+ "Offset invariant failure: Could not convert offset {} to usize at position {}",
+ x, i))}
);
+ // check if the offset exceeds the limit
+ match r {
+ Ok(n) if n <= offset_limit => Ok(n),
+ Ok(_) => Err(ArrowError::InvalidArgumentError(format!(
+ "Offset invariant failure: offset at position {} out of bounds: {} > {}",
+ i, x, offset_limit))
+ ),
+ err => err,
}
+ })
+ .collect::<Result<Vec<usize>>>()?;
Review Comment:
collect the result here, because I want to use the `windows` method
--
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] HaoYang670 commented on a diff in pull request #1684: simplify offsets checking
Posted by GitBox <gi...@apache.org>.
HaoYang670 commented on code in PR #1684:
URL: https://github.com/apache/arrow-rs/pull/1684#discussion_r869017080
##########
arrow/src/array/data.rs:
##########
@@ -1821,6 +1812,90 @@ mod tests {
.unwrap();
}
+ #[test]
+ fn test_empty_utf8_array_with_empty_offsets_buffer() {
+ let data_buffer = Buffer::from(&[]);
+ let offsets_buffer = Buffer::from(&[]);
+ ArrayData::try_new(
+ DataType::Utf8,
+ 0,
+ None,
+ None,
+ 0,
+ vec![offsets_buffer, data_buffer],
+ vec![],
+ )
+ .unwrap();
+ }
+
+ #[test]
+ fn test_empty_utf8_array_with_single_zero_offset() {
+ let data_buffer = Buffer::from(&[]);
+ let offsets_buffer = Buffer::from_slice_ref(&[0i32]);
+ ArrayData::try_new(
+ DataType::Utf8,
+ 0,
+ None,
+ None,
+ 0,
+ vec![offsets_buffer, data_buffer],
+ vec![],
+ )
+ .unwrap();
+ }
+
+ #[test]
+ #[should_panic(expected = "First offset 1 of Utf8 is larger than values length 0")]
+ fn test_empty_utf8_array_with_invalid_offset() {
+ let data_buffer = Buffer::from(&[]);
+ let offsets_buffer = Buffer::from_slice_ref(&[1i32]);
+ ArrayData::try_new(
+ DataType::Utf8,
+ 0,
+ None,
+ None,
+ 0,
+ vec![offsets_buffer, data_buffer],
+ vec![],
+ )
+ .unwrap();
+ }
+
+ #[test]
+ fn test_empty_utf8_array_with_non_zero_offset() {
+ let data_buffer = Buffer::from_slice_ref(&"abcdef".as_bytes());
+ let offsets_buffer = Buffer::from_slice_ref(&[0i32, 2, 6, 0]);
Review Comment:
I think the offsets are weird but reasonable.
--
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] HaoYang670 commented on pull request #1684: simplify offsets checking
Posted by GitBox <gi...@apache.org>.
HaoYang670 commented on PR #1684:
URL: https://github.com/apache/arrow-rs/pull/1684#issuecomment-1123054993
Thank you for your review @alamb @viirya. I will add a benchmark for offsets checking. Also, I find that using `iter::scan` is a better way than using `slice::windows`, which can avoid collecting.
--
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] HaoYang670 commented on pull request #1684: simplify offsets checking
Posted by GitBox <gi...@apache.org>.
HaoYang670 commented on PR #1684:
URL: https://github.com/apache/arrow-rs/pull/1684#issuecomment-1123219822
Benchmark result has been added!
--
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 #1684: simplify offsets checking
Posted by GitBox <gi...@apache.org>.
viirya commented on code in PR #1684:
URL: https://github.com/apache/arrow-rs/pull/1684#discussion_r869953424
##########
arrow/src/array/data.rs:
##########
@@ -1033,76 +1035,64 @@ impl ArrayData {
}
/// Calls the `validate(item_index, range)` function for each of
- /// the ranges specified in the arrow offset buffer of type
+ /// the ranges specified in the arrow offsets buffer of type
/// `T`. Also validates that each offset is smaller than
- /// `max_offset`
+ /// `offset_limit`
+ ///
+ /// For an empty array, the offsets buffer can either be empty
+ /// or contain a single `0`.
///
- /// For example, the offset buffer contained `[1, 2, 4]`, this
+ /// For example, the offsets buffer contained `[1, 2, 4]`, this
/// function would call `validate([1,2])`, and `validate([2,4])`
fn validate_each_offset<T, V>(
&self,
- offset_buffer: &Buffer,
+ offsets_buffer: &Buffer,
offset_limit: usize,
validate: V,
) -> Result<()>
where
T: ArrowNativeType + std::convert::TryInto<usize> + num::Num + std::fmt::Display,
V: Fn(usize, Range<usize>) -> Result<()>,
{
- // An empty binary-like array can have 0 offsets
- if self.len == 0 && offset_buffer.is_empty() {
- return Ok(());
- }
-
- let offsets = self.typed_offsets::<T>(offset_buffer)?;
-
- offsets
+ self.typed_offsets::<T>(offsets_buffer)?
.iter()
- .zip(offsets.iter().skip(1))
.enumerate()
- .map(|(i, (&start_offset, &end_offset))| {
- let start_offset: usize = start_offset
- .try_into()
- .map_err(|_| {
- ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: could not convert start_offset {} to usize in slot {}",
- start_offset, i))
- })?;
- let end_offset: usize = end_offset
- .try_into()
- .map_err(|_| {
- ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: Could not convert end_offset {} to usize in slot {}",
- end_offset, i+1))
- })?;
-
- if start_offset > offset_limit {
- return Err(ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: offset for slot {} out of bounds: {} > {}",
- i, start_offset, offset_limit))
- );
- }
-
- if end_offset > offset_limit {
- return Err(ArrowError::InvalidArgumentError(format!(
- "Offset invariant failure: offset for slot {} out of bounds: {} > {}",
- i, end_offset, offset_limit))
+ .map(|(i, x)| {
+ // check if the offset can be converted to usize
+ let r = x.to_usize().ok_or_else(|| {
+ ArrowError::InvalidArgumentError(format!(
+ "Offset invariant failure: Could not convert offset {} to usize at position {}",
+ x, i))}
);
+ // check if the offset exceeds the limit
+ match r {
+ Ok(n) if n <= offset_limit => Ok((i, n)),
+ Ok(_) => Err(ArrowError::InvalidArgumentError(format!(
+ "Offset invariant failure: offset at position {} out of bounds: {} > {}",
+ i, x, offset_limit))
+ ),
+ Err(e) => Err(e),
}
-
- // check range actually is low -> high
- if start_offset > end_offset {
- return Err(ArrowError::InvalidArgumentError(format!(
+ })
+ .scan(0_usize, |start, end| {
+ // check offsets are monotonically increasing
+ match end {
+ Ok((i, end)) if *start <= end => {
+ let range = Some(Ok((i, *start..end)));
+ *start = end;
+ range
+ }
+ Ok((i, end)) => Some(Err(ArrowError::InvalidArgumentError(format!(
"Offset invariant failure: non-monotonic offset at slot {}: {} > {}",
- i, start_offset, end_offset))
- );
+ i-1, start, end))
Review Comment:
nit:
```suggestion
i - 1, start, end))
```
--
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