Fixes MSPileup GET Filter Parsing #11886
Merged
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
|
Jenkins results:
|
amaltaro
reviewed
Feb 5, 2024
| for key in kwargs.get('filters', []): | ||
| projection[key] = 1 | ||
| filters = kwargs.get('filters', []) | ||
| if type(filters) == str: |
There was a problem hiding this comment.
Dennis, I would suggest the following variation to this code (but the result would be the same):
filters = kwargs.get('filters', [])
if isinstance(filters, str):
filters = [filters]
for key in kwargs.get('filters', []):
# filter out empty strings
etc etc
|
Jenkins results:
|
d-ylee
force-pushed
the
11882-incorrect-parsing-and-handling-of-mspileup-get-parameters
branch
from
f2ecd90
to
94a7c82
Compare
|
Jenkins results:
|
d-ylee
force-pushed
the
11882-incorrect-parsing-and-handling-of-mspileup-get-parameters
branch
from
94a7c82
to
2ee1323
Compare
|
Jenkins results:
|
amaltaro
reviewed
Feb 6, 2024
There was a problem hiding this comment.
@d-ylee Dennis, even though you haven't asked for another review, I went ahead and looked at this code. If you did want to have another review, please always go through the GitHub "Request review" interface.
Changes are looking good to me, however I did leave 2 minor questions/suggestions. Thanks
| @@ -12,7 +12,7 @@ | |||
| from WMCore.MicroService.MSCore.MSCore import MSCore | |||
| from WMCore.MicroService.DataStructs.DefaultStructs import PILEUP_REPORT | |||
| from WMCore.MicroService.MSPileup.MSPileupData import MSPileupData | |||
| from WMCore.MicroService.MSPileup.MSPileupError import MSPileupNoKeyFoundError | |||
| # from WMCore.MicroService.MSPileup.MSPileupError import MSPileupNoKeyFoundError | |||
There was a problem hiding this comment.
If it is not used, feel free to completely remove it.
| @@ -27,7 +27,8 @@ def __init__(self, msConfig, **kwargs): | |||
| # Get the RSE expression for Disk RSEs from the configuration | |||
| self.diskRSEExpr = msConfig.get("rucioDiskExpression", "") | |||
|
|
|||
| def status(self): | |||
| @staticmethod | |||
| def status(): | |||
There was a problem hiding this comment.
Just for my education, I guess you made this change just because this method does not depend on any of the object data, right? Is there any other motivation/benefit that I might be missing?
There was a problem hiding this comment.
I believe so. I changed this because it came up in Pylint.
Converts single filter to list instead of a str Skip empty string filters Removed unused import
Fixed pylint warnings
d-ylee
force-pushed
the
11882-incorrect-parsing-and-handling-of-mspileup-get-parameters
branch
from
2ee1323
to
a8e0b18
Compare
|
Jenkins results:
|
amaltaro
approved these changes
Feb 6, 2024
d-ylee
deleted the
11882-incorrect-parsing-and-handling-of-mspileup-get-parameters
branch
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.
Fixes #11882
Status
Ready
Description
Checks to see if a filter is a string (one filters provided) and sets it to the projection dictionary. Ignores any empty strings as a filter.
Is it backward compatible (if not, which system it affects?)
Yes
Related PRs
Discovered during #11870
External dependencies / deployment changes
No