fix: conserve local-day activity evidence
This commit is contained in:
+90
-2
@@ -11,7 +11,7 @@ from typing import Optional
|
||||
|
||||
|
||||
# Schema version - increment on each migration
|
||||
SCHEMA_VERSION = 4
|
||||
SCHEMA_VERSION = 5
|
||||
|
||||
|
||||
# Packaged default placement (spec §8.3). The config may override it, but a
|
||||
@@ -106,7 +106,8 @@ def _create_schema(conn: sqlite3.Connection):
|
||||
bytes_written INTEGER,
|
||||
bytes_read INTEGER,
|
||||
critical_warning INTEGER,
|
||||
segment_id INTEGER
|
||||
segment_id INTEGER,
|
||||
local_tz TEXT
|
||||
)
|
||||
""")
|
||||
|
||||
@@ -208,10 +209,18 @@ def _create_schema(conn: sqlite3.Connection):
|
||||
coverage REAL DEFAULT 0.0,
|
||||
sample_count INTEGER DEFAULT 0,
|
||||
complete BOOLEAN DEFAULT 0,
|
||||
activity_seconds INTEGER NOT NULL DEFAULT 0,
|
||||
activity_intervals INTEGER NOT NULL DEFAULT 0,
|
||||
activity_incomplete BOOLEAN NOT NULL DEFAULT 0,
|
||||
activity_precision TEXT NOT NULL DEFAULT 'measured',
|
||||
last_sample_id INTEGER,
|
||||
UNIQUE(local_date, tz_name)
|
||||
)
|
||||
""")
|
||||
|
||||
_create_local_day_shared_evidence(conn)
|
||||
_create_local_day_segment_totals(conn)
|
||||
|
||||
# Metadata table for store state (e.g., legacy import marker)
|
||||
conn.execute("""
|
||||
CREATE TABLE IF NOT EXISTS store_metadata (
|
||||
@@ -234,6 +243,52 @@ def _create_pending_publications(conn: sqlite3.Connection) -> None:
|
||||
""")
|
||||
|
||||
|
||||
def _create_local_day_shared_evidence(conn: sqlite3.Connection) -> None:
|
||||
"""Create once-only local activity evidence that cannot be day-allocated."""
|
||||
conn.execute("""
|
||||
CREATE TABLE IF NOT EXISTS local_day_unallocated_evidence (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
start_sample_id INTEGER NOT NULL,
|
||||
end_sample_id INTEGER NOT NULL,
|
||||
start_local_date TEXT NOT NULL,
|
||||
end_local_date TEXT NOT NULL,
|
||||
start_tz_name TEXT,
|
||||
end_tz_name TEXT,
|
||||
started_at TEXT NOT NULL,
|
||||
ended_at TEXT NOT NULL,
|
||||
bytes_written INTEGER NOT NULL DEFAULT 0,
|
||||
bytes_read INTEGER NOT NULL DEFAULT 0,
|
||||
reason TEXT NOT NULL,
|
||||
segment_id INTEGER,
|
||||
UNIQUE(start_sample_id, end_sample_id)
|
||||
)
|
||||
""")
|
||||
conn.execute(
|
||||
"CREATE INDEX IF NOT EXISTS local_day_evidence_start "
|
||||
"ON local_day_unallocated_evidence(start_local_date, start_tz_name)"
|
||||
)
|
||||
conn.execute(
|
||||
"CREATE INDEX IF NOT EXISTS local_day_evidence_end "
|
||||
"ON local_day_unallocated_evidence(end_local_date, end_tz_name)"
|
||||
)
|
||||
|
||||
|
||||
def _create_local_day_segment_totals(conn: sqlite3.Connection) -> None:
|
||||
"""Retain the controller-segment provenance behind known day totals."""
|
||||
conn.execute("""
|
||||
CREATE TABLE IF NOT EXISTS local_day_segment_totals (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
local_day_id INTEGER NOT NULL,
|
||||
segment_id INTEGER NOT NULL,
|
||||
bytes_written INTEGER NOT NULL DEFAULT 0,
|
||||
bytes_read INTEGER NOT NULL DEFAULT 0,
|
||||
activity_seconds INTEGER NOT NULL DEFAULT 0,
|
||||
activity_intervals INTEGER NOT NULL DEFAULT 0,
|
||||
UNIQUE(local_day_id, segment_id)
|
||||
)
|
||||
""")
|
||||
|
||||
|
||||
def _apply_migrations(conn: sqlite3.Connection, current_version: int):
|
||||
"""Apply forward-only migrations from current_version to SCHEMA_VERSION.
|
||||
|
||||
@@ -293,6 +348,39 @@ def _apply_migrations(conn: sqlite3.Connection, current_version: int):
|
||||
_create_pending_publications(conn)
|
||||
current_version = 4
|
||||
|
||||
# Migration 4→5: retain precise measured local-day activity and once-only
|
||||
# unallocated intervals. Existing local-day totals came from UTC-hour
|
||||
# aggregates, so preserve their rows but mark their local precision legacy.
|
||||
if current_version < 5:
|
||||
tables = {row[0] for row in conn.execute(
|
||||
"SELECT name FROM sqlite_master WHERE type='table'"
|
||||
).fetchall()}
|
||||
if "samples" in tables:
|
||||
sample_cols = {row[1] for row in conn.execute(
|
||||
"PRAGMA table_info(samples)"
|
||||
).fetchall()}
|
||||
if "local_tz" not in sample_cols:
|
||||
conn.execute("ALTER TABLE samples ADD COLUMN local_tz TEXT")
|
||||
if "local_days" in tables:
|
||||
local_cols = {row[1] for row in conn.execute(
|
||||
"PRAGMA table_info(local_days)"
|
||||
).fetchall()}
|
||||
for column, declaration in (
|
||||
("activity_seconds", "INTEGER NOT NULL DEFAULT 0"),
|
||||
("activity_intervals", "INTEGER NOT NULL DEFAULT 0"),
|
||||
("activity_incomplete", "BOOLEAN NOT NULL DEFAULT 0"),
|
||||
("activity_precision", "TEXT NOT NULL DEFAULT 'legacy'"),
|
||||
("last_sample_id", "INTEGER"),
|
||||
):
|
||||
if column not in local_cols:
|
||||
conn.execute(
|
||||
"ALTER TABLE local_days ADD COLUMN %s %s" %
|
||||
(column, declaration)
|
||||
)
|
||||
_create_local_day_shared_evidence(conn)
|
||||
_create_local_day_segment_totals(conn)
|
||||
current_version = 5
|
||||
|
||||
|
||||
def migrate_to_latest(store_path: Path) -> int:
|
||||
"""Apply forward-only migrations to bring the store to SCHEMA_VERSION.
|
||||
|
||||
Reference in New Issue
Block a user