This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/avro-rs.git
The following commit(s) were added to refs/heads/main by this push:
new f90ccc6 Revert "chore: Extract RecordField related structs to
src/schema/record_field.rs"
f90ccc6 is described below
commit f90ccc6d62ccba606e6233d3b14788654be4d64e
Author: Martin Tzvetanov Grigorov <[email protected]>
AuthorDate: Mon Jan 19 09:13:03 2026 +0200
Revert "chore: Extract RecordField related structs to
src/schema/record_field.rs"
This reverts commit e9f6978e29e82c1f987da709884e675260f35d88.
It shouldn't have been committed directly in `main`
---
avro/src/schema/mod.rs | 240 +++++++++++++++++++++++++++++++++++-
avro/src/schema/record_field.rs | 266 ----------------------------------------
2 files changed, 235 insertions(+), 271 deletions(-)
diff --git a/avro/src/schema/mod.rs b/avro/src/schema/mod.rs
index 0c54b37..e56eab8 100644
--- a/avro/src/schema/mod.rs
+++ b/avro/src/schema/mod.rs
@@ -21,7 +21,10 @@ use crate::{
error::{Details, Error},
schema_equality, types,
util::MapHelper,
- validator::{validate_enum_symbol_name, validate_namespace,
validate_schema_name},
+ validator::{
+ validate_enum_symbol_name, validate_namespace,
validate_record_field_name,
+ validate_schema_name,
+ },
};
use digest::Digest;
use log::{debug, error, warn};
@@ -37,11 +40,9 @@ use std::{
fmt::Debug,
hash::Hash,
io::Read,
+ str::FromStr,
};
-use strum_macros::{Display, EnumDiscriminants};
-
-pub mod record_field;
-pub use crate::schema::record_field::{RecordField, RecordFieldBuilder,
RecordFieldOrder};
+use strum_macros::{Display, EnumDiscriminants, EnumString};
/// Represents an Avro schema fingerprint
/// More information about Avro schema fingerprints can be found in the
@@ -640,6 +641,179 @@ pub(crate) fn resolve_names_with_schemata(
Ok(())
}
+/// Represents a `field` in a `record` Avro schema.
+#[derive(bon::Builder, Clone, Debug, PartialEq)]
+pub struct RecordField {
+ /// Name of the field.
+ pub name: String,
+ /// Documentation of the field.
+ #[builder(default)]
+ pub doc: Documentation,
+ /// Aliases of the field's name. They have no namespace.
+ pub aliases: Option<Vec<String>>,
+ /// Default value of the field.
+ /// This value will be used when reading Avro datum if schema resolution
+ /// is enabled.
+ pub default: Option<Value>,
+ /// Schema of the field.
+ pub schema: Schema,
+ /// Order of the field.
+ ///
+ /// **NOTE** This currently has no effect.
+ #[builder(default = RecordFieldOrder::Ignore)]
+ pub order: RecordFieldOrder,
+ /// Position of the field in the list of `field` of its parent `Schema`
+ #[builder(default)]
+ pub position: usize,
+ /// A collection of all unknown fields in the record field.
+ #[builder(default = BTreeMap::new())]
+ pub custom_attributes: BTreeMap<String, Value>,
+}
+
+/// Represents any valid order for a `field` in a `record` Avro schema.
+#[derive(Clone, Debug, Eq, PartialEq, EnumString)]
+#[strum(serialize_all = "kebab_case")]
+pub enum RecordFieldOrder {
+ Ascending,
+ Descending,
+ Ignore,
+}
+
+impl RecordField {
+ /// Parse a `serde_json::Value` into a `RecordField`.
+ fn parse(
+ field: &Map<String, Value>,
+ position: usize,
+ parser: &mut Parser,
+ enclosing_record: &Name,
+ ) -> AvroResult<Self> {
+ let name = field.name().ok_or(Details::GetNameFieldFromRecord)?;
+
+ validate_record_field_name(&name)?;
+
+ // TODO: "type" = "<record name>"
+ let schema = parser.parse_complex(
+ field,
+ &enclosing_record.namespace,
+ RecordSchemaParseLocation::FromField,
+ )?;
+
+ let default = field.get("default").cloned();
+ Self::resolve_default_value(
+ &schema,
+ &name,
+ &enclosing_record.fullname(None),
+ &parser.parsed_schemas,
+ &default,
+ )?;
+
+ let aliases = field.get("aliases").and_then(|aliases| {
+ aliases.as_array().map(|aliases| {
+ aliases
+ .iter()
+ .flat_map(|alias| alias.as_str())
+ .map(|alias| alias.to_string())
+ .collect::<Vec<String>>()
+ })
+ });
+
+ let order = field
+ .get("order")
+ .and_then(|order| order.as_str())
+ .and_then(|order| RecordFieldOrder::from_str(order).ok())
+ .unwrap_or(RecordFieldOrder::Ascending);
+
+ Ok(RecordField {
+ name,
+ doc: field.doc(),
+ default,
+ aliases,
+ order,
+ position,
+ custom_attributes: RecordField::get_field_custom_attributes(field,
&schema),
+ schema,
+ })
+ }
+
+ fn resolve_default_value(
+ field_schema: &Schema,
+ field_name: &str,
+ record_name: &str,
+ names: &Names,
+ default: &Option<Value>,
+ ) -> AvroResult<()> {
+ if let Some(value) = default {
+ let avro_value = types::Value::from(value.clone());
+ match field_schema {
+ Schema::Union(union_schema) => {
+ let schemas = &union_schema.schemas;
+ let resolved = schemas.iter().any(|schema| {
+ avro_value
+ .to_owned()
+ .resolve_internal(schema, names,
&schema.namespace(), &None)
+ .is_ok()
+ });
+
+ if !resolved {
+ let schema: Option<&Schema> = schemas.first();
+ return match schema {
+ Some(first_schema) => Err(Details::GetDefaultUnion(
+ SchemaKind::from(first_schema),
+ types::ValueKind::from(avro_value),
+ )
+ .into()),
+ None => Err(Details::EmptyUnion.into()),
+ };
+ }
+ }
+ _ => {
+ let resolved = avro_value
+ .resolve_internal(field_schema, names,
&field_schema.namespace(), &None)
+ .is_ok();
+
+ if !resolved {
+ return Err(Details::GetDefaultRecordField(
+ field_name.to_string(),
+ record_name.to_string(),
+ field_schema.canonical_form(),
+ )
+ .into());
+ }
+ }
+ };
+ }
+
+ Ok(())
+ }
+
+ fn get_field_custom_attributes(
+ field: &Map<String, Value>,
+ schema: &Schema,
+ ) -> BTreeMap<String, Value> {
+ let mut custom_attributes: BTreeMap<String, Value> = BTreeMap::new();
+ for (key, value) in field {
+ match key.as_str() {
+ "type" | "name" | "doc" | "default" | "order" | "position" |
"aliases"
+ | "logicalType" => continue,
+ key if key == "symbols" && matches!(schema, Schema::Enum(_))
=> continue,
+ key if key == "size" && matches!(schema, Schema::Fixed(_)) =>
continue,
+ key if key == "items" && matches!(schema, Schema::Array(_)) =>
continue,
+ key if key == "values" && matches!(schema, Schema::Map(_)) =>
continue,
+ _ => custom_attributes.insert(key.clone(), value.clone()),
+ };
+ }
+ custom_attributes
+ }
+
+ /// Returns true if this `RecordField` is nullable, meaning the schema is
a `UnionSchema` where the first variant is `Null`.
+ pub fn is_nullable(&self) -> bool {
+ match self.schema {
+ Schema::Union(ref inner) => inner.is_nullable(),
+ _ => false,
+ }
+ }
+}
+
/// A description of a Record schema.
#[derive(bon::Builder, Debug, Clone)]
pub struct RecordSchema {
@@ -2243,6 +2417,31 @@ impl Serialize for Schema {
}
}
+impl Serialize for RecordField {
+ fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+ where
+ S: Serializer,
+ {
+ let mut map = serializer.serialize_map(None)?;
+ map.serialize_entry("name", &self.name)?;
+ map.serialize_entry("type", &self.schema)?;
+
+ if let Some(ref default) = self.default {
+ map.serialize_entry("default", default)?;
+ }
+
+ if let Some(ref aliases) = self.aliases {
+ map.serialize_entry("aliases", aliases)?;
+ }
+
+ for attr in &self.custom_attributes {
+ map.serialize_entry(attr.0, attr.1)?;
+ }
+
+ map.end()
+ }
+}
+
/// Parses a **valid** avro schema into the Parsing Canonical Form.
///
https://avro.apache.org/docs/current/specification/#parsing-canonical-form-for-schemas
fn parsing_canonical_form(schema: &Value, defined_names: &mut HashSet<String>)
-> String {
@@ -2727,6 +2926,37 @@ mod tests {
Ok(())
}
+ #[test]
+ fn test_avro_3621_nullable_record_field() -> TestResult {
+ let nullable_record_field = RecordField::builder()
+ .name("next".to_string())
+ .schema(Schema::Union(UnionSchema::new(vec![
+ Schema::Null,
+ Schema::Ref {
+ name: Name {
+ name: "LongList".to_owned(),
+ namespace: None,
+ },
+ },
+ ])?))
+ .order(RecordFieldOrder::Ascending)
+ .position(1)
+ .build();
+
+ assert!(nullable_record_field.is_nullable());
+
+ let non_nullable_record_field = RecordField::builder()
+ .name("next".to_string())
+ .default(json!(2))
+ .schema(Schema::Long)
+ .order(RecordFieldOrder::Ascending)
+ .position(1)
+ .build();
+
+ assert!(!non_nullable_record_field.is_nullable());
+ Ok(())
+ }
+
// AVRO-3248
#[test]
fn test_union_of_records() -> TestResult {
diff --git a/avro/src/schema/record_field.rs b/avro/src/schema/record_field.rs
deleted file mode 100644
index ef5e656..0000000
--- a/avro/src/schema/record_field.rs
+++ /dev/null
@@ -1,266 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-use super::{Documentation, Name, Names, Parser, RecordSchemaParseLocation,
Schema, SchemaKind};
-use crate::AvroResult;
-use crate::error::Details;
-use crate::types;
-use crate::util::MapHelper;
-use crate::validator::validate_record_field_name;
-use serde::ser::SerializeMap;
-use serde::{Serialize, Serializer};
-use serde_json::{Map, Value};
-use std::collections::BTreeMap;
-use std::str::FromStr;
-use strum_macros::EnumString;
-
-/// Represents a `field` in a `record` Avro schema.
-#[derive(bon::Builder, Clone, Debug, PartialEq)]
-pub struct RecordField {
- /// Name of the field.
- pub name: String,
- /// Documentation of the field.
- #[builder(default)]
- pub doc: Documentation,
- /// Aliases of the field's name. They have no namespace.
- pub aliases: Option<Vec<String>>,
- /// Default value of the field.
- /// This value will be used when reading Avro datum if schema resolution
- /// is enabled.
- pub default: Option<Value>,
- /// Schema of the field.
- pub schema: Schema,
- /// Order of the field.
- ///
- /// **NOTE** This currently has no effect.
- #[builder(default = RecordFieldOrder::Ignore)]
- pub order: RecordFieldOrder,
- /// Position of the field in the list of `field` of its parent `Schema`
- #[builder(default)]
- pub position: usize,
- /// A collection of all unknown fields in the record field.
- #[builder(default = BTreeMap::new())]
- pub custom_attributes: BTreeMap<String, Value>,
-}
-
-/// Represents any valid order for a `field` in a `record` Avro schema.
-#[derive(Clone, Debug, Eq, PartialEq, EnumString)]
-#[strum(serialize_all = "kebab_case")]
-pub enum RecordFieldOrder {
- Ascending,
- Descending,
- Ignore,
-}
-
-impl RecordField {
- /// Parse a `serde_json::Value` into a `RecordField`.
- pub(super) fn parse(
- field: &Map<String, Value>,
- position: usize,
- parser: &mut Parser,
- enclosing_record: &Name,
- ) -> AvroResult<Self> {
- let name = field.name().ok_or(Details::GetNameFieldFromRecord)?;
-
- validate_record_field_name(&name)?;
-
- // TODO: "type" = "<record name>"
- let schema = parser.parse_complex(
- field,
- &enclosing_record.namespace,
- RecordSchemaParseLocation::FromField,
- )?;
-
- let default = field.get("default").cloned();
- Self::resolve_default_value(
- &schema,
- &name,
- &enclosing_record.fullname(None),
- &parser.parsed_schemas,
- &default,
- )?;
-
- let aliases = field.get("aliases").and_then(|aliases| {
- aliases.as_array().map(|aliases| {
- aliases
- .iter()
- .flat_map(|alias| alias.as_str())
- .map(|alias| alias.to_string())
- .collect::<Vec<String>>()
- })
- });
-
- let order = field
- .get("order")
- .and_then(|order| order.as_str())
- .and_then(|order| RecordFieldOrder::from_str(order).ok())
- .unwrap_or(RecordFieldOrder::Ascending);
-
- Ok(RecordField {
- name,
- doc: field.doc(),
- default,
- aliases,
- order,
- position,
- custom_attributes: RecordField::get_field_custom_attributes(field,
&schema),
- schema,
- })
- }
-
- fn resolve_default_value(
- field_schema: &Schema,
- field_name: &str,
- record_name: &str,
- names: &Names,
- default: &Option<Value>,
- ) -> AvroResult<()> {
- if let Some(value) = default {
- let avro_value = types::Value::from(value.clone());
- match field_schema {
- Schema::Union(union_schema) => {
- let schemas = &union_schema.schemas;
- let resolved = schemas.iter().any(|schema| {
- avro_value
- .to_owned()
- .resolve_internal(schema, names,
&schema.namespace(), &None)
- .is_ok()
- });
-
- if !resolved {
- let schema: Option<&Schema> = schemas.first();
- return match schema {
- Some(first_schema) => Err(Details::GetDefaultUnion(
- SchemaKind::from(first_schema),
- types::ValueKind::from(avro_value),
- )
- .into()),
- None => Err(Details::EmptyUnion.into()),
- };
- }
- }
- _ => {
- let resolved = avro_value
- .resolve_internal(field_schema, names,
&field_schema.namespace(), &None)
- .is_ok();
-
- if !resolved {
- return Err(Details::GetDefaultRecordField(
- field_name.to_string(),
- record_name.to_string(),
- field_schema.canonical_form(),
- )
- .into());
- }
- }
- };
- }
-
- Ok(())
- }
-
- fn get_field_custom_attributes(
- field: &Map<String, Value>,
- schema: &Schema,
- ) -> BTreeMap<String, Value> {
- let mut custom_attributes: BTreeMap<String, Value> = BTreeMap::new();
- for (key, value) in field {
- match key.as_str() {
- "type" | "name" | "doc" | "default" | "order" | "position" |
"aliases"
- | "logicalType" => continue,
- key if key == "symbols" && matches!(schema, Schema::Enum(_))
=> continue,
- key if key == "size" && matches!(schema, Schema::Fixed(_)) =>
continue,
- key if key == "items" && matches!(schema, Schema::Array(_)) =>
continue,
- key if key == "values" && matches!(schema, Schema::Map(_)) =>
continue,
- _ => custom_attributes.insert(key.clone(), value.clone()),
- };
- }
- custom_attributes
- }
-
- /// Returns true if this `RecordField` is nullable, meaning the schema is
a `UnionSchema` where the first variant is `Null`.
- pub fn is_nullable(&self) -> bool {
- match self.schema {
- Schema::Union(ref inner) => inner.is_nullable(),
- _ => false,
- }
- }
-}
-
-impl Serialize for RecordField {
- fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
- where
- S: Serializer,
- {
- let mut map = serializer.serialize_map(None)?;
- map.serialize_entry("name", &self.name)?;
- map.serialize_entry("type", &self.schema)?;
-
- if let Some(ref default) = self.default {
- map.serialize_entry("default", default)?;
- }
-
- if let Some(ref aliases) = self.aliases {
- map.serialize_entry("aliases", aliases)?;
- }
-
- for attr in &self.custom_attributes {
- map.serialize_entry(attr.0, attr.1)?;
- }
-
- map.end()
- }
-}
-
-#[cfg(test)]
-mod tests {
- use super::*;
- use crate::schema::{Name, Schema, UnionSchema};
- use apache_avro_test_helper::TestResult;
- use serde_json::json;
-
- #[test]
- fn test_avro_3621_nullable_record_field() -> TestResult {
- let nullable_record_field = RecordField::builder()
- .name("next".to_string())
- .schema(Schema::Union(UnionSchema::new(vec![
- Schema::Null,
- Schema::Ref {
- name: Name {
- name: "LongList".to_owned(),
- namespace: None,
- },
- },
- ])?))
- .order(RecordFieldOrder::Ascending)
- .position(1)
- .build();
-
- assert!(nullable_record_field.is_nullable());
-
- let non_nullable_record_field = RecordField::builder()
- .name("next".to_string())
- .default(json!(2))
- .schema(Schema::Long)
- .order(RecordFieldOrder::Ascending)
- .position(1)
- .build();
-
- assert!(!non_nullable_record_field.is_nullable());
- Ok(())
- }
-}
