You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "yaooqinn (via GitHub)" <gi...@apache.org> on 2023/08/10 10:40:59 UTC
[GitHub] [spark] yaooqinn opened a new pull request, #42429: [SPARK-44760][INFRA] Fix list index out of range for JIRA resolution in merge_spark_pr
yaooqinn opened a new pull request, #42429:
URL: https://github.com/apache/spark/pull/42429
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'core/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
This PR fixes list index out-of-range error for the merge_spark_pr script
The error occurs when the branch we merge into does not have a jira project version.
```python
>>> versions = sorted(versions, key=lambda x: x.name, reverse=True)
>>> versions
[<JIRA Version: name='4.0.0', id='12353359'>, <JIRA Version: name='3.5.1', id='12353495'>, <JIRA Version: name='3.5.0', id='12352848'>, <JIRA Version: name='3.4.2', id='12353368'>, <JIRA Version: name='3.3.4', id='12353505'>, <JIRA Version: name='3.3.3', id='12352932'>]
>>> list(filter(lambda x: x.name.startswith(""), versions))[-1]
<JIRA Version: name='3.3.3', id='12352932'>
>>> list(filter(lambda x: x.name.startswith("3.2"), versions))[-1]
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
IndexError: list index out of range
```
Unlike other archived branches or versions, v3.2.5 is missing from our JIRA. This crushes the merging scripts during JIRA resolution if branch-3.2 is chosen.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
happy merging
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
no, infra only change
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
manually tested
```python
>>> default_fix_versions = []
>>> for b in merge_branches:
... if b == "master":
... default_fix_versions.append(versions[0])
... else:
... found = False
... for v in versions:
... if v.name.startswith(b.replace("branch-", "")):
... default_fix_versions.append(v)
... found = True
... if not found:
... print(
... "Target version for %s is not found on JIRA, it may be archived or "
... "not created. Skipping it." % b)
...
Target version for branch-3.2 is not found on JIRA, it may be archived or not created. Skipping it.
>>> default_fix_versions
[<JIRA Version: name='4.0.0', id='12353359'>, <JIRA Version: name='3.5.0', id='12352848'>, <JIRA Version: name='3.5.1', id='12353495'>, <JIRA Version: name='3.4.2', id='12353368'>, <JIRA Version: name='3.3.3', id='12352932'>, <JIRA Version: name='3.3.4', id='12353505'>]
>>> quit
```
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn commented on pull request #42429: [SPARK-44760][INFRA] Fix list index out of range for JIRA resolution in merge_spark_pr
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on PR #42429:
URL: https://github.com/apache/spark/pull/42429#issuecomment-1674310759
Merged https://github.com/apache/spark/pull/42407, https://github.com/apache/spark/pull/42404, https://github.com/apache/spark/pull/42442 by last updated script. It shall be fine now
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn commented on pull request #42429: [SPARK-44760][INFRA] Fix list index out of range for JIRA resolution in merge_spark_pr
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on PR #42429:
URL: https://github.com/apache/spark/pull/42429#issuecomment-1672983616
cc @dongjoon-hyun @cloud-fan @HyukjinKwon, thanks
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] dongjoon-hyun commented on pull request #42429: [SPARK-44760][INFRA] Fix list index out of range for JIRA resolution in merge_spark_pr
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on PR #42429:
URL: https://github.com/apache/spark/pull/42429#issuecomment-1673409550
Merged to master. Thank you all.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn commented on pull request #42429: [SPARK-44760][INFRA] Fix list index out of range for JIRA resolution in merge_spark_pr
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on PR #42429:
URL: https://github.com/apache/spark/pull/42429#issuecomment-1674529187
Merged to master, thanks @zhengruifeng @dongjoon-hyun @cloud-fan @HyukjinKwon
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] HyukjinKwon commented on a diff in pull request #42429: [SPARK-44760][INFRA] Fix list index out of range for JIRA resolution in merge_spark_pr
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on code in PR #42429:
URL: https://github.com/apache/spark/pull/42429#discussion_r1290833694
##########
dev/merge_spark_pr.py:
##########
@@ -280,14 +271,30 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""):
)
versions = asf_jira.project_versions("SPARK")
+ # Consider only x.y.z, unreleased, unarchived versions
+ versions = [
+ x
+ for x in versions
+ if not x.raw["released"] and not x.raw["archived"] and re.match(r"\d+\.\d+\.\d+", x.name)
+ ]
versions = sorted(versions, key=lambda x: x.name, reverse=True)
- versions = list(filter(lambda x: x.raw["released"] is False, versions))
- # Consider only x.y.z versions
- versions = list(filter(lambda x: re.match(r"\d+\.\d+\.\d+", x.name), versions))
- default_fix_versions = list(
- map(lambda x: fix_version_from_branch(x, versions).name, merge_branches)
- )
+ default_fix_versions = []
Review Comment:
Actually seems this breaks the script:
```
Traceback (most recent call last):
File "/usr/local/lib/python3.9/site-packages/jira/resources.py", line 222, in __getattr__
return self[item] # type: ignore
TypeError: 'Version' object is not subscriptable
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/.../spark/./dev/merge_spark_pr.py", line 606, in <module>
main()
File "/.../spark/./dev/merge_spark_pr.py", line 590, in main
resolve_jira_issues(title, merged_refs, jira_comment)
File "/.../spark/./dev/merge_spark_pr.py", line 397, in resolve_jira_issues
resolve_jira_issue(merge_branches, comment, jira_id)
File "/.../spark/./dev/merge_spark_pr.py", line 303, in resolve_jira_issue
(major, minor, patch) = v.split(".")
File "/usr/local/lib/python3.9/site-packages/jira/resources.py", line 227, in __getattr__
raise AttributeError(
AttributeError: <class 'jira.resources.Version'> object has no attribute 'split' ('Version' object is not subscriptable)
```
The reason seems that `default_fix_versions` has to be `Version` instance, and you should get the version from it via `.name`.
I am reverting this for now.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] dongjoon-hyun commented on a diff in pull request #42429: [SPARK-44760][INFRA] Fix list index out of range for JIRA resolution in merge_spark_pr
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #42429:
URL: https://github.com/apache/spark/pull/42429#discussion_r1290845322
##########
dev/merge_spark_pr.py:
##########
@@ -280,14 +271,30 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""):
)
versions = asf_jira.project_versions("SPARK")
+ # Consider only x.y.z, unreleased, unarchived versions
+ versions = [
+ x
+ for x in versions
+ if not x.raw["released"] and not x.raw["archived"] and re.match(r"\d+\.\d+\.\d+", x.name)
+ ]
versions = sorted(versions, key=lambda x: x.name, reverse=True)
- versions = list(filter(lambda x: x.raw["released"] is False, versions))
- # Consider only x.y.z versions
- versions = list(filter(lambda x: re.match(r"\d+\.\d+\.\d+", x.name), versions))
- default_fix_versions = list(
- map(lambda x: fix_version_from_branch(x, versions).name, merge_branches)
- )
+ default_fix_versions = []
Review Comment:
Oh, ya, it's my bad. Sorry for the trouble, @HyukjinKwon and @cloud-fan .
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #42429: [SPARK-44760][INFRA] Fix list index out of range for JIRA resolution in merge_spark_pr
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #42429:
URL: https://github.com/apache/spark/pull/42429#discussion_r1290835309
##########
dev/merge_spark_pr.py:
##########
@@ -280,14 +271,30 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""):
)
versions = asf_jira.project_versions("SPARK")
+ # Consider only x.y.z, unreleased, unarchived versions
+ versions = [
+ x
+ for x in versions
+ if not x.raw["released"] and not x.raw["archived"] and re.match(r"\d+\.\d+\.\d+", x.name)
+ ]
versions = sorted(versions, key=lambda x: x.name, reverse=True)
- versions = list(filter(lambda x: x.raw["released"] is False, versions))
- # Consider only x.y.z versions
- versions = list(filter(lambda x: re.match(r"\d+\.\d+\.\d+", x.name), versions))
- default_fix_versions = list(
- map(lambda x: fix_version_from_branch(x, versions).name, merge_branches)
- )
+ default_fix_versions = []
Review Comment:
Next time please use the updated merge script to merge the merge script update PR...
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] dongjoon-hyun closed pull request #42429: [SPARK-44760][INFRA] Fix list index out of range for JIRA resolution in merge_spark_pr
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun closed pull request #42429: [SPARK-44760][INFRA] Fix list index out of range for JIRA resolution in merge_spark_pr
URL: https://github.com/apache/spark/pull/42429
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn commented on a diff in pull request #42429: [SPARK-44760][INFRA] Fix list index out of range for JIRA resolution in merge_spark_pr
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on code in PR #42429:
URL: https://github.com/apache/spark/pull/42429#discussion_r1290954395
##########
dev/merge_spark_pr.py:
##########
@@ -280,14 +271,30 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""):
)
versions = asf_jira.project_versions("SPARK")
+ # Consider only x.y.z, unreleased, unarchived versions
+ versions = [
+ x
+ for x in versions
+ if not x.raw["released"] and not x.raw["archived"] and re.match(r"\d+\.\d+\.\d+", x.name)
+ ]
versions = sorted(versions, key=lambda x: x.name, reverse=True)
- versions = list(filter(lambda x: x.raw["released"] is False, versions))
- # Consider only x.y.z versions
- versions = list(filter(lambda x: re.match(r"\d+\.\d+\.\d+", x.name), versions))
- default_fix_versions = list(
- map(lambda x: fix_version_from_branch(x, versions).name, merge_branches)
- )
+ default_fix_versions = []
Review Comment:
This should be my fault, I didn't validate the code below sufficiently.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn commented on pull request #42429: [SPARK-44760][INFRA] Fix list index out of range for JIRA resolution in merge_spark_pr
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on PR #42429:
URL: https://github.com/apache/spark/pull/42429#issuecomment-1673042032
Thank you for the reminder, @zhengruifeng.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn closed pull request #42429: [SPARK-44760][INFRA] Fix list index out of range for JIRA resolution in merge_spark_pr
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn closed pull request #42429: [SPARK-44760][INFRA] Fix list index out of range for JIRA resolution in merge_spark_pr
URL: https://github.com/apache/spark/pull/42429
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] zhengruifeng commented on pull request #42429: [SPARK-44760][INFRA] Fix list index out of range for JIRA resolution in merge_spark_pr
Posted by "zhengruifeng (via GitHub)" <gi...@apache.org>.
zhengruifeng commented on PR #42429:
URL: https://github.com/apache/spark/pull/42429#issuecomment-1673032414
ah, need to fix the lint by `dev/reformat-python`
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org