You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@avro.apache.org by "ZENOTME (via GitHub)" <gi...@apache.org> on 2023/10/24 16:17:11 UTC
[PR] AVRO-3892: [Rust] Support to resolve fixed from bytes and deserialize bytes in deserialize_any [avro]
ZENOTME opened a new pull request, #2567:
URL: https://github.com/apache/avro/pull/2567
<!--
*Thank you very much for contributing to Apache Avro - we are happy that you want to help us improve Avro. To help the community review your contribution in the best possible way, please go through the checklist below, which will get the contribution into a shape in which it can be best reviewed.*
*Please understand that we do not do this to make contributions to Avro a hassle. In order to uphold a high standard of quality for code contributions, while at the same time managing a large number of contributions, we need contributors to prepare the contributions well, and give reviewers enough contextual information for the review. Please also understand that contributions that do not follow this guide will take longer to review and thus typically be picked up with lower priority by the community.*
## Contribution Checklist
- Make sure that the pull request corresponds to a [JIRA issue](https://issues.apache.org/jira/projects/AVRO/issues). Exceptions are made for typos in JavaDoc or documentation files, which need no JIRA issue.
- Name the pull request in the form "AVRO-XXXX: [component] Title of the pull request", where *AVRO-XXXX* should be replaced by the actual issue number.
The *component* is optional, but can help identify the correct reviewers faster: either the language ("java", "python") or subsystem such as "build" or "doc" are good candidates.
- Fill out the template below to describe the changes contributed by the pull request. That will give reviewers the context they need to do the review.
- Make sure that the change passes the automated tests. You can [build the entire project](https://github.com/apache/avro/blob/main/BUILD.md) or just the [language-specific SDK](https://avro.apache.org/project/how-to-contribute/#unit-tests).
- Each pull request should address only one issue, not mix up code from multiple issues.
- Each commit in the pull request has a meaningful commit message (including the JIRA id)
- Every commit message references Jira issues in their subject lines. In addition, commits follow the guidelines from [How to write a good git commit message](https://chris.beams.io/posts/git-commit/)
1. Subject is separated from body by a blank line
1. Subject is limited to 50 characters (not including Jira issue reference)
1. Subject does not end with a period
1. Subject uses the imperative mood ("add", not "adding")
1. Body wraps at 72 characters
1. Body explains "what" and "why", not "how"
-->
## What is the purpose of the change
*(For example: This pull request improves file read performance by buffering data, fixing AVRO-XXXX.)*
fixing AVRO-3892
This PR:
1. support to resolve fixed from bytes
2. support to deserialize bytes, fixed, decimal in deserialize_any
## Verifying this change
1. For resolving fixed from bytes, I have add related test.
2. For deserializing bytes, fixed, decimal in deserialize_any, seems it don't have test for deserialize_any. If it required, we can consider to add test for whole deserialize_any. And actually I have test it in https://github.com/apache/iceberg-rust/pull/82 locally.
## Documentation
- Does this pull request introduce a new feature? (yes / no)
- If yes, how is the feature documented? (not applicable / docs / JavaDocs / not documented)
--
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: dev-unsubscribe@avro.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] AVRO-3892: [Rust] Support to resolve fixed from bytes and deserialize bytes in deserialize_any [avro]
Posted by "martin-g (via GitHub)" <gi...@apache.org>.
martin-g commented on code in PR #2567:
URL: https://github.com/apache/avro/pull/2567#discussion_r1371234387
##########
lang/rust/avro/src/de.rs:
##########
@@ -350,6 +354,7 @@ impl<'a, 'de> de::Deserializer<'de> for &'a Deserializer<'de> {
Value::String(ref s) => visitor.visit_bytes(s.as_bytes()),
Value::Bytes(ref bytes) | Value::Fixed(_, ref bytes) => visitor.visit_bytes(bytes),
Value::Uuid(ref u) => visitor.visit_bytes(u.as_bytes()),
+ Value::Decimal(ref d) => visitor.visit_bytes(&d.to_vec()?),
Review Comment:
It'd be nice to add new unit tests for the changes above.
--
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: issues-unsubscribe@avro.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] AVRO-3892: [Rust] Support to resolve fixed from bytes and deserialize bytes in deserialize_any [avro]
Posted by "ZENOTME (via GitHub)" <gi...@apache.org>.
ZENOTME commented on code in PR #2567:
URL: https://github.com/apache/avro/pull/2567#discussion_r1371929797
##########
lang/rust/avro/src/de.rs:
##########
@@ -1315,4 +1323,67 @@ mod tests {
Ok(())
}
+
+ #[test]
+ fn test_avro_3892_deserialize_string_from_bytes() -> TestResult {
+ let raw_value = vec![1, 2, 3, 4];
+ let value = Value::Bytes(raw_value.clone());
+ let result = from_value::<String>(&value)?;
+ assert_eq!(result, String::from_utf8(raw_value)?);
+ Ok(())
+ }
+
+ #[test]
+ fn test_avro_3892_deserialize_str_from_bytes() -> TestResult {
+ let raw_value = &[1, 2, 3, 4];
+ let value = Value::Bytes(raw_value.to_vec());
+ let result = from_value::<&str>(&value)?;
+ assert_eq!(result, std::str::from_utf8(raw_value)?);
+ Ok(())
+ }
+
+ struct Bytes(Vec<u8>);
+
+ impl<'de> Deserialize<'de> for Bytes {
+ fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+ where
+ D: serde::Deserializer<'de>,
+ {
+ struct BytesVisitor;
+ impl<'de> serde::de::Visitor<'de> for BytesVisitor {
+ type Value = Bytes;
+
+ fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+ formatter.write_str("a byte array")
+ }
+
+ fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
+ where
+ E: serde::de::Error,
+ {
+ Ok(Bytes(v.to_vec()))
+ }
+ }
+ deserializer.deserialize_bytes(BytesVisitor)
+ }
+ }
+
+ #[test]
+ fn test_avro_3892_deserialize_bytes_from_decimal() -> TestResult {
+ let expeced_bytes = BigInt::from(123456789).to_signed_bytes_be();
+ let value = Value::Decimal(Decimal::from(&expeced_bytes));
+ let raw_bytes = from_value::<Bytes>(&value)?;
+ assert_eq!(raw_bytes.0, expeced_bytes);
+ Ok(())
+ }
+
+ #[test]
+ fn test_avro_3892_deserialize_bytes_from_uuid() -> TestResult {
+ let uuid_str = "10101010-2020-2020-2020-101010101010";
+ let expected_bytes = Uuid::parse_str(uuid_str)?.as_bytes().to_vec();
Review Comment:
One thing may need to notice: I find that the behaviour of deserialize_str and deserialize_bytes for Value::Uuid is different. We can see that in deserialize_bytes for Value::Uuid, the bytes representation is `Uuid::parse_str(uuid_str)?.as_bytes()` rathern than `uuid_str.as_bytes()`. But for deserialize_str, the result will be `uuid_str.as_bytes()` I think. Is this behaviour is expect? cc @martin-g
--
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: issues-unsubscribe@avro.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] AVRO-3892: [Rust] Support to resolve fixed from bytes and deserialize bytes in deserialize_any [avro]
Posted by "martin-g (via GitHub)" <gi...@apache.org>.
martin-g commented on PR #2567:
URL: https://github.com/apache/avro/pull/2567#issuecomment-1781798170
Thank you, @ZENOTME !
--
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: issues-unsubscribe@avro.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] AVRO-3892: [Rust] Support to resolve fixed from bytes and deserialize bytes in deserialize_any [avro]
Posted by "ZENOTME (via GitHub)" <gi...@apache.org>.
ZENOTME commented on code in PR #2567:
URL: https://github.com/apache/avro/pull/2567#discussion_r1371930748
##########
lang/rust/avro/src/de.rs:
##########
@@ -350,6 +354,7 @@ impl<'a, 'de> de::Deserializer<'de> for &'a Deserializer<'de> {
Value::String(ref s) => visitor.visit_bytes(s.as_bytes()),
Value::Bytes(ref bytes) | Value::Fixed(_, ref bytes) => visitor.visit_bytes(bytes),
Value::Uuid(ref u) => visitor.visit_bytes(u.as_bytes()),
+ Value::Decimal(ref d) => visitor.visit_bytes(&d.to_vec()?),
Review Comment:
Thanks for review! I have added the test for 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: issues-unsubscribe@avro.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] AVRO-3892: [Rust] Support to resolve fixed from bytes and deserialize bytes in deserialize_any [avro]
Posted by "martin-g (via GitHub)" <gi...@apache.org>.
martin-g merged PR #2567:
URL: https://github.com/apache/avro/pull/2567
--
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: dev-unsubscribe@avro.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] AVRO-3892: [Rust] Support to resolve fixed from bytes and deserialize bytes in deserialize_any [avro]
Posted by "martin-g (via GitHub)" <gi...@apache.org>.
martin-g commented on code in PR #2567:
URL: https://github.com/apache/avro/pull/2567#discussion_r1371258513
##########
lang/rust/avro/src/de.rs:
##########
@@ -350,6 +354,7 @@ impl<'a, 'de> de::Deserializer<'de> for &'a Deserializer<'de> {
Value::String(ref s) => visitor.visit_bytes(s.as_bytes()),
Value::Bytes(ref bytes) | Value::Fixed(_, ref bytes) => visitor.visit_bytes(bytes),
Value::Uuid(ref u) => visitor.visit_bytes(u.as_bytes()),
+ Value::Decimal(ref d) => visitor.visit_bytes(&d.to_vec()?),
_ => Err(de::Error::custom(format!(
"Expected a String|Bytes|Fixed|Uuid, but got {:?}",
Review Comment:
```suggestion
"Expected a String|Bytes|Fixed|Uuid|Decimal, but got {:?}",
```
--
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: issues-unsubscribe@avro.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] AVRO-3892: [Rust] Support to resolve fixed from bytes and deserialize bytes in deserialize_any [avro]
Posted by "martin-g (via GitHub)" <gi...@apache.org>.
martin-g commented on code in PR #2567:
URL: https://github.com/apache/avro/pull/2567#discussion_r1372082897
##########
lang/rust/avro/src/de.rs:
##########
@@ -1315,4 +1323,67 @@ mod tests {
Ok(())
}
+
+ #[test]
+ fn test_avro_3892_deserialize_string_from_bytes() -> TestResult {
+ let raw_value = vec![1, 2, 3, 4];
+ let value = Value::Bytes(raw_value.clone());
+ let result = from_value::<String>(&value)?;
+ assert_eq!(result, String::from_utf8(raw_value)?);
+ Ok(())
+ }
+
+ #[test]
+ fn test_avro_3892_deserialize_str_from_bytes() -> TestResult {
+ let raw_value = &[1, 2, 3, 4];
+ let value = Value::Bytes(raw_value.to_vec());
+ let result = from_value::<&str>(&value)?;
+ assert_eq!(result, std::str::from_utf8(raw_value)?);
+ Ok(())
+ }
+
+ struct Bytes(Vec<u8>);
+
+ impl<'de> Deserialize<'de> for Bytes {
+ fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+ where
+ D: serde::Deserializer<'de>,
+ {
+ struct BytesVisitor;
+ impl<'de> serde::de::Visitor<'de> for BytesVisitor {
+ type Value = Bytes;
+
+ fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+ formatter.write_str("a byte array")
+ }
+
+ fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
+ where
+ E: serde::de::Error,
+ {
+ Ok(Bytes(v.to_vec()))
+ }
+ }
+ deserializer.deserialize_bytes(BytesVisitor)
+ }
+ }
+
+ #[test]
+ fn test_avro_3892_deserialize_bytes_from_decimal() -> TestResult {
+ let expeced_bytes = BigInt::from(123456789).to_signed_bytes_be();
Review Comment:
```suggestion
let expected_bytes = BigInt::from(123456789).to_signed_bytes_be();
```
##########
lang/rust/avro/src/de.rs:
##########
@@ -1315,4 +1323,67 @@ mod tests {
Ok(())
}
+
+ #[test]
+ fn test_avro_3892_deserialize_string_from_bytes() -> TestResult {
+ let raw_value = vec![1, 2, 3, 4];
+ let value = Value::Bytes(raw_value.clone());
+ let result = from_value::<String>(&value)?;
+ assert_eq!(result, String::from_utf8(raw_value)?);
+ Ok(())
+ }
+
+ #[test]
+ fn test_avro_3892_deserialize_str_from_bytes() -> TestResult {
+ let raw_value = &[1, 2, 3, 4];
+ let value = Value::Bytes(raw_value.to_vec());
+ let result = from_value::<&str>(&value)?;
+ assert_eq!(result, std::str::from_utf8(raw_value)?);
+ Ok(())
+ }
+
+ struct Bytes(Vec<u8>);
+
+ impl<'de> Deserialize<'de> for Bytes {
+ fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+ where
+ D: serde::Deserializer<'de>,
+ {
+ struct BytesVisitor;
+ impl<'de> serde::de::Visitor<'de> for BytesVisitor {
+ type Value = Bytes;
+
+ fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+ formatter.write_str("a byte array")
+ }
+
+ fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
+ where
+ E: serde::de::Error,
+ {
+ Ok(Bytes(v.to_vec()))
+ }
+ }
+ deserializer.deserialize_bytes(BytesVisitor)
+ }
+ }
+
+ #[test]
+ fn test_avro_3892_deserialize_bytes_from_decimal() -> TestResult {
+ let expeced_bytes = BigInt::from(123456789).to_signed_bytes_be();
+ let value = Value::Decimal(Decimal::from(&expeced_bytes));
+ let raw_bytes = from_value::<Bytes>(&value)?;
+ assert_eq!(raw_bytes.0, expeced_bytes);
+ Ok(())
+ }
+
+ #[test]
+ fn test_avro_3892_deserialize_bytes_from_uuid() -> TestResult {
+ let uuid_str = "10101010-2020-2020-2020-101010101010";
+ let expected_bytes = Uuid::parse_str(uuid_str)?.as_bytes().to_vec();
Review Comment:
Dunno!
I have to check what `Uuid::as_bytes()` does. I'll check tomorrow!
But feel free to propose a PR with a fix if you think it is wrong!
##########
lang/rust/avro/src/de.rs:
##########
@@ -1315,4 +1323,67 @@ mod tests {
Ok(())
}
+
+ #[test]
+ fn test_avro_3892_deserialize_string_from_bytes() -> TestResult {
+ let raw_value = vec![1, 2, 3, 4];
+ let value = Value::Bytes(raw_value.clone());
+ let result = from_value::<String>(&value)?;
+ assert_eq!(result, String::from_utf8(raw_value)?);
+ Ok(())
+ }
+
+ #[test]
+ fn test_avro_3892_deserialize_str_from_bytes() -> TestResult {
+ let raw_value = &[1, 2, 3, 4];
+ let value = Value::Bytes(raw_value.to_vec());
+ let result = from_value::<&str>(&value)?;
+ assert_eq!(result, std::str::from_utf8(raw_value)?);
+ Ok(())
+ }
+
+ struct Bytes(Vec<u8>);
+
+ impl<'de> Deserialize<'de> for Bytes {
+ fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+ where
+ D: serde::Deserializer<'de>,
+ {
+ struct BytesVisitor;
+ impl<'de> serde::de::Visitor<'de> for BytesVisitor {
+ type Value = Bytes;
+
+ fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+ formatter.write_str("a byte array")
+ }
+
+ fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
+ where
+ E: serde::de::Error,
+ {
+ Ok(Bytes(v.to_vec()))
+ }
+ }
+ deserializer.deserialize_bytes(BytesVisitor)
+ }
+ }
+
+ #[test]
+ fn test_avro_3892_deserialize_bytes_from_decimal() -> TestResult {
+ let expeced_bytes = BigInt::from(123456789).to_signed_bytes_be();
+ let value = Value::Decimal(Decimal::from(&expeced_bytes));
+ let raw_bytes = from_value::<Bytes>(&value)?;
+ assert_eq!(raw_bytes.0, expeced_bytes);
+ Ok(())
Review Comment:
Please add tests also for the `Value::Bytes` and `Value::Fixed`, and `Value::Union` with them.
--
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: issues-unsubscribe@avro.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org