Skip to content

[SPARK-59034][INFRA] Use connect-rust-* fix versions in merge_connect_rust_pr.py - #60

Closed
HyukjinKwon wants to merge 1 commit into
apache:masterfrom
HyukjinKwon:gurwls223/fix-merge-script-connect-rust-fixversion
Closed

HyukjinKwon wants to merge 1 commit into
apache:masterfrom
HyukjinKwon:gurwls223/fix-merge-script-connect-rust-fixversion

Conversation

@HyukjinKwon

Copy link
Copy Markdown
Member

What changes were proposed in this pull request?

resolve_jira_issue in dev/merge_connect_rust_pr.py filtered the SPARK project versions to plain x.y.z names (re.match(r"\d+\.\d+\.\d+", ...)), which matches only the core Spark versions (4.2.0, 5.0.0, ...) and skips the connect-rust-* line. This changes the filter to match connect-rust-\d+\.\d+\.\d+ versions instead.

Why are the changes needed?

spark-connect-rust ships on its own connect-rust-* version line. With the old filter, the merge tool offered and set core Spark fix versions on spark-connect-rust JIRAs, which then leaked into the core Spark release notes. Matching the connect-rust-* versions keeps these JIRAs in the connect-rust release notes where they belong.

Does this PR introduce any user-facing change?

No. Committer-side merge tooling only.

How was this patch tested?

python3 -m py_compile dev/merge_connect_rust_pr.py. The regex was verified against the current SPARK project versions: it now selects connect-rust-0.1.0 and excludes the core x.y.z versions.

This pull request and its description were written by Isaac.

…_rust_pr.py

### What changes were proposed in this pull request?

`resolve_jira_issue` in `dev/merge_connect_rust_pr.py` filtered the SPARK
project versions to plain `x.y.z` names (`re.match(r"\d+\.\d+\.\d+", ...)`),
which matches only the core Spark versions (4.2.0, 5.0.0, ...) and skips the
`connect-rust-*` line. This makes it match `connect-rust-\d+\.\d+\.\d+`
versions instead.

### Why are the changes needed?

spark-connect-rust ships on its own `connect-rust-*` version line. With the old
filter the merge tool offered/set core Spark fix versions on spark-connect-rust
JIRAs, which then leaked into the core Spark release notes. Matching the
`connect-rust-*` versions keeps these JIRAs in the connect-rust release notes.

### Does this PR introduce _any_ user-facing change?

No. Committer-side merge tooling only.

### How was this patch tested?

`python3 -m py_compile dev/merge_connect_rust_pr.py`. The regex change was
verified against the current SPARK project versions: it now selects
`connect-rust-0.1.0` and excludes core `x.y.z` versions.

Co-authored-by: Isaac <no-reply@databricks.com>
@HyukjinKwon
HyukjinKwon deleted the gurwls223/fix-merge-script-connect-rust-fixversion branch September 7, 2026 22:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants