Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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: 0 additions & 2 deletions ci/nightly/pipeline.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,6 @@ steps:
timeout_in_minutes: 58
agents:
queue: hetzner-aarch64-4cpu-8gb
skip: "flaky until database-issues#8797 is fixed"
plugins:
- ./ci/plugins/mzcompose:
composition: feature-flag-consistency
Expand Down Expand Up @@ -1219,7 +1218,6 @@ steps:
timeout_in_minutes: 60
agents:
queue: hetzner-aarch64-4cpu-8gb
skip: "flaky until database-issues#8797 is fixed"
plugins:
- ./ci/plugins/mzcompose:
composition: sqlsmith
Expand Down
15 changes: 10 additions & 5 deletions src/transform/src/equivalence_propagation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,21 @@ impl crate::Transform for EquivalencePropagation {
&mut get_equivalences,
);

// Trace the plan as the result of `equivalence_propagation` before potentially applying
// `ColumnKnowledge`. (If `ColumnKnowledge` runs, it will trace its own result.)
mz_repr::explain::trace_plan(&*relation);

if prior == *relation {
let ck = crate::ColumnKnowledge::default();
ck.transform(relation, ctx)?;
mz_ore::soft_assert_or_log!(
prior == *relation,
"ColumnKnowledge performed work after EquivalencePropagation"
);
if prior != *relation {
tracing::error!(
?ctx.global_id,
"ColumnKnowledge performed work after EquivalencePropagation",
);
}
}

mz_repr::explain::trace_plan(&*relation);
Ok(())
}
}
Expand Down
Loading