andygrove commented on PR #4950: URL: https://github.com/apache/datafusion-comet/pull/4950#issuecomment-5781390273
Updated: merged current `main`, addressed the outstanding review feedback, and moved the 4.2 suite into the nightly tier. **Nightly instead of on demand.** @comphead / @sunchao, this reverses what the PR previously said. Leaving 4.2 on demand looked like the cautious choice, but the caution was aimed at the wrong risk. The tier a version sits in is not only a compute decision: a `dev/diffs` file is kept current as a *side effect* of its suite running, and 4.2's was updated only when someone asked for the suite. It still gates nothing -- a red nightly opens a `ci-nightly-failure` issue and blocks no merge -- and `run-spark-4.2-tests` still brings the run forward onto a pull request. **What the merge actually needed.** The merge was conflict-free and still wrong in two places, neither of which git can point at, because both are cases where this branch owns a thing that upstream commits extend on the sibling entries: - `FILTERS["spark_4_2"]` never got `.github/actions/maven-bootstrap/**`, which #5881 added to the other five Spark filters. `check-ci-config.py` fails on that, so preflight was red on the merge commit. - `dev/diffs/4.2.0.diff` had fallen seven commits behind `4.1.3.diff` (#5755, #5760, #5745, #5914, #5987, #5821, #6046). Resynced by applying it to a `v4.2.0` checkout, making the same source changes there and regenerating -- not hand-edited. That resync closes the three items I had deferred to #5569, which have since been fixed on main for 4.0/4.1, plus @rich7420's two points. Replies are on the individual threads. **Net effect on exclusions.** `ignoreList` in the 4.2 patch now has no Comet additions at all, so every `.sql` fixture runs in the `ENABLE_COMET=false` baseline. That is one better than `4.1.3.diff`, which still lists `thetasketch.sql` (#5571). **Verified.** `-Pspark-4.2` and the default profile both build main and test sources clean, scalastyle included; the diff applies with no rejects to a pristine `v4.2.0` worktree; `check-ci-config.py`, `check-suites.py`, `check-benchmark-runner.py`, `test-iceberg-shards.py`, `actionlint` and `prettier --check` all pass. Spark's own 4.2 suite I cannot run locally, so I have applied `run-spark-4.2-tests` -- the `Spark SQL Tests (Spark 4.2)` shards on this PR are the verdict on the resynced diff. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
