Skip to content

Commit eeb203e

Browse files
Update SerializedDagModel query to fetch DagVersion with joinedload (#56422)
1 parent ec49e82 commit eeb203e

1 file changed

Lines changed: 11 additions & 4 deletions

File tree

‎airflow-core/src/airflow/models/serialized_dag.py‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import uuid6
3030
from sqlalchemy import ForeignKey, LargeBinary, String, select, tuple_
3131
from sqlalchemy.dialects.postgresql import JSONB
32-
from sqlalchemy.orm import Mapped, backref, foreign, relationship
32+
from sqlalchemy.orm import Mapped, backref, foreign, joinedload, relationship
3333
from sqlalchemy.sql.expression import func, literal
3434
from sqlalchemy_utils import UUIDType
3535

@@ -414,7 +414,14 @@ def write_dag(
414414
serialized_dag_hash = session.scalars(
415415
select(cls.dag_hash).where(cls.dag_id == dag.dag_id).order_by(cls.created_at.desc())
416416
).first()
417-
dag_version = DagVersion.get_latest_version(dag.dag_id, session=session)
417+
dag_version = session.scalar(
418+
select(DagVersion)
419+
.where(DagVersion.dag_id == dag.dag_id)
420+
.options(joinedload(DagVersion.task_instances))
421+
.options(joinedload(DagVersion.serialized_dag))
422+
.order_by(DagVersion.created_at.desc())
423+
.limit(1)
424+
)
418425

419426
if (
420427
serialized_dag_hash == new_serialized_dag.dag_hash
@@ -429,8 +436,8 @@ def write_dag(
429436
# the serialized dag, the dag_version and the dag_code instead of a new version
430437
# if the dag_version is not associated with any task instances
431438
latest_ser_dag = cls.get(dag.dag_id, session=session)
432-
if TYPE_CHECKING:
433-
assert latest_ser_dag is not None
439+
if not latest_ser_dag:
440+
return False
434441
# Update the serialized DAG with the new_serialized_dag
435442
latest_ser_dag._data = new_serialized_dag._data
436443
latest_ser_dag._data_compressed = new_serialized_dag._data_compressed

0 commit comments

Comments
 (0)