Use selectinload in trigger (apache#40487) (apache#42351)

(cherry picked from commit 46b41e3) Co-authored-by: Joseph Ang <[email protected]>
aws-mwaa · Sep 19, 2024 · 8932610 · 8932610
1 parent 26f7365
commit 8932610
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/airflow/models/trigger.py b/airflow/models/trigger.py
@@ -21,7 +21,7 @@
 from typing import TYPE_CHECKING, Any, Iterable
 
 from sqlalchemy import Column, Integer, String, Text, delete, func, or_, select, update
-from sqlalchemy.orm import joinedload, relationship
+from sqlalchemy.orm import relationship, selectinload
 from sqlalchemy.sql.functions import coalesce
 
 from airflow.api_internal.internal_api_call import internal_api_call
@@ -75,7 +75,7 @@ class Trigger(Base):
         uselist=False,
     )
 
-    task_instance = relationship("TaskInstance", back_populates="trigger", lazy="joined", uselist=False)
+    task_instance = relationship("TaskInstance", back_populates="trigger", lazy="selectin", uselist=False)
 
     def __init__(
         self,
@@ -152,7 +152,7 @@ def bulk_fetch(cls, ids: Iterable[int], session: Session = NEW_SESSION) -> dict[
             select(cls)
             .where(cls.id.in_(ids))
             .options(
-                joinedload(cls.task_instance)
+                selectinload(cls.task_instance)
                 .joinedload(TaskInstance.trigger)
                 .joinedload(Trigger.triggerer_job)
             )

diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
@@ -1439,6 +1439,7 @@ Seedlist
 seedlist
 seekable
 segmentGranularity
+selectin
 Sendgrid
 sendgrid
 sentimentMax