Skip to content

fix: broken main branch due to merge race in #21211#21243

Closed
zhuqi-lucas wants to merge 1 commit into
apache:mainfrom
zhuqi-lucas:fix/metric-type-dev
Closed

fix: broken main branch due to merge race in #21211#21243
zhuqi-lucas wants to merge 1 commit into
apache:mainfrom
zhuqi-lucas:fix/metric-type-dev

Conversation

@zhuqi-lucas

@zhuqi-lucas zhuqi-lucas commented Mar 30, 2026

Copy link
Copy Markdown
Contributor

Which issue does this PR close?

Fixes compilation error and SLT test failure on main branch.

Rationale for this change

PR #21211 (Add output skewness metric) was based on a version before #21160 renamed MetricType::DEV to MetricType::Dev. When both merged, main broke with a compilation error. Additionally, #21211 changed the scan_efficiency_ratio display precision (e.g. 22%22.13%), causing one SLT test to fail.

What changes are included in this PR?

  1. MetricType::DEVMetricType::Dev in baseline.rs (compilation fix)
  2. Update explain_analyze.slt expected output for scan_efficiency_ratio precision change

Are these changes safe?

Yes — fixes compilation error and test expectation, no behavior change.

Copilot AI review requested due to automatic review settings March 30, 2026 03:50
@github-actions github-actions Bot added the physical-expr Changes to the physical-expr crates label Mar 30, 2026
@zhuqi-lucas zhuqi-lucas requested a review from 2010YOUY01 March 30, 2026 03:51
@zhuqi-lucas zhuqi-lucas requested a review from Jefffrey March 30, 2026 03:51

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Fixes a compilation break caused by using the stale MetricType::DEV enum variant after it was renamed to MetricType::Dev.

Changes:

  • Update MetricType::DEVMetricType::Dev for the derived output_rows_skew metric in baseline metrics.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@zhuqi-lucas zhuqi-lucas force-pushed the fix/metric-type-dev branch from 86045b8 to 304b19d Compare March 30, 2026 04:04
@github-actions github-actions Bot added the sqllogictest SQL Logic Tests (.slt) label Mar 30, 2026
@zhuqi-lucas zhuqi-lucas changed the title fix: MetricType::DEV -> MetricType::Dev (compilation fix) fix: broken main branch due to merge race in #21211 Mar 30, 2026
@zhuqi-lucas

Copy link
Copy Markdown
Contributor Author

CI status: cargo test, extended_tests, and build test all pass. The only failure is sqlite test suite which reports "query is expected to fail, but actually succeed" — this is a pre-existing issue on main (likely from #21126 fixing duplicate column name support), unrelated to this fix. That requires updating the datafusion-testing submodule's expected failure list.

@zhuqi-lucas

Copy link
Copy Markdown
Contributor Author

Ok, it's duplicated with #21242

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

physical-expr Changes to the physical-expr crates sqllogictest SQL Logic Tests (.slt)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants