Skip to content

496: feat: Replace from_avro_datum* functions with GenericDatumReader #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martin-augment wants to merge 1 commit into
base: main
Choose a base branch
from
Open

496: feat: Replace from_avro_datum* functions with GenericDatumReader #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions avro/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ mod decimal;
mod decode;
mod duration;
mod encode;
mod reader;

#[cfg(doc)]
pub mod documentation;
pub mod error;
pub mod headers;
pub mod rabin;
pub mod reader;
pub mod schema;
pub mod schema_compatibility;
pub mod schema_equality;
Expand Down Expand Up @@ -90,8 +90,13 @@ pub use codec::{Codec, DeflateSettings};
pub use decimal::Decimal;
pub use duration::{Days, Duration, Millis, Months};
pub use error::Error;
#[expect(
deprecated,
reason = "Still need to export it until we remove it completely"
)]
pub use reader::{
Reader, from_avro_datum, from_avro_datum_reader_schemata, from_avro_datum_schemata,
Reader,
datum::{from_avro_datum, from_avro_datum_reader_schemata, from_avro_datum_schemata},
read_marker,
single_object::{GenericSingleObjectReader, SpecificSingleObjectReader},
};
Expand Down Expand Up @@ -154,9 +159,11 @@ pub fn set_serde_human_readable(human_readable: bool) -> bool {
#[cfg(test)]
mod tests {
use crate::{
Codec, Reader, Schema, Writer, from_avro_datum,
Codec, Reader, Schema, Writer,
reader::datum::GenericDatumReader,
types::{Record, Value},
};
use apache_avro_test_helper::TestResult;
use pretty_assertions::assert_eq;

//TODO: move where it fits better
Expand Down Expand Up @@ -301,7 +308,7 @@ mod tests {
}

#[test]
fn test_illformed_length() {
fn test_illformed_length() -> TestResult {
let raw_schema = r#"
{
"type": "record",
Expand All @@ -318,7 +325,11 @@ mod tests {
// Would allocate 18446744073709551605 bytes
let illformed: &[u8] = &[0x3e, 0x15, 0xff, 0x1f, 0x15, 0xff];

let value = from_avro_datum(&schema, &mut &*illformed, None);
let value = GenericDatumReader::builder(&schema)
.build()?
.read_value(&mut &*illformed);
assert!(value.is_err());

Ok(())
}
}
Loading