Skip to content

Continue Avro validation after missing nullable fields #6698

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

Continue Avro validation after missing nullable fields #6698

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
25 changes: 23 additions & 2 deletions crates/adapters/src/format/avro/schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ pub fn validate_struct_schema(
// Allow nullable fields to be missing in the Avro schema. This is useful to, e.g.,
// support inputs encoded using older versions of the schema missing some fields.
if field.columntype.nullable {
return Ok(());
continue;
} else {
return Err(format!(
"column '{}' is missing in the Avro schema",
Expand Down Expand Up @@ -669,8 +669,9 @@ impl AvroSchemaBuilder {

#[cfg(test)]
mod test {
use super::{AvroSchemaBuilder, is_valid_avro_fullname, schema_json};
use super::{AvroSchemaBuilder, is_valid_avro_fullname, schema_json, validate_struct_schema};
use apache_avro::{Schema as AvroSchema, schema::Name};
use feldera_adapterlib::catalog::AvroSchemaRefs;
use feldera_types::program_schema::{ColumnType, Field, Relation, SqlIdentifier};
use std::collections::BTreeMap;

Expand Down Expand Up @@ -752,4 +753,24 @@ mod test {
);
}
}

#[test]
fn missing_nullable_field_does_not_stop_validation() {
let avro_schema =
AvroSchema::parse_str(r#"{"type":"record","name":"input","fields":[]}"#).unwrap();
let struct_schema = vec![
Field::new(
SqlIdentifier::new("optional", false),
ColumnType::bigint(true),
),
Field::new(
SqlIdentifier::new("required", false),
ColumnType::bigint(false),
),
];

let error = validate_struct_schema(&avro_schema, &AvroSchemaRefs::new(), &struct_schema)
.unwrap_err();
assert_eq!(error, "column 'required' is missing in the Avro schema");
}
}