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/07/18 11:20:35 UTC
[GitHub] [arrow-rs] Ted-Jiang opened a new pull request, #2097: Support skip_values in DictionaryDecoder
Ted-Jiang opened a new pull request, #2097:
URL: https://github.com/apache/arrow-rs/pull/2097
# Which issue does this PR close?
Closes #2709.
# 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] Ted-Jiang commented on a diff in pull request #2097: Support skip_values in DictionaryDecoder
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #2097:
URL: https://github.com/apache/arrow-rs/pull/2097#discussion_r923254832
##########
parquet/src/arrow/array_reader/byte_array.rs:
##########
@@ -406,6 +420,7 @@ impl ByteArrayDecoderPlain {
skip += 1;
self.offset = self.offset + 4 + len;
}
+ self.max_remaining_values -= skip;
Review Comment:
forgot update max_remaining_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
[GitHub] [arrow-rs] Ted-Jiang commented on a diff in pull request #2097: Support skip_values in DictionaryDecoder
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #2097:
URL: https://github.com/apache/arrow-rs/pull/2097#discussion_r924003572
##########
parquet/src/arrow/array_reader/byte_array_dictionary.rs:
##########
@@ -459,7 +481,75 @@ mod tests {
None,
Some("1"),
Some("2"),
- None
+ None,
+ ]
+ )
+ }
+
+ #[test]
+ fn test_dictionary_preservation_skip() {
+ let data_type = utf8_dictionary();
+
+ let data: Vec<_> = vec!["0", "1", "0", "1", "2", "1", "2"]
+ .into_iter()
+ .map(ByteArray::from)
+ .collect();
+ let (dict, encoded) = encode_dictionary(&data);
+
+ let column_desc = utf8_column();
+ let mut decoder = DictionaryDecoder::<i32, i32>::new(&column_desc);
+
+ decoder
+ .set_dict(dict, 3, Encoding::RLE_DICTIONARY, false)
+ .unwrap();
+
+ decoder
+ .set_data(Encoding::RLE_DICTIONARY, encoded, 14, Some(data.len()))
+ .unwrap();
+
+ let mut output = DictionaryBuffer::<i32, i32>::default();
+ assert_eq!(decoder.skip_values(1).unwrap(), 1);
+ assert_eq!(decoder.read(&mut output, 0..2).unwrap(), 2);
+
+ let mut valid = vec![false, false, false, true, false, true];
+ let valid_buffer = Buffer::from_iter(valid.iter().cloned());
+ output.pad_nulls(0, 2, valid.len(), valid_buffer.as_slice());
+
+ assert!(matches!(output, DictionaryBuffer::Dict { .. }));
+
+ assert_eq!(decoder.skip_values(1).unwrap(), 1);
+ assert_eq!(decoder.read(&mut output, 0..3).unwrap(), 3);
Review Comment:
i think it should be start at `3`,
but like previous test read two range '0..3' and '0..4'
https://github.com/apache/arrow-rs/blob/a7f6a6e9261f2320ed34500d6d649efc97617161/parquet/src/arrow/array_reader/byte_array_dictionary.rs#L444-L453
it seems it total read 7 values
https://github.com/apache/arrow-rs/blob/a7f6a6e9261f2320ed34500d6d649efc97617161/parquet/src/arrow/array_reader/byte_array_dictionary.rs#L468-L486
we should change it to
--
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] Ted-Jiang commented on a diff in pull request #2097: Support skip_values in DictionaryDecoder
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #2097:
URL: https://github.com/apache/arrow-rs/pull/2097#discussion_r924003572
##########
parquet/src/arrow/array_reader/byte_array_dictionary.rs:
##########
@@ -459,7 +481,75 @@ mod tests {
None,
Some("1"),
Some("2"),
- None
+ None,
+ ]
+ )
+ }
+
+ #[test]
+ fn test_dictionary_preservation_skip() {
+ let data_type = utf8_dictionary();
+
+ let data: Vec<_> = vec!["0", "1", "0", "1", "2", "1", "2"]
+ .into_iter()
+ .map(ByteArray::from)
+ .collect();
+ let (dict, encoded) = encode_dictionary(&data);
+
+ let column_desc = utf8_column();
+ let mut decoder = DictionaryDecoder::<i32, i32>::new(&column_desc);
+
+ decoder
+ .set_dict(dict, 3, Encoding::RLE_DICTIONARY, false)
+ .unwrap();
+
+ decoder
+ .set_data(Encoding::RLE_DICTIONARY, encoded, 14, Some(data.len()))
+ .unwrap();
+
+ let mut output = DictionaryBuffer::<i32, i32>::default();
+ assert_eq!(decoder.skip_values(1).unwrap(), 1);
+ assert_eq!(decoder.read(&mut output, 0..2).unwrap(), 2);
+
+ let mut valid = vec![false, false, false, true, false, true];
+ let valid_buffer = Buffer::from_iter(valid.iter().cloned());
+ output.pad_nulls(0, 2, valid.len(), valid_buffer.as_slice());
+
+ assert!(matches!(output, DictionaryBuffer::Dict { .. }));
+
+ assert_eq!(decoder.skip_values(1).unwrap(), 1);
+ assert_eq!(decoder.read(&mut output, 0..3).unwrap(), 3);
Review Comment:
i don't think so , like previous test read two range '0..3' and '0..4'
https://github.com/apache/arrow-rs/blob/a7f6a6e9261f2320ed34500d6d649efc97617161/parquet/src/arrow/array_reader/byte_array_dictionary.rs#L444-L453
it seems it total read 7 values
https://github.com/apache/arrow-rs/blob/a7f6a6e9261f2320ed34500d6d649efc97617161/parquet/src/arrow/array_reader/byte_array_dictionary.rs#L468-L486
--
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] Ted-Jiang commented on a diff in pull request #2097: Support skip_values in DictionaryDecoder
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #2097:
URL: https://github.com/apache/arrow-rs/pull/2097#discussion_r923254323
##########
parquet/src/arrow/array_reader/byte_array_dictionary.rs:
##########
@@ -368,16 +368,38 @@ where
dict_offsets,
dict_values,
)?;
-
+ *max_remaining_values -= len;
Review Comment:
we should update `max_remaining_values` here.
--
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] Ted-Jiang closed pull request #2097: Support skip_values in DictionaryDecoder
Posted by GitBox <gi...@apache.org>.
Ted-Jiang closed pull request #2097: Support skip_values in DictionaryDecoder
URL: https://github.com/apache/arrow-rs/pull/2097
--
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] Ted-Jiang commented on pull request #2097: Support skip_values in DictionaryDecoder
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on PR #2097:
URL: https://github.com/apache/arrow-rs/pull/2097#issuecomment-1188528577
duplicate with https://github.com/apache/arrow-rs/pull/2100
--
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] Ted-Jiang commented on a diff in pull request #2097: Support skip_values in DictionaryDecoder
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #2097:
URL: https://github.com/apache/arrow-rs/pull/2097#discussion_r923253992
##########
parquet/src/arrow/array_reader/byte_array_dictionary.rs:
##########
@@ -459,7 +481,75 @@ mod tests {
None,
Some("1"),
Some("2"),
- None
+ None,
+ ]
+ )
+ }
+
+ #[test]
+ fn test_dictionary_preservation_skip() {
+ let data_type = utf8_dictionary();
+
+ let data: Vec<_> = vec!["0", "1", "0", "1", "2", "1", "2"]
+ .into_iter()
+ .map(ByteArray::from)
+ .collect();
+ let (dict, encoded) = encode_dictionary(&data);
+
+ let column_desc = utf8_column();
+ let mut decoder = DictionaryDecoder::<i32, i32>::new(&column_desc);
+
+ decoder
+ .set_dict(dict, 3, Encoding::RLE_DICTIONARY, false)
+ .unwrap();
+
+ decoder
+ .set_data(Encoding::RLE_DICTIONARY, encoded, 14, Some(data.len()))
+ .unwrap();
+
+ let mut output = DictionaryBuffer::<i32, i32>::default();
+ assert_eq!(decoder.skip_values(1).unwrap(), 1);
+ assert_eq!(decoder.read(&mut output, 0..2).unwrap(), 2);
+
+ let mut valid = vec![false, false, false, true, false, true];
+ let valid_buffer = Buffer::from_iter(valid.iter().cloned());
+ output.pad_nulls(0, 2, valid.len(), valid_buffer.as_slice());
+
+ assert!(matches!(output, DictionaryBuffer::Dict { .. }));
+
+ assert_eq!(decoder.skip_values(1).unwrap(), 1);
+ assert_eq!(decoder.read(&mut output, 0..3).unwrap(), 3);
Review Comment:
@tustvold Like you metion in https://github.com/apache/arrow-rs/pull/2076#discussion_r922306318
If i try to use ` assert_eq!(decoder.read(&mut output, 3..6).unwrap(), 3);`
The result is not right, also appear in `test_dictionary_preservation`
i think we should align 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] tustvold commented on a diff in pull request #2097: Support skip_values in DictionaryDecoder
Posted by GitBox <gi...@apache.org>.
tustvold commented on code in PR #2097:
URL: https://github.com/apache/arrow-rs/pull/2097#discussion_r923621973
##########
parquet/src/arrow/array_reader/byte_array_dictionary.rs:
##########
@@ -459,7 +481,75 @@ mod tests {
None,
Some("1"),
Some("2"),
- None
+ None,
+ ]
+ )
+ }
+
+ #[test]
+ fn test_dictionary_preservation_skip() {
+ let data_type = utf8_dictionary();
+
+ let data: Vec<_> = vec!["0", "1", "0", "1", "2", "1", "2"]
+ .into_iter()
+ .map(ByteArray::from)
+ .collect();
+ let (dict, encoded) = encode_dictionary(&data);
+
+ let column_desc = utf8_column();
+ let mut decoder = DictionaryDecoder::<i32, i32>::new(&column_desc);
+
+ decoder
+ .set_dict(dict, 3, Encoding::RLE_DICTIONARY, false)
+ .unwrap();
+
+ decoder
+ .set_data(Encoding::RLE_DICTIONARY, encoded, 14, Some(data.len()))
+ .unwrap();
+
+ let mut output = DictionaryBuffer::<i32, i32>::default();
+ assert_eq!(decoder.skip_values(1).unwrap(), 1);
+ assert_eq!(decoder.read(&mut output, 0..2).unwrap(), 2);
+
+ let mut valid = vec![false, false, false, true, false, true];
+ let valid_buffer = Buffer::from_iter(valid.iter().cloned());
+ output.pad_nulls(0, 2, valid.len(), valid_buffer.as_slice());
+
+ assert!(matches!(output, DictionaryBuffer::Dict { .. }));
+
+ assert_eq!(decoder.skip_values(1).unwrap(), 1);
+ assert_eq!(decoder.read(&mut output, 0..3).unwrap(), 3);
Review Comment:
I think it should be 2..5 if anything, you've only read 2 values
##########
parquet/src/arrow/array_reader/byte_array_dictionary.rs:
##########
@@ -368,16 +368,38 @@ where
dict_offsets,
dict_values,
)?;
-
+ *max_remaining_values -= len;
Ok(len)
}
}
}
}
}
- fn skip_values(&mut self, _num_values: usize) -> Result<usize> {
- Err(nyi_err!("https://github.com/apache/arrow-rs/issues/1792"))
+ fn skip_values(&mut self, num_values: usize) -> Result<usize> {
+ match self.decoder.as_mut().expect("decoder not set in DictionaryDecoder.") {
+ MaybeDictionaryDecoder::Fallback(decoder) => {
+ decoder.skip_without_dict(num_values)
+ }
+ MaybeDictionaryDecoder::Dict {
+ decoder,
+ max_remaining_values, } => {
+ let to_skip = num_values.min(*max_remaining_values);
+
+ let dict = self
+ .dict
+ .as_ref()
+ .ok_or_else(|| general_err!("missing dictionary page for column"))?;
+
+ if dict.is_empty() {
Review Comment:
I'm not sure why this check is necessary, removing the corresponding check from read, doesn't seem to fail any tests
##########
parquet/src/arrow/array_reader/byte_array_dictionary.rs:
##########
@@ -459,7 +481,75 @@ mod tests {
None,
Some("1"),
Some("2"),
- None
+ None,
+ ]
+ )
+ }
+
+ #[test]
+ fn test_dictionary_preservation_skip() {
+ let data_type = utf8_dictionary();
+
+ let data: Vec<_> = vec!["0", "1", "0", "1", "2", "1", "2"]
+ .into_iter()
+ .map(ByteArray::from)
+ .collect();
+ let (dict, encoded) = encode_dictionary(&data);
+
+ let column_desc = utf8_column();
+ let mut decoder = DictionaryDecoder::<i32, i32>::new(&column_desc);
+
+ decoder
+ .set_dict(dict, 3, Encoding::RLE_DICTIONARY, false)
+ .unwrap();
+
+ decoder
+ .set_data(Encoding::RLE_DICTIONARY, encoded, 14, Some(data.len()))
+ .unwrap();
+
+ let mut output = DictionaryBuffer::<i32, i32>::default();
+ assert_eq!(decoder.skip_values(1).unwrap(), 1);
+ assert_eq!(decoder.read(&mut output, 0..2).unwrap(), 2);
+
+ let mut valid = vec![false, false, false, true, false, true];
+ let valid_buffer = Buffer::from_iter(valid.iter().cloned());
+ output.pad_nulls(0, 2, valid.len(), valid_buffer.as_slice());
+
+ assert!(matches!(output, DictionaryBuffer::Dict { .. }));
+
+ assert_eq!(decoder.skip_values(1).unwrap(), 1);
+ assert_eq!(decoder.read(&mut output, 0..3).unwrap(), 3);
+
+ valid.extend_from_slice(&[false, false, false, true, false, true, true, false]);
Review Comment:
I think these tests would be easier to follow if they didn't include the null padding logic, which seems unnecessary for testing the skip behaviour
--
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] Ted-Jiang commented on a diff in pull request #2097: Support skip_values in DictionaryDecoder
Posted by GitBox <gi...@apache.org>.
Ted-Jiang commented on code in PR #2097:
URL: https://github.com/apache/arrow-rs/pull/2097#discussion_r924003572
##########
parquet/src/arrow/array_reader/byte_array_dictionary.rs:
##########
@@ -459,7 +481,75 @@ mod tests {
None,
Some("1"),
Some("2"),
- None
+ None,
+ ]
+ )
+ }
+
+ #[test]
+ fn test_dictionary_preservation_skip() {
+ let data_type = utf8_dictionary();
+
+ let data: Vec<_> = vec!["0", "1", "0", "1", "2", "1", "2"]
+ .into_iter()
+ .map(ByteArray::from)
+ .collect();
+ let (dict, encoded) = encode_dictionary(&data);
+
+ let column_desc = utf8_column();
+ let mut decoder = DictionaryDecoder::<i32, i32>::new(&column_desc);
+
+ decoder
+ .set_dict(dict, 3, Encoding::RLE_DICTIONARY, false)
+ .unwrap();
+
+ decoder
+ .set_data(Encoding::RLE_DICTIONARY, encoded, 14, Some(data.len()))
+ .unwrap();
+
+ let mut output = DictionaryBuffer::<i32, i32>::default();
+ assert_eq!(decoder.skip_values(1).unwrap(), 1);
+ assert_eq!(decoder.read(&mut output, 0..2).unwrap(), 2);
+
+ let mut valid = vec![false, false, false, true, false, true];
+ let valid_buffer = Buffer::from_iter(valid.iter().cloned());
+ output.pad_nulls(0, 2, valid.len(), valid_buffer.as_slice());
+
+ assert!(matches!(output, DictionaryBuffer::Dict { .. }));
+
+ assert_eq!(decoder.skip_values(1).unwrap(), 1);
+ assert_eq!(decoder.read(&mut output, 0..3).unwrap(), 3);
Review Comment:
Yes it should be, but like previous test read two range '0..3' and '0..4'
https://github.com/apache/arrow-rs/blob/a7f6a6e9261f2320ed34500d6d649efc97617161/parquet/src/arrow/array_reader/byte_array_dictionary.rs#L444-L453
it seems it total read 7 values
https://github.com/apache/arrow-rs/blob/a7f6a6e9261f2320ed34500d6d649efc97617161/parquet/src/arrow/array_reader/byte_array_dictionary.rs#L468-L486
--
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