Merge pull request #30765 from ggevay/eqprop-ck-tracing

Downgrade EQProp-ColumnKnowledge soft_assert

Author: ggevay

ci/nightly/pipeline.template.yml

@@ -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
@@ -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

src/transform/src/equivalence_propagation.rs

@@ -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(())
     }
 }