feng-tao closed pull request #4395: [AIRFLOW-3587] Remove unnecessary condition checks in dag_stats & task_stats URL: https://github.com/apache/incubator-airflow/pull/4395
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/airflow/www_rbac/views.py b/airflow/www_rbac/views.py index 42328279a3..1ca68368a9 100644 --- a/airflow/www_rbac/views.py +++ b/airflow/www_rbac/views.py @@ -297,16 +297,15 @@ def dag_stats(self, session=None): filter_dag_ids = [dag_id for dag_id, in session.query(models.DagModel.dag_id)] for dag_id in filter_dag_ids: - if 'all_dags' in filter_dag_ids or dag_id in filter_dag_ids: - payload[dag_id] = [] - for state in State.dag_states: - count = data.get(dag_id, {}).get(state, 0) - payload[dag_id].append({ - 'state': state, - 'count': count, - 'dag_id': dag_id, - 'color': State.color(state) - }) + payload[dag_id] = [] + for state in State.dag_states: + count = data.get(dag_id, {}).get(state, 0) + payload[dag_id].append({ + 'state': state, + 'count': count, + 'dag_id': dag_id, + 'color': State.color(state) + }) return wwwutils.json_response(payload) @expose('/task_stats') @@ -373,16 +372,15 @@ def task_stats(self, session=None): if 'all_dags' in filter_dag_ids: filter_dag_ids = [dag_id for dag_id, in session.query(models.DagModel.dag_id)] for dag_id in filter_dag_ids: - if 'all_dags' in filter_dag_ids or dag_id in filter_dag_ids: - payload[dag_id] = [] - for state in State.task_states: - count = data.get(dag_id, {}).get(state, 0) - payload[dag_id].append({ - 'state': state, - 'count': count, - 'dag_id': dag_id, - 'color': State.color(state) - }) + payload[dag_id] = [] + for state in State.task_states: + count = data.get(dag_id, {}).get(state, 0) + payload[dag_id].append({ + 'state': state, + 'count': count, + 'dag_id': dag_id, + 'color': State.color(state) + }) return wwwutils.json_response(payload) @expose('/code') ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services