Remove legacy history queries from recorder (home-assistant#153324)

Author: emontnemery

homeassistant/components/recorder/core.py

@@ -1127,9 +1127,6 @@ def _process_state_changed_event_into_session(
         else:
             states_manager.add_pending(entity_id, dbstate)
 
-        if states_meta_manager.active:
-            dbstate.entity_id = None
-
         if entity_id is None or not (
             shared_attrs_bytes := state_attributes_manager.serialize_from_event(event)
         ):
@@ -1140,7 +1137,7 @@ def _process_state_changed_event_into_session(
             dbstate.states_meta_rel = pending_states_meta
         elif metadata_id := states_meta_manager.get(entity_id, session, True):
             dbstate.metadata_id = metadata_id
-        elif states_meta_manager.active and entity_removed:
+        elif entity_removed:
             # If the entity was removed, we don't need to add it to the
             # StatesMeta table or record it in the pending commit
             # if it does not have a metadata_id allocated to it as

homeassistant/components/recorder/db_schema.py

@@ -494,7 +494,7 @@ def from_event(event: Event[EventStateChangedData]) -> States:
         context = event.context
         return States(
             state=state_value,
-            entity_id=event.data["entity_id"],
+            entity_id=None,
             attributes=None,
             context_id=None,
             context_id_bin=ulid_to_bytes_or_none(context.id),

homeassistant/components/recorder/entity_registry.py

@@ -61,15 +61,6 @@ def update_states_metadata(
 ) -> None:
     """Update the states metadata table when an entity is renamed."""
     states_meta_manager = instance.states_meta_manager
-    if not states_meta_manager.active:
-        _LOGGER.warning(
-            "Cannot rename entity_id `%s` to `%s` "
-            "because the states meta manager is not yet active",
-            entity_id,
-            new_entity_id,
-        )
-        return
-
     with session_scope(
         session=instance.get_session(),
         exception_filter=filter_unique_constraint_integrity_error(instance, "state"),

homeassistant/components/recorder/history/__init__.py

@@ -8,7 +8,6 @@
 from sqlalchemy.orm.session import Session
 
 from homeassistant.core import HomeAssistant, State
-from homeassistant.helpers.recorder import get_instance
 
 from ..filters import Filters
 from .const import NEED_ATTRIBUTE_DOMAINS, SIGNIFICANT_DOMAINS
@@ -44,15 +43,7 @@ def get_full_significant_states_with_session(
     no_attributes: bool = False,
 ) -> dict[str, list[State]]:
     """Return a dict of significant states during a time period."""
-    if not get_instance(hass).states_meta_manager.active:
-        from .legacy import (  # noqa: PLC0415
-            get_full_significant_states_with_session as _legacy_get_full_significant_states_with_session,
-        )
-
-        _target = _legacy_get_full_significant_states_with_session
-    else:
-        _target = _modern_get_full_significant_states_with_session
-    return _target(
+    return _modern_get_full_significant_states_with_session(
         hass,
         session,
         start_time,
@@ -69,15 +60,7 @@ def get_last_state_changes(
     hass: HomeAssistant, number_of_states: int, entity_id: str
 ) -> dict[str, list[State]]:
     """Return the last number_of_states."""
-    if not get_instance(hass).states_meta_manager.active:
-        from .legacy import (  # noqa: PLC0415
-            get_last_state_changes as _legacy_get_last_state_changes,
-        )
-
-        _target = _legacy_get_last_state_changes
-    else:
-        _target = _modern_get_last_state_changes
-    return _target(hass, number_of_states, entity_id)
+    return _modern_get_last_state_changes(hass, number_of_states, entity_id)
 
 
 def get_significant_states(
@@ -93,15 +76,7 @@ def get_significant_states(
     compressed_state_format: bool = False,
 ) -> dict[str, list[State | dict[str, Any]]]:
     """Return a dict of significant states during a time period."""
-    if not get_instance(hass).states_meta_manager.active:
-        from .legacy import (  # noqa: PLC0415
-            get_significant_states as _legacy_get_significant_states,
-        )
-
-        _target = _legacy_get_significant_states
-    else:
-        _target = _modern_get_significant_states
-    return _target(
+    return _modern_get_significant_states(
         hass,
         start_time,
         end_time,
@@ -129,15 +104,7 @@ def get_significant_states_with_session(
     compressed_state_format: bool = False,
 ) -> dict[str, list[State | dict[str, Any]]]:
     """Return a dict of significant states during a time period."""
-    if not get_instance(hass).states_meta_manager.active:
-        from .legacy import (  # noqa: PLC0415
-            get_significant_states_with_session as _legacy_get_significant_states_with_session,
-        )
-
-        _target = _legacy_get_significant_states_with_session
-    else:
-        _target = _modern_get_significant_states_with_session
-    return _target(
+    return _modern_get_significant_states_with_session(
         hass,
         session,
         start_time,
@@ -163,15 +130,7 @@ def state_changes_during_period(
     include_start_time_state: bool = True,
 ) -> dict[str, list[State]]:
     """Return a list of states that changed during a time period."""
-    if not get_instance(hass).states_meta_manager.active:
-        from .legacy import (  # noqa: PLC0415
-            state_changes_during_period as _legacy_state_changes_during_period,
-        )
-
-        _target = _legacy_state_changes_during_period
-    else:
-        _target = _modern_state_changes_during_period
-    return _target(
+    return _modern_state_changes_during_period(
         hass,
         start_time,
         end_time,