adjust

homeassistant/components/recorder/core.py

@@ -78,13 +78,13 @@ from .models import (
 )
 from .pool import POOL_SIZE, MutexPool, RecorderPool
 from .queries import (
-    find_event_type_ids,
     find_shared_attributes_id,
     find_shared_data_id,
     get_shared_attributes,
     get_shared_event_datas,
 )
 from .run_history import RunHistory
+from .table_managers.event_types import EventTypeManager
 from .tasks import (
     AdjustLRUSizeTask,
     AdjustStatisticsTask,
@@ -157,78 +157,6 @@ CONNECTIVITY_ERR = "Error in database connectivity during commit"
 MAX_DB_EXECUTOR_WORKERS = POOL_SIZE - 1
 
 
-class EventTypeManager:
-    """Manage event types."""
-
-    def __init__(self) -> None:
-        """Initialize the event manager."""
-        self._id_map: dict[str, int] = LRU(EVENT_DATA_ID_CACHE_SIZE)
-        self._pending: dict[str, EventTypes] = {}
-        self.active = False
-
-    def load(self, events: list[Event], session: Session) -> None:
-        """Load the event types into memory."""
-        self.get_many(
-            (event.event_type for event in events if event.event_type is not None),
-            session,
-        )
-
-    def get(self, event_type: str, session: Session) -> int | None:
-        """Resolve events to event data."""
-        return self.get_many((event_type,), session)[event_type]
-
-    def get_many(
-        self, event_types: Iterable[str], session: Session
-    ) -> dict[str, int | None]:
-        """Resolve events to event data."""
-        results: dict[str, int | None] = {}
-        missing: list[str] = []
-        for event_type in event_types:
-            if event_type_id := self._id_map.get(event_type):
-                results[event_type] = event_type_id
-            else:
-                missing.append(event_type)
-
-        for event_type in missing:
-            with session.no_autoflush:
-                if event_type_row := session.execute(
-                    find_event_type_ids(missing)
-                ).first():
-                    event_type_id = cast(int, event_type_row[0])
-                    results[event_type] = self._id_map[event_type] = event_type_id
-                    continue
-
-            results[event_type] = None
-
-        return results
-
-    def get_pending(self, event_type: str) -> EventTypes | None:
-        """Get pending event type."""
-        return self._pending.get(event_type)
-
-    def add_pending(self, db_event_type: EventTypes) -> None:
-        """Add a pending event."""
-        assert db_event_type.event_type is not None
-        event_type: str = db_event_type.event_type
-        self._pending[event_type] = db_event_type
-
-    def post_commit_pending(self) -> None:
-        """Flush pending events."""
-        for event_type, db_event_types in self._pending.items():
-            self._id_map[event_type] = db_event_types.event_type_id
-        self._pending.clear()
-
-    def reset(self) -> None:
-        """Reset the event manager."""
-        self._id_map.clear()
-        self._pending.clear()
-
-    def evict_purged(self, event_types: Iterable[str]) -> None:
-        """Evict purged event types."""
-        for event_type in event_types:
-            self._id_map.pop(event_type, None)
-
-
 class Recorder(threading.Thread):
     """A threaded recorder class."""
 

homeassistant/components/recorder/table_managers/event_types.py

@@ -0,0 +1,87 @@
+"""Support managing EventTypes."""
+from __future__ import annotations
+
+from collections.abc import Iterable
+from typing import cast
+
+from lru import LRU  # pylint: disable=no-name-in-module
+from sqlalchemy.orm.session import Session
+
+from homeassistant.core import Event
+
+from ..db_schema import EventTypes
+from ..queries import find_event_type_ids
+
+CACHE_SIZE = 2048
+
+
+class EventTypeManager:
+    """Manage event types."""
+
+    def __init__(self) -> None:
+        """Initialize the event manager."""
+        self._id_map: dict[str, int] = LRU(CACHE_SIZE)
+        self._pending: dict[str, EventTypes] = {}
+        self.active = False
+
+    def load(self, events: list[Event], session: Session) -> None:
+        """Load the event types into memory."""
+        self.get_many(
+            (event.event_type for event in events if event.event_type is not None),
+            session,
+        )
+
+    def get(self, event_type: str, session: Session) -> int | None:
+        """Resolve events to event data."""
+        return self.get_many((event_type,), session)[event_type]
+
+    def get_many(
+        self, event_types: Iterable[str], session: Session
+    ) -> dict[str, int | None]:
+        """Resolve events to event data."""
+        results: dict[str, int | None] = {}
+        missing: list[str] = []
+        for event_type in event_types:
+            if event_type_id := self._id_map.get(event_type):
+                results[event_type] = event_type_id
+            else:
+                missing.append(event_type)
+
+        for event_type in missing:
+            with session.no_autoflush:
+                if event_type_row := session.execute(
+                    find_event_type_ids(missing)
+                ).first():
+                    event_type_id = cast(int, event_type_row[0])
+                    results[event_type] = self._id_map[event_type] = event_type_id
+                    continue
+
+            results[event_type] = None
+
+        return results
+
+    def get_pending(self, event_type: str) -> EventTypes | None:
+        """Get pending event type."""
+        return self._pending.get(event_type)
+
+    def add_pending(self, db_event_type: EventTypes) -> None:
+        """Add a pending event."""
+        assert db_event_type.event_type is not None
+        event_type: str = db_event_type.event_type
+        self._pending[event_type] = db_event_type
+
+    def post_commit_pending(self) -> None:
+        """Flush pending events."""
+        for event_type, db_event_types in self._pending.items():
+            self._id_map[event_type] = db_event_types.event_type_id
+        self._pending.clear()
+
+    def reset(self) -> None:
+        """Reset the event manager."""
+        self._id_map.clear()
+        self._pending.clear()
+
+    def evict_purged(self, event_types: Iterable[str]) -> None:
+        """Evict purged event types."""
+        for event_type in event_types:
+            self._id_map.pop(event_type, None)