-
Notifications
You must be signed in to change notification settings - Fork 16.6k
[v3-1-test] Fix log task instance join (#59973)#60222
Merged
jscheffl merged 5 commits intoapache:v3-1-testfrom Jan 7, 2026
Merged
[v3-1-test] Fix log task instance join (#59973)#60222jscheffl merged 5 commits intoapache:v3-1-testfrom
jscheffl merged 5 commits intoapache:v3-1-testfrom
Conversation
Contributor
Manual backport of logic from #59973 to v3-1-test.
The automated backport (#60208) failed because v3-1-test doesn't support the SQLAlchemy 2.0 Mapped type hints used in main.
This PR:
- Applies the corrected join logic (dag_id, task_id, run_id, map_index).
- Removes incompatible
Mappedannotations in airflow/models/log.py to match the environment. - Flattens
primaryjoinstring for Ruff compatibility.
* Fix incorrect Log and TaskInstance join query
* Fix log task instance join foreign keys and remove stray newsfragment
* Remove unused task variable assignments in test_log_task_instance_join_correctness
* Fix CI failures and address reviewer comments: revert unrelated doc changes, clean up tests, add Mapped type hints to Log relationships, and run ruff formatting
* Restore newsfragment and fix missing import in log.py
* Fix reviewer feedback: add license, move imports, and fix newsfragments
* Fix ruff static check failure in log.py
* Flatten primaryjoin definition to fix formatting
* Fix newsfragments per review: restore 58337 and remove 59965
* Remove unused import in log.py
---------
(cherry picked from commit 91af86e)
Co-authored-by: Subham
Co-authored-by: Jason(Zhe-You) Liu <68415893+jason810496@users.noreply.github.com>
* Fix log task instance join foreign keys and remove stray newsfragment
* Remove unused task variable assignments in test_log_task_instance_join_correctness
* Fix CI failures and address reviewer comments: revert unrelated doc changes, clean up tests, add Mapped type hints to Log relationships, and run ruff formatting
* Restore newsfragment and fix missing import in log.py
* Fix reviewer feedback: add license, move imports, and fix newsfragments
* Fix ruff static check failure in log.py
* Flatten primaryjoin definition to fix formatting
* Fix newsfragments per review: restore 58337 and remove 59965
* Remove unused import in log.py
---------
(cherry picked from commit 91af86e)
Co-authored-by: Subham
Co-authored-by: Jason(Zhe-You) Liu <68415893+jason810496@users.noreply.github.com>
boring-cyborg
bot
added
area:production-image
Production image improvements and fixes
backport-to-v3-1-test
Mark PR with this label to backport to v3-1-test branch
labels
Jan 7, 2026
Subham-KRLX
requested review from
BasPH,
Fokko,
Lee-W,
amoghrajesh,
bbovenzi,
bolkedebruin,
bugraoz93,
dabla,
dstandish,
ephraimbuddy,
gopidesupavan,
guan404ming,
hussein-awala,
jason810496,
jedcunningham,
josh-fell,
jscheffl,
kaxil,
mobuchowski,
o-nikolas,
pierrejeambrun,
potiuk,
uranusjr and
vincbeck
as code owners
January 7, 2026 15:29
Subham-KRLX
requested review from
XD-DENG,
rawwar,
romsharon98,
ryanahamilton,
sekikn,
shahar1,
shubhamraj-git and
vatsrahul1001
as code owners
January 7, 2026 15:29
potiuk
changed the title
Fix backport v3 1 test
[v3-1-test] Fix log task instance join (#59973)
Jan 7, 2026
Contributor
Author
|
I have pushed a fix for the static check failure (unused import in log.py). |
potiuk
approved these changes
Jan 7, 2026
potiuk
reviewed
Jan 7, 2026
jscheffl
removed
the
backport-to-v3-1-test
Mark PR with this label to backport to v3-1-test branch
label
Jan 7, 2026
61 tasks
This file contains hidden or 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
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.