[batch] Avoid computing billing project cost when not needed #13210
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
daniel-goldstein
previously requested changes
Jun 23, 2023
daniel-goldstein
previously requested changes
Jun 23, 2023
batch/batch/utils.py
Outdated
| args.append(user) | ||
|
|
||
| if billing_project: | ||
| where_conditions.append('billing_projects.name_cs = %s') | ||
| conditions.append('billing_projects.name_cs = %s') | ||
| args.append(billing_project) |
There was a problem hiding this comment.
While this deduplicates some code, it also fragments the query, and I can't really understand what this function is doing unless I look at where it's used (where does this users json come from?). I think it's worth sacrificing the duplication to put this code in place in the functions that call this one instead of having this function.
batch/batch/utils.py
Outdated
| else: | ||
| record['users'] = json.loads(record['users']) | ||
| return record | ||
| billing_projects = [users_record_to_dict(record) async for record in db.execute_and_fetchall(sql, tuple(args))] |
There was a problem hiding this comment.
This isn't new in this PR so feel free to take or leave this critique, but I personally find functions that both mutate inputs hard to reason about, as I would expect a void function to mutate and a function with a return value to leave its inputs alone. I might prefer to write this the following way:
billing_projects = []
async for record in db.execute_and_fetchall(sql, tuple(args)):
record['users'] = json.loads(record['users']) if record['users'] is not None else []
billing_projects.append(record)
daniel-goldstein
approved these changes
Jun 26, 2023
jigold
force-pushed
the
snappier-billing-query
branch
from
9c6a890
to
1ceb70c
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.
No description provided.