evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid selecting last_updated from the db when filtering on last_updated==last_changed (#70459)

Browse source
This commit is contained in:
J. Nick Koston 2022-04-25 08:46:37 -10:00 • committed by GitHub
parent 87dceaf238
commit 96d64bd6b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
homeassistant/components/recorder/history.py
View file

@ -58,11 +58,22 @@ BASE_STATES = [
States.last_changed,
States.last_updated,
]
BASE_STATES_NO_LAST_UPDATED = [
States.entity_id,
States.state,
States.last_changed,
literal(value=None, type_=Text).label("last_updated"),
]
QUERY_STATE_NO_ATTR = [
*BASE_STATES,
literal(value=None, type_=Text).label("attributes"),
literal(value=None, type_=Text).label("shared_attrs"),
]
QUERY_STATE_NO_ATTR_NO_LAST_UPDATED = [
*BASE_STATES_NO_LAST_UPDATED,
literal(value=None, type_=Text).label("attributes"),
literal(value=None, type_=Text).label("shared_attrs"),
]
# Remove QUERY_STATES_PRE_SCHEMA_25
# and the migration_in_progress check
# once schema 26 is created
@ -71,12 +82,23 @@ QUERY_STATES_PRE_SCHEMA_25 = [
States.attributes,
literal(value=None, type_=Text).label("shared_attrs"),
]
QUERY_STATES_PRE_SCHEMA_25_NO_LAST_UPDATED = [
*BASE_STATES_NO_LAST_UPDATED,
States.attributes,
literal(value=None, type_=Text).label("shared_attrs"),
]
QUERY_STATES = [
*BASE_STATES,
# Remove States.attributes once all attributes are in StateAttributes.shared_attrs
States.attributes,
StateAttributes.shared_attrs,
]
QUERY_STATES_NO_LAST_UPDATED = [
*BASE_STATES_NO_LAST_UPDATED,
# Remove States.attributes once all attributes are in StateAttributes.shared_attrs
States.attributes,
StateAttributes.shared_attrs,
]
HISTORY_BAKERY = "recorder_history_bakery"
@ -102,7 +124,7 @@ def query_and_join_attributes(
def bake_query_and_join_attributes(
hass: HomeAssistant, no_attributes: bool
hass: HomeAssistant, no_attributes: bool, include_last_updated: bool = True
) -> tuple[Any, bool]:
"""Return the initial backed query and if StateAttributes should be joined.
@ -114,16 +136,35 @@ def bake_query_and_join_attributes(
# without the attributes fields and do not join the
# state_attributes table
if no_attributes:
return bakery(lambda session: session.query(*QUERY_STATE_NO_ATTR)), False
if include_last_updated:
return bakery(lambda session: session.query(*QUERY_STATE_NO_ATTR)), False
return (
bakery(lambda session: session.query(*QUERY_STATE_NO_ATTR_NO_LAST_UPDATED)),
False,
)
# If we in the process of migrating schema we do
# not want to join the state_attributes table as we
# do not know if it will be there yet
if recorder.get_instance(hass).migration_in_progress:
return bakery(lambda session: session.query(*QUERY_STATES_PRE_SCHEMA_25)), False
if include_last_updated:
return (
bakery(lambda session: session.query(*QUERY_STATES_PRE_SCHEMA_25)),
False,
)
return (
bakery(
lambda session: session.query(
*QUERY_STATES_PRE_SCHEMA_25_NO_LAST_UPDATED
)
),
False,
)
# Finally if no migration is in progress and no_attributes
# was not requested, we query both attributes columns and
# join state_attributes
return bakery(lambda session: session.query(*QUERY_STATES)), True
if include_last_updated:
return bakery(lambda session: session.query(*QUERY_STATES)), True
return bakery(lambda session: session.query(*QUERY_STATES_NO_LAST_UPDATED)), True
def async_setup(hass: HomeAssistant) -> None:
@ -179,6 +220,9 @@ def _query_significant_states_with_session(
significant_changes_only
and split_entity_id(entity_ids[0])[0] not in SIGNIFICANT_DOMAINS
):
baked_query, join_attributes = bake_query_and_join_attributes(
hass, no_attributes, include_last_updated=False
)
baked_query += lambda q: q.filter(
States.last_changed == States.last_updated
)
@ -321,7 +365,7 @@ def state_changes_during_period(
"""Return states changes during UTC period start_time - end_time."""
with session_scope(hass=hass) as session:
baked_query, join_attributes = bake_query_and_join_attributes(
hass, no_attributes
hass, no_attributes, include_last_updated=False
)
baked_query += lambda q: q.filter(
@ -384,7 +428,9 @@ def get_last_state_changes(
start_time = dt_util.utcnow()
with session_scope(hass=hass) as session:
baked_query, join_attributes = bake_query_and_join_attributes(hass, False)
baked_query, join_attributes = bake_query_and_join_attributes(
hass, False, include_last_updated=False
)
baked_query += lambda q: q.filter(States.last_changed == States.last_updated)

10
homeassistant/components/recorder/models.py
View file

@ -619,7 +619,10 @@ class LazyState(State):
def last_updated(self) -> datetime: # type: ignore[override]
"""Last updated datetime."""
if self._last_updated is None:
self._last_updated = process_timestamp(self._row.last_updated)
if (last_updated := self._row.last_updated) is not None:
self._last_updated = process_timestamp(last_updated)
else:
self._last_updated = self.last_changed
return self._last_updated
@last_updated.setter
@ -638,7 +641,10 @@ class LazyState(State):
last_changed_isoformat = process_timestamp_to_utc_isoformat(
self._row.last_changed
)
if self._row.last_changed == self._row.last_updated:
if (
self._row.last_updated is None
or self._row.last_changed == self._row.last_updated
):
last_updated_isoformat = last_changed_isoformat
else:
last_updated_isoformat = process_timestamp_to_utc_isoformat(