Skip to content

[AIRFLOW-5485] - scheduler_job: replace == None with is #7533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
saurabhdhupar wants to merge 2 commits into from
Closed

[AIRFLOW-5485] - scheduler_job: replace == None with is #7533

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ed5dbd
Replacing == with is
saurabhdhupar Feb 25, 2020
b4b1498
Replacing == with is
saurabhdhupar Feb 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions airflow/jobs/scheduler_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,7 +915,7 @@ class SchedulerJob(BaseJob):
}
heartrate = conf.getint('scheduler', 'SCHEDULER_HEARTBEAT_SEC')

def __init__(
def __init__(
Copy link
Contributor

@Fokko Fokko Feb 25, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this additional space will cause a lint error. Please revert this line.

self,
dag_id=None,
dag_ids=None,
Expand Down Expand Up @@ -1106,22 +1106,22 @@ def _find_executable_task_instances(self, simple_dag_bag, states, session=None):
DR,
and_(DR.dag_id == TI.dag_id, DR.execution_date == TI.execution_date)
)
.filter(or_(DR.run_id == None, # noqa: E711 pylint: disable=singleton-comparison
.filter(or_(DR.run_id.is_(None),
not_(DR.run_id.like(BackfillJob.ID_PREFIX + '%'))))
.outerjoin(DM, DM.dag_id == TI.dag_id)
.filter(or_(DM.dag_id == None, # noqa: E711 pylint: disable=singleton-comparison
.filter(or_(DM.dag_id.is_(None),
not_(DM.is_paused)))
)

# Additional filters on task instance state
if states:
if None in states:
if all(x is None for x in states):
ti_query = ti_query.filter(TI.state == None) # noqa pylint: disable=singleton-comparison
ti_query = ti_query.filter(TI.state.is_(None))
else:
not_none_states = [state for state in states if state]
ti_query = ti_query.filter(
or_(TI.state == None, # noqa: E711 pylint: disable=singleton-comparison
or_(TI.state.is_(None),
TI.state.in_(not_none_states))
)
else:
Expand Down Expand Up @@ -1291,11 +1291,11 @@ def _change_state_for_executable_task_instances(self, task_instances,
if acceptable_states:
if None in acceptable_states:
if all(x is None for x in acceptable_states):
ti_query = ti_query.filter(TI.state == None) # noqa pylint: disable=singleton-comparison
ti_query = ti_query.filter(TI.state.is_(None))
else:
not_none_acceptable_states = [state for state in acceptable_states if state]
ti_query = ti_query.filter(
or_(TI.state == None, # noqa pylint: disable=singleton-comparison
or_(TI.state.is_(None),
TI.state.in_(not_none_acceptable_states))
)
else:
Expand Down