uranusjr commented on code in PR #32883:
URL: https://github.com/apache/airflow/pull/32883#discussion_r1277175387
##########
airflow/models/variable.py:
##########
@@ -195,8 +195,7 @@ def update(
if Variable.get_variable_from_secrets(key=key) is None:
raise KeyError(f"Variable {key} does not exist")
-
- obj = session.query(Variable).filter(Variable.key == key).first()
+ obj = session.scalars(select(Variable).where(Variable.key ==
key)).first()
Review Comment:
```suggestion
obj = session.scalar(select(Variable).where(Variable.key == key))
```
Equivalent since `key` is unique.
##########
airflow/utils/scheduler_health.py:
##########
@@ -36,11 +38,11 @@ def do_GET(self):
try:
with create_session() as session:
scheduler_job = (
- session.query(Job)
+ session.scalars(select(Job))
.filter_by(job_type=SchedulerJobRunner.job_type)
.filter_by(hostname=get_hostname())
.order_by(Job.latest_heartbeat.desc())
- .first()
+ .limit(1)
)
Review Comment:
This change is wrong!
##########
airflow/www/security.py:
##########
@@ -578,22 +576,24 @@ def _get_all_non_dag_permissions(self) -> dict[tuple[str,
str], Permission]:
return {
(action_name, resource_name): viewmodel
for action_name, resource_name, viewmodel in (
- self.appbuilder.get_session.query(self.permission_model)
- .join(self.permission_model.action)
- .join(self.permission_model.resource)
-
.filter(~self.resource_model.name.like(f"{permissions.RESOURCE_DAG_PREFIX}%"))
- .with_entities(self.action_model.name,
self.resource_model.name, self.permission_model)
- .all()
+ self.appbuilder.get_session.execute(
+ select(self.action_model.name, self.resource_model.name,
self.permission_model)
+ .join(self.permission_model.action)
+ .join(self.permission_model.resource)
+
.where(~self.resource_model.name.like(f"{permissions.RESOURCE_DAG_PREFIX}%"))
+ ).all()
)
}
def _get_all_roles_with_permissions(self) -> dict[str, Role]:
"""Returns a dict with a key of role name and value of role with early
loaded permissions."""
return {
r.name: r
- for r in
self.appbuilder.get_session.query(self.role_model).options(
- joinedload(self.role_model.permissions)
+ for r in self.appbuilder.get_session.scalars(
+
select(self.role_model).options(joinedload(self.role_model.permissions))
)
+ .unique()
+ .all()
Review Comment:
```suggestion
```
##########
airflow/www/security.py:
##########
@@ -398,13 +395,16 @@ def get_accessible_dag_ids(
resource = permission.resource.name
if resource == permissions.RESOURCE_DAG:
- return {dag.dag_id for dag in
session.query(DagModel.dag_id)}
+ return {dag.dag_id for dag in
session.execute(select(DagModel.dag_id)).all()}
Review Comment:
```suggestion
return {dag.dag_id for dag in
session.execute(select(DagModel.dag_id))}
```
##########
airflow/operators/subdag.py:
##########
@@ -112,7 +113,9 @@ def _validate_pool(self, session):
conflicts = [t for t in self.subdag.tasks if t.pool == self.pool]
if conflicts:
# only query for pool conflicts if one may exist
- pool = session.query(Pool).filter(Pool.slots ==
1).filter(Pool.pool == self.pool).first()
+ pool = session.scalar(
+ select(Pool).where(Pool.slots == 1).where(Pool.pool ==
self.pool).limit(1)
+ )
Review Comment:
```suggestion
pool = session.scalar(select(Pool).where(Pool.slots ==
1).where(Pool.pool == self.pool))
```
Since `pool` is unique
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
