HyukjinKwon opened a new pull request, #86:
URL: https://github.com/apache/spark-connect-rust/pull/86
### What changes were proposed in this pull request?
Fix `dev/merge_connect_rust_pr.py` so it resolves the JIRA fix version for a
backport branch. It printed:
```
Target version for branch-4.2 is not found on JIRA, it may be archived or
not created. Skipping it.
```
even though `connect-rust-4.2.0` exists and is unreleased.
`resolve_jira_issue()` mapped a branch to a version with:
```python
if v.name.startswith(b.replace("branch-", "")):
```
For `branch-4.2` this checks whether the version name starts with `"4.2"`.
But spark-connect-rust versions are named `connect-rust-X.Y.Z` (e.g.
`connect-rust-4.2.0`), which start with `"connect-rust-"`, so the match was
always `False` and the fix version was skipped. The change matches the full
prefixed name:
```python
if v.name.startswith("connect-rust-%s." % b.replace("branch-", "")):
```
The trailing `.` prevents `branch-4.2` from matching `connect-rust-4.20.0`.
The downstream version dedup (`v.split(".")` / previous-minor) already works
with `connect-rust-*` names because the prefix contains no dots, so no other
change is needed.
### Why are the changes needed?
Without this, backporting a merged PR to `branch-4.2` silently drops the fix
version, so the JIRA is not tagged with the release it actually shipped in.
### Does this PR introduce _any_ user-facing change?
No — developer tooling only.
### How was this patch tested?
`python3 -m py_compile` passes, and the matching + dedup logic was
unit-tested against the real version names:
- `branch-4.2` → `connect-rust-4.2.0`
- `master` → `connect-rust-4.3.0`
- `master` + `branch-4.2` → `connect-rust-4.2.0` (release branch wins, per
the existing dedup)
- `branch-4.20` → `connect-rust-4.20.0` only (no false match with `4.2.x`)
This pull request and its description were written by Isaac.
--
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]
