Skip to content

fix: make apply patch not fail the pipeline #690

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
nathanielc merged 1 commit into from
Mar 20, 2025
Merged

fix: make apply patch not fail the pipeline #690

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
15 changes: 12 additions & 3 deletions pipeline/src/aggregator/model_instance_patch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ use datafusion::{
},
};
use json_patch::PatchOperation;
use tracing::warn;

use super::{bytes_value_at, u32_value_at, EventDataContainer};

Expand Down Expand Up @@ -218,9 +219,17 @@ impl PartitionEvaluator for CeramicPatchEvaluator {
} else {
let patch = patches.value(i);
resolved_patches.append_value(patch);
let (data, model_version) = Self::apply_patch(patch, previous_state)?;
new_states.append_value(data);
model_versions.append_option(model_version.map(|mv| mv.to_bytes()));
match Self::apply_patch(patch, previous_state) {
Ok((data, model_version)) => {
new_states.append_value(data);
model_versions.append_option(model_version.map(|mv| mv.to_bytes()));
}
Err(err) => {
warn!(%err, event_cid=?Cid::read_bytes(event_cids.value(i)), "failed to apply patch to model instance event");
new_states.append_null();
model_versions.append_null();
}
};
}
} else {
// Unreachable when data is well formed.
Expand Down
15 changes: 11 additions & 4 deletions pipeline/src/aggregator/model_patch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use arrow::{
datatypes::DataType,
};
use arrow_schema::Field;
use cid::Cid;
use datafusion::{
common::{
cast::{as_binary_array, as_uint32_array},
Expand All @@ -16,6 +17,7 @@ use datafusion::{
},
};
use json_patch::PatchOperation;
use tracing::warn;

use super::{bytes_value_at, u32_value_at, EventDataContainer};

Expand Down Expand Up @@ -168,10 +170,15 @@ impl PartitionEvaluator for CeramicPatchEvaluator {
resolved_previous_states.append_value(&state);
} else {
resolved_previous_states.append_value(previous_state);
new_states.append_value(CeramicPatchEvaluator::apply_patch(
patches.value(i),
previous_state,
)?);
match Self::apply_patch(patches.value(i), previous_state) {
Ok(data) => {
new_states.append_value(data);
}
Err(err) => {
warn!(%err, event_cid=?Cid::read_bytes(event_cids.value(i)), "failed to apply patch to model event");
new_states.append_null();
}
};
}
} else {
// Unreachable when data is well formed.
Expand Down
Loading