fixed #12664 - donate-cpu-server.py: omit outdated results from diff reports #6349
Conversation
This file contains 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
firewave
commented
Apr 26, 2024
| @@ -422,7 +422,7 @@ def diffReport(resultsPath: str) -> str: | |||
| for messageId in data['sums']: | |||
| sums = data['sums'][messageId] | |||
| if OLD_VERSION not in sums: | |||
| continue | |||
| break | |||
There was a problem hiding this comment.
We can just bail out on the first occurrence of an old version because if one entry is outdated all of them are.
firewave
commented
Apr 26, 2024
| @@ -490,9 +490,12 @@ def diffMessageIdReport(resultPath: str, messageId: str) -> str: | |||
| if not os.path.isfile(filename): | |||
| continue | |||
| with open(filename, 'rt') as f: | |||
| diff_stats = f.read() | |||
| if messageId not in diff_stats: | |||
There was a problem hiding this comment.
This always checked the whole string for the occurrence. This might speed up things a bit if there was a lot of findings - unless it is offset by the added JSON loading.
firewave
commented
Apr 26, 2024
tools/donate-cpu-server.py
Outdated
| diff_stats = json.loads(f.read()) | ||
| if messageId not in diff_stats['sums']: | ||
| continue | ||
| if OLD_VERSION not in diff_stats['sums'][messageId]: | ||
| continue | ||
| if today not in diff_stats: |
There was a problem hiding this comment.
This breaks the report and it is no longer a string but an object. Will fix.
There was a problem hiding this comment.
I have fixed this but cannot test it right now because because requests to daca somehow do not work right now (I have no idea why - restarting it didn't help) and I cannot find a message ID to test it with.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.