Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion anchor-service/src/anchor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ impl MerkleNodes {
}

/// Return an iterator over the MerkleNodes
pub fn iter(&self) -> indexmap::map::Iter<Cid, MerkleNode> {
pub fn iter(&self) -> indexmap::map::Iter<'_, Cid, MerkleNode> {
self.nodes.iter()
}

Expand Down
2 changes: 1 addition & 1 deletion core/src/peer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ impl Builder<WithExpiration> {
PeerKey(format!("{:0>11}", self.state.expiration))
}
/// Set the peer id. Note, a NodeKey is required so the [`PeerEntry`] can be signed.
pub fn with_id(self, id: &NodeKey) -> Builder<WithId> {
pub fn with_id(self, id: &NodeKey) -> Builder<WithId<'_>> {
Builder {
state: WithId {
node_key: id,
Expand Down
2 changes: 1 addition & 1 deletion flight/tests/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ async fn event_states_simple() -> Result<()> {
data::varchar as data,
before,
chain_id
FROM event_states LIMIT 4"#
FROM event_states order by event_state_order LIMIT 4"#
.to_string(),
None,
)
Expand Down
2 changes: 2 additions & 0 deletions pipeline/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,5 @@ url.workspace = true
mockall.workspace = true
test-log.workspace = true
tracing-subscriber.workspace = true
rand.workspace = true
multihash-codetable.workspace = true
545 changes: 452 additions & 93 deletions pipeline/src/aggregator/mod.rs

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pipeline/src/aggregator/model_instance_patch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ impl PartitionEvaluator for CeramicPatchEvaluator {
}
Err(err) => {
warn!(%err, event_cid=?Cid::read_bytes(event_cids.value(i)), "failed to apply patch to model instance event");
tracing::debug!(%previous_height, %num_rows, patch=?String::from_utf8_lossy(patches.value(i)), previous_state=?String::from_utf8_lossy(previous_state), "failed to apply patch to model instance event");
new_states.append_null();
model_versions.append_null();
}
Expand Down
1 change: 1 addition & 0 deletions pipeline/src/aggregator/model_patch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ impl PartitionEvaluator for CeramicPatchEvaluator {
}
Err(err) => {
warn!(%err, event_cid=?Cid::read_bytes(event_cids.value(i)), "failed to apply patch to model event");
tracing::debug!(%previous_height, %num_rows, patch=?String::from_utf8_lossy(patches.value(i)), previous_state=?String::from_utf8_lossy(previous_state), "failed to apply patch to model event");
new_states.append_null();
}
};
Expand Down
2 changes: 1 addition & 1 deletion sql/src/sqlite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ impl SqlitePool {

/// Begin a transaction. The transaction must be committed by calling `commit_tx`.
/// Will be rolled back on drop if not committed.
pub async fn begin_tx(&self) -> Result<SqliteTransaction> {
pub async fn begin_tx(&self) -> Result<SqliteTransaction<'_>> {
let tx = self.writer.begin().await?;
Ok(SqliteTransaction { tx })
}
Expand Down
Loading