[SPARK-59078][INFRA] Fix master build broken by a SPARK-59075/59076 semantic conflict - #80
Closed
HyukjinKwon wants to merge 1 commit into
Closed
[SPARK-59078][INFRA] Fix master build broken by a SPARK-59075/59076 semantic conflict#80HyukjinKwon wants to merge 1 commit into
HyukjinKwon wants to merge 1 commit into
Conversation
…emantic conflict `cargo test -p apache-spark-connect` fails to compile on master with: error[E0599]: no method named `set_metrics` found for struct `Observation` error[E0599]: no method named `set_dataframe` found for struct `Observation` breaking Rust build and test, Rust checks, WASM UDF feature, and Coverage. This is a semantic merge conflict between two PRs that were each green alone: - SPARK-59075 added an inline test in observation.rs calling the `pub(crate)` `Observation::set_metrics` / `set_dataframe` methods (which existed at its base); - SPARK-59076 removed those two methods as unused dead code (no production callers). Merged together, the test references methods that no longer exist. Drop the obsolete `set_metrics_and_dataframe` test. Re-adding the methods would be wrong: they are dead code with no callers, so they would reintroduce the `dead_code` warning that SPARK-59076's `deny(warnings)` now rejects. Co-authored-by: Isaac <no-reply@databricks.com>
Member
Author
|
I am going to merge this to recover CI |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
cargo test -p apache-spark-connectcurrently fails to compile onmaster, breakingRust build and test,Rust checks,WASM UDF feature, and theCoveragejob:This is a semantic merge conflict between two PRs that were each green in isolation:
#[cfg(test)]test inobservation.rsthat calls thepub(crate)methodsObservation::set_metrics/set_dataframe(which existed at its base).Merged together, the test references methods that no longer exist. This drops the obsolete
set_metrics_and_dataframetest.Re-adding the methods would be the wrong fix: they are dead code with no callers, so they would reintroduce the
dead_codewarning that SPARK-59076'sdeny(warnings)now rejects.I confirmed
set_metrics/set_dataframeare the only symbols SPARK-59076 removed (so this is the sole break), and that no other reference to them remains in the tree.Why are the changes needed?
masterdoes not compile its test targets; CI is red across multiple jobs.Does this PR introduce any user-facing change?
No. Removes a stale unit test only.
How was this patch tested?
cargo fmt --all --checkpasses. The removed test was the only compile error reported by the failing job, andgit grepconfirms no remaining references to the removed methods; CI on this PR verifies the build is green again.Was this patch authored or co-authored using generative AI tooling?
Generated-by: Claude Code