Skip to content

Fix coalescing of missing fields #15

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

Merged
QuartzLibrary merged 1 commit into from
Mar 31, 2026
Merged

Fix coalescing of missing fields #15

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
49 changes: 29 additions & 20 deletions schema_analysis/src/schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,16 +255,7 @@ impl<C: Context> Coalesce for Schema<C> {
},
) => {
self_agg.coalesce(other_agg);
for (name, other_schema) in other_fields {
match self_fields.entry(name) {
Entry::Occupied(mut schema) => {
schema.get_mut().coalesce(other_schema);
}
Entry::Vacant(entry) => {
entry.insert(other_schema);
}
}
}
coalesce_struct_fields(self_fields, other_fields);
}
(
Union {
Expand Down Expand Up @@ -370,16 +361,7 @@ impl<C: Context> Coalesce for Schema<C> {
},
) => {
self_agg.coalesce(other_agg);
for (name, other_schema) in other_fields {
match self_fields.entry(name) {
Entry::Occupied(mut schema) => {
schema.get_mut().coalesce(other_schema);
}
Entry::Vacant(entry) => {
entry.insert(other_schema);
}
}
}
coalesce_struct_fields(self_fields, other_fields);
return;
}

Expand All @@ -393,6 +375,33 @@ impl<C: Context> Coalesce for Schema<C> {
// If we were unable to find a match, push the schema to the alternatives:
alternatives.push(other);
}

fn coalesce_struct_fields<C: Context>(
self_fields: &mut OrderMap<std::string::String, Field<C>>,
other_fields: OrderMap<std::string::String, Field<C>>,
) where
Field<C>: Coalesce,
{
// Fields in self but not in other were missing from other's documents.
for (name, field) in self_fields.iter_mut() {
if !other_fields.contains_key(name) {
field.status.may_be_missing = true;
}
}
for (name, other_field) in other_fields {
match self_fields.entry(name) {
Entry::Occupied(mut entry) => {
entry.get_mut().coalesce(other_field);
}
// Fields in other but not in self were missing from self's documents.
Entry::Vacant(entry) => {
let mut field = other_field;
field.status.may_be_missing = true;
entry.insert(field);
}
}
}
}
}
}

Expand Down
Loading