func.sum may returns Decimal that break rest APIs.
#15585
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
suiting-young
requested review from
ashb,
kaxil,
turbaszek and
XD-DENG
as code owners
uranusjr
reviewed
Apr 29, 2021
airflow/models/pool.py
Outdated
| session.query(func.sum(TaskInstance.pool_slots)) | ||
| .filter(TaskInstance.pool == self.pool) | ||
| .filter(TaskInstance.state.in_(list(EXECUTION_STATES))) | ||
| .scalar() | ||
| ) or 0 | ||
| ) or 0) |
There was a problem hiding this comment.
0 does not need to be converted, so I’d just cast the query part:
return int(
session.query(func.sum(TaskInstance.pool_slots))
.filter(TaskInstance.pool == self.pool)
.filter(TaskInstance.state.in_(list(EXECUTION_STATES)))
.scalar()
) or 0There was a problem hiding this comment.
@uranusjr I tried this first, but failed, when filter matched nothing, it returns None 😭
There was a problem hiding this comment.
Per MySQL doc:
If there are no matching rows, SUM() returns NULL.
suiting-young
force-pushed
the
api-pools-decimal
branch
from
c4fdf77
to
8eaa24d
Compare
|
Hi @suiting-young , the change makes sense to me. Please fix the static check errors. Thanks |
Which will break APIs for JSON serialization.
suiting-young
force-pushed
the
api-pools-decimal
branch
from
8eaa24d
to
fcc3162
Compare
kaxil
reviewed
Apr 29, 2021
kaxil
approved these changes
Apr 29, 2021
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.
sqlalchemy.func.sumhas a known "issue" that it may returnsDecimalvalue (in my case MySQL 5.7).This will cause problem when calling rest APIs. E.g.
@ashb and @kaxil please have a review, thanks!