This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch branch-1.11
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/branch-1.11 by this push:
new 88f45064d AVRO-3898: [Rust] Schema compatibility should not check
namespace (#2574)
88f45064d is described below
commit 88f45064d42b8b7379ea814b984580edf22a95b1
Author: Martin Grigorov <[email protected]>
AuthorDate: Thu Nov 2 14:37:28 2023 +0200
AVRO-3898: [Rust] Schema compatibility should not check namespace (#2574)
According to the spec
(https://avro.apache.org/docs/1.11.1/specification/#schema-resolution)
named schemas must check only the unqualified names:
```
both schemas are records with the same (unqualified) name
```
Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
(cherry picked from commit 3e682e999980f718328aa8dc20e7c7052c9280f4)
---
lang/rust/avro/src/schema_compatibility.rs | 83 ++++++++++++++++++++++++++++--
1 file changed, 79 insertions(+), 4 deletions(-)
diff --git a/lang/rust/avro/src/schema_compatibility.rs
b/lang/rust/avro/src/schema_compatibility.rs
index cafd250f7..8a0b2a4d7 100644
--- a/lang/rust/avro/src/schema_compatibility.rs
+++ b/lang/rust/avro/src/schema_compatibility.rs
@@ -221,7 +221,7 @@ impl SchemaCompatibility {
SchemaKind::Record => {
if let Schema::Record(RecordSchema { name: w_name, .. }) =
writers_schema {
if let Schema::Record(RecordSchema { name: r_name, ..
}) = readers_schema {
- return w_name.fullname(None) ==
r_name.fullname(None);
+ return w_name.name == r_name.name;
} else {
unreachable!("readers_schema should have been
Schema::Record")
}
@@ -246,8 +246,7 @@ impl SchemaCompatibility {
attributes: _,
}) = readers_schema
{
- return w_name.fullname(None) ==
r_name.fullname(None)
- && w_size == r_size;
+ return w_name.name == r_name.name && w_size ==
r_size;
} else {
unreachable!("readers_schema should have been
Schema::Fixed")
}
@@ -258,7 +257,7 @@ impl SchemaCompatibility {
SchemaKind::Enum => {
if let Schema::Enum(EnumSchema { name: w_name, .. }) =
writers_schema {
if let Schema::Enum(EnumSchema { name: r_name, .. }) =
readers_schema {
- return w_name.fullname(None) ==
r_name.fullname(None);
+ return w_name.name == r_name.name;
} else {
unreachable!("readers_schema should have been
Schema::Enum")
}
@@ -1083,4 +1082,80 @@ mod tests {
Ok(())
}
+
+ #[test]
+ fn test_avro_3898_record_schemas_match_by_unqualified_name() -> TestResult
{
+ let schemas = [
+ // Record schemas
+ (
+ Schema::parse_str(
+ r#"{
+ "type": "record",
+ "name": "Statistics",
+ "fields": [
+ { "name": "success", "type": "int" },
+ { "name": "fail", "type": "int" },
+ { "name": "time", "type": "string" },
+ { "name": "max", "type": "int", "default": 0 }
+ ]
+ }"#,
+ )?,
+ Schema::parse_str(
+ r#"{
+ "type": "record",
+ "name": "Statistics",
+ "namespace": "my.namespace",
+ "fields": [
+ { "name": "success", "type": "int" },
+ { "name": "fail", "type": "int" },
+ { "name": "time", "type": "string" },
+ { "name": "average", "type": "int", "default": 0}
+ ]
+ }"#,
+ )?,
+ ),
+ // Enum schemas
+ (
+ Schema::parse_str(
+ r#"{
+ "type": "enum",
+ "name": "Suit",
+ "symbols": ["diamonds", "spades", "clubs"]
+ }"#,
+ )?,
+ Schema::parse_str(
+ r#"{
+ "type": "enum",
+ "name": "Suit",
+ "namespace": "my.namespace",
+ "symbols": ["diamonds", "spades", "clubs", "hearts"]
+ }"#,
+ )?,
+ ),
+ // Fixed schemas
+ (
+ Schema::parse_str(
+ r#"{
+ "type": "fixed",
+ "name": "EmployeeId",
+ "size": 16
+ }"#,
+ )?,
+ Schema::parse_str(
+ r#"{
+ "type": "fixed",
+ "name": "EmployeeId",
+ "namespace": "my.namespace",
+ "size": 16
+ }"#,
+ )?,
+ ),
+ ];
+
+ for (schema_1, schema_2) in schemas {
+ assert!(SchemaCompatibility::can_read(&schema_1, &schema_2));
+ }
+
+ Ok(())
+ }
}
