Skip to content

Only remove duplicated statistics on error #65653

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

Merged
balloob merged 2 commits into from
Feb 4, 2022
Merged

Only remove duplicated statistics on error #65653

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
880455d
Only remove duplicated statistics on error
emontnemery Feb 4, 2022
0b49cd6
Tweak
emontnemery Feb 4, 2022
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
28 changes: 19 additions & 9 deletions homeassistant/components/recorder/migration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import sqlalchemy
from sqlalchemy import ForeignKeyConstraint, MetaData, Table, func, text
from sqlalchemy.exc import (
DatabaseError,
InternalError,
OperationalError,
ProgrammingError,
Expand Down Expand Up @@ -612,22 +613,31 @@ def _apply_update(instance, new_version, old_version): # noqa: C901
# Add name column to StatisticsMeta
_add_columns(instance, "statistics_meta", ["name VARCHAR(255)"])
elif new_version == 24:
# Delete duplicated statistics
with session_scope(session=instance.get_session()) as session:
delete_duplicates(instance, session)
# Recreate statistics indices to block duplicated statistics
_drop_index(instance, "statistics", "ix_statistics_statistic_id_start")
_create_index(instance, "statistics", "ix_statistics_statistic_id_start")
_drop_index(
instance,
"statistics_short_term",
"ix_statistics_short_term_statistic_id_start",
)
_create_index(
instance,
"statistics_short_term",
"ix_statistics_short_term_statistic_id_start",
)
try:
_create_index(instance, "statistics", "ix_statistics_statistic_id_start")
_create_index(
instance,
"statistics_short_term",
"ix_statistics_short_term_statistic_id_start",
)
except DatabaseError:
# There may be duplicated statistics entries, delete duplicated statistics
# and try again
with session_scope(session=instance.get_session()) as session:
delete_duplicates(instance, session)
_create_index(instance, "statistics", "ix_statistics_statistic_id_start")
_create_index(
instance,
"statistics_short_term",
"ix_statistics_short_term_statistic_id_start",
)

else:
raise ValueError(f"No schema migration defined for version {new_version}")
Expand Down