Skip to content

refactor: Replace Once with now stable OnceLock #259

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: Replace Once with now stable OnceLock #259

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
193 changes: 0 additions & 193 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion avro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ criterion = { default-features = false, version = "0.7.0" }
hex-literal = { default-features = false, version = "1.0.0" }
md-5 = { default-features = false, version = "0.10.6" }
pretty_assertions = { default-features = false, version = "1.4.1", features = ["std"] }
serial_test = "3.2.0"
sha2 = { default-features = false, version = "0.10.9" }
paste = { default-features = false, version = "1.0.15" }
rstest = { default-features = false, version = "0.26.1" }
Expand Down
23 changes: 2 additions & 21 deletions avro/src/de.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,15 +766,12 @@ mod tests {
use num_bigint::BigInt;
use pretty_assertions::assert_eq;
use serde::{Deserialize, Serialize};
use serial_test::serial;
use std::sync::atomic::Ordering;
use uuid::Uuid;

use apache_avro_test_helper::TestResult;

use crate::Decimal;

use super::*;
use crate::Decimal;

#[derive(PartialEq, Eq, Serialize, Deserialize, Debug)]
pub struct StringEnum {
Expand Down Expand Up @@ -1541,26 +1538,10 @@ mod tests {
}

#[test]
#[serial(serde_is_human_readable)]
fn avro_3747_human_readable_false() -> TestResult {
use serde::de::Deserializer as SerdeDeserializer;

let is_human_readable = false;
crate::util::SERDE_HUMAN_READABLE.store(is_human_readable, Ordering::Release);

let deser = &Deserializer::new(&Value::Null);

assert_eq!(deser.is_human_readable(), is_human_readable);

Ok(())
}

#[test]
#[serial(serde_is_human_readable)]
fn avro_3747_human_readable_true() -> TestResult {
use serde::de::Deserializer as SerdeDeserializer;

crate::util::SERDE_HUMAN_READABLE.store(true, Ordering::Release);
assert!(crate::util::is_human_readable());

let deser = &Deserializer::new(&Value::Null);

Expand Down
53 changes: 1 addition & 52 deletions avro/src/schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2637,14 +2637,12 @@ pub mod derive {
#[cfg(test)]
mod tests {
use super::*;
use crate::{SpecificSingleObjectWriter, error::Details, rabin::Rabin};
use crate::{error::Details, rabin::Rabin};
use apache_avro_test_helper::{
TestResult,
logger::{assert_logged, assert_not_logged},
};
use serde_json::json;
use serial_test::serial;
use std::sync::atomic::Ordering;

#[test]
fn test_invalid_schema() {
Expand Down Expand Up @@ -6704,55 +6702,6 @@ mod tests {
Ok(())
}

#[test]
#[serial(serde_is_human_readable)]
fn avro_rs_53_uuid_with_fixed() -> TestResult {
#[derive(Debug, Serialize, Deserialize)]
struct Comment {
id: crate::Uuid,
}

impl AvroSchema for Comment {
fn get_schema() -> Schema {
Schema::parse_str(
r#"{
"type" : "record",
"name" : "Comment",
"fields" : [ {
"name" : "id",
"type" : {
"type" : "fixed",
"size" : 16,
"logicalType" : "uuid",
"name": "FixedUUID"
}
} ]
}"#,
)
.expect("Invalid Comment Avro schema")
}
}

let payload = Comment {
id: "de2df598-9948-4988-b00a-a41c0e287398".parse()?,
};
let mut buffer = Vec::new();

// serialize the Uuid as String
crate::util::SERDE_HUMAN_READABLE.store(true, Ordering::Release);
let bytes = SpecificSingleObjectWriter::<Comment>::with_capacity(64)?
.write_ref(&payload, &mut buffer)?;
assert_eq!(bytes, 47);

// serialize the Uuid as Bytes
crate::util::SERDE_HUMAN_READABLE.store(false, Ordering::Release);
let bytes = SpecificSingleObjectWriter::<Comment>::with_capacity(64)?
.write_ref(&payload, &mut buffer)?;
assert_eq!(bytes, 27);

Ok(())
}

#[test]
fn avro_3926_uuid_schema_for_fixed_with_size_16() -> TestResult {
let schema = json!(
Expand Down
Loading