Improve isoformat timestamp performance (#36991)

* adj

* time_fired_isoformat

* remove unused code

* tests for processing timestamps

* restore missing import lost in merge conflict

* test for None case
This commit is contained in:
J. Nick Koston authored and GitHub committed 2020-06-22 12:06:02 -05:00
1 parent 5446641f09
commit 53a91ece4e
5 files changed
+125 -13

No files matched your search

+8 -4
View File
@@ -13,7 +13,11 @@ import voluptuous as vol
from homeassistant.components import recorder
from homeassistant.components.http import HomeAssistantView
from homeassistant.components.recorder.models import States, process_timestamp
from homeassistant.components.recorder.models import (
States,
process_timestamp,
process_timestamp_to_utc_isoformat,
)
from homeassistant.components.recorder.util import execute, session_scope
from homeassistant.const import (
ATTR_HIDDEN,
@@ -318,7 +322,7 @@ def _sorted_states_to_json(
# Called in a tight loop so cache the function
# here
_process_timestamp = process_timestamp
_process_timestamp_to_utc_isoformat = process_timestamp_to_utc_isoformat
# Append all changes to it
for ent_id, group in groupby(states, lambda state: state.entity_id):
@@ -362,9 +366,9 @@ def _sorted_states_to_json(
ent_results.append(
{
STATE_KEY: db_state.state,
LAST_CHANGED_KEY: _process_timestamp(
LAST_CHANGED_KEY: _process_timestamp_to_utc_isoformat(
db_state.last_changed
).isoformat(),
),
}
)
prev_state = db_state
+25 -6
View File
@@ -11,7 +11,12 @@ import voluptuous as vol
from homeassistant.components import sun
from homeassistant.components.http import HomeAssistantView
from homeassistant.components.recorder.models import Events, States, process_timestamp
from homeassistant.components.recorder.models import (
Events,
States,
process_timestamp,
process_timestamp_to_utc_isoformat,
)
from homeassistant.components.recorder.util import (
QUERY_RETRY_WAIT,
RETRIES,
@@ -248,7 +253,7 @@ def humanify(hass, events, entity_attr_cache, prev_states=None):
if event.event_type in external_events:
domain, describe_event = external_events[event.event_type]
data = describe_event(event)
data["when"] = event.time_fired
data["when"] = event.time_fired_isoformat
data["domain"] = domain
data["context_user_id"] = event.context_user_id
yield data
@@ -275,7 +280,7 @@ def humanify(hass, events, entity_attr_cache, prev_states=None):
) or split_entity_id(entity_id)[1].replace("_", " ")
yield {
"when": event.time_fired,
"when": event.time_fired_isoformat,
"name": name,
"message": _entry_message_from_event(
hass, entity_id, domain, event, entity_attr_cache
@@ -290,7 +295,7 @@ def humanify(hass, events, entity_attr_cache, prev_states=None):
continue
yield {
"when": event.time_fired,
"when": event.time_fired_isoformat,
"name": "Home Assistant",
"message": "started",
"domain": HA_DOMAIN,
@@ -304,7 +309,7 @@ def humanify(hass, events, entity_attr_cache, prev_states=None):
action = "stopped"
yield {
"when": event.time_fired,
"when": event.time_fired_isoformat,
"name": "Home Assistant",
"message": action,
"domain": HA_DOMAIN,
@@ -322,7 +327,7 @@ def humanify(hass, events, entity_attr_cache, prev_states=None):
pass
yield {
"when": event.time_fired,
"when": event.time_fired_isoformat,
"name": event_data.get(ATTR_NAME),
"message": event_data.get(ATTR_MESSAGE),
"domain": domain,
@@ -601,6 +606,7 @@ class LazyEventPartialState:
"_row",
"_event_data",
"_time_fired",
"_time_fired_isoformat",
"_attributes",
"event_type",
"entity_id",
@@ -613,6 +619,7 @@ class LazyEventPartialState:
self._row = row
self._event_data = None
self._time_fired = None
self._time_fired_isoformat = None
self._attributes = None
self.event_type = self._row.event_type
self.entity_id = self._row.entity_id
@@ -662,6 +669,18 @@ class LazyEventPartialState:
)
return self._time_fired
@property
def time_fired_isoformat(self):
"""Time event was fired in utc isoformat."""
if not self._time_fired_isoformat:
if self._time_fired:
self._time_fired_isoformat = self._time_fired.isoformat()
else:
self._time_fired_isoformat = process_timestamp_to_utc_isoformat(
self._row.time_fired or dt_util.utcnow()
)
return self._time_fired_isoformat
@property
def has_old_and_new_state(self):
"""Check the json data to see if new_state and old_state is present without decoding."""
+11 -1
View File
@@ -28,7 +28,7 @@ SCHEMA_VERSION = 8
_LOGGER = logging.getLogger(__name__)
DB_TIMEZONE = "Z"
DB_TIMEZONE = "+00:00"
class Events(Base): # type: ignore
@@ -202,3 +202,13 @@ def process_timestamp(ts):
return ts.replace(tzinfo=dt_util.UTC)
return dt_util.as_utc(ts)
def process_timestamp_to_utc_isoformat(ts):
"""Process a timestamp into UTC isotime."""
if ts is None:
return None
if ts.tzinfo is None:
return f"{ts.isoformat()}{DB_TIMEZONE}"
return dt_util.as_utc(ts).isoformat()