Fix matching on multiple properties and profiles #101
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
|
I found problems with this solution when querying using wildcards (e.g. match --LINEAGE "B.1%"). Will reopen this when I find a solution. |
| @@ -2442,15 +2441,18 @@ def create_profile_cases( | |||
| if match: | |||
| case, val = processing_funcs[mutation_type](match) | |||
| cases.append( | |||
| f"CASE WHEN {' AND '.join(case)} THEN 1 ELSE 0 END AS mutation_{ids[mutation]}" | |||
| f"SUM(CASE WHEN {' AND '.join(case)} THEN 1 ELSE 0 END) AS mutation_{ids[mutation]}" | |||
There was a problem hiding this comment.
Why SUM? I think this is nor necessary. If the conditions are met we assign 1 else we assign 0. Makes the comparsion easier
| @@ -2551,7 +2553,7 @@ def create_sample_selection_sql( | |||
|
|
|||
| if conditions: | |||
| conditions = " AND ".join(conditions) | |||
| sql += f" WHERE {conditions}" | |||
| sql += f" GROUP BY s.id HAVING {conditions}" | |||
There was a problem hiding this comment.
Is GROUP BY really necessary since it would be very bad for performance.
…es and profiles, including negation
matthuska
force-pushed
the
fix/match-multi-prop
branch
from
9b21371
to
383c6b4
Compare
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.
Previously there would always be no matches returned when you query for > 1 property. I suspect the same would be the case if you searched for > 1 profile as well, or mixtures of the two. This fix was tested with multiple properties and profiles, as well as negation.
I don't love the
if count == 0stuff, if you want to rewrite that in a more elegant way then feel free.