perf(tags): protective-alias uses tag kind, drops the image_record full scan
CI / lint (push) Successful in 3s
CI / frontend-build (push) Successful in 20s
CI / backend-lint-and-test (push) Successful in 26s
CI / integration (push) Successful in 3m7s

_create_protective_aliases scanned every image_record's tagger_predictions JSON
(unindexed full scan, ~59k rows) to find the categories a merged-away tag's name
was predicted under. That scan ran inside the merge transaction AFTER it had
locked series_page — on a large library it held that lock for minutes and is what
blocked migration 0040 (and starved the standardization task into its 40-min
timeout).

The scan was redundant: the tagger's tag_to_category map is one-to-one (a name has
exactly one category) and a tag's kind is set from that category when created, so
kind already IS the tagger's category for the name. The scan only ever rediscovered
the kind. Build the single protective alias from src_kind directly — no scan, no
lock-holding slow step in the merge.

Rewrote test_alias_per_observed_prediction_category (which encoded the
can't-actually-happen one-name-two-categories case) → test_protective_alias_uses_tag_kind.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-06-08 00:15:40 -04:00
parent 8e98e79968
commit e90e6b2c34
2 changed files with 29 additions and 47 deletions
+23 -40
View File
@@ -562,50 +562,33 @@ class TagService:
async def _create_protective_aliases(
self, src_name: str, src_kind: TagKind, tgt: int
) -> bool:
"""One alias per category the tagger has actually emitted for
src_name (so future predictions resolve to target); fall back to
the tag's kind when the tagger never predicted this exact name.
Idempotent — never clobbers a pre-existing operator alias."""
"""Alias (src_name, category) -> tgt so future tagger predictions of
src_name resolve to the merge survivor. Idempotent — never clobbers a
pre-existing operator alias.
The category is the tag's kind. The tagger's tag_to_category map is
one-to-one (a name has exactly ONE category), and a tag's kind is set
from that category when it's created — so kind already IS the tagger's
category for this name. This used to SELECT DISTINCT category by scanning
every image_record's tagger_predictions JSON (an unindexed full scan that,
on a large library, held a series_page lock for minutes inside the merge
and blocked migration 0040 — operator-flagged 2026-06-07). That scan only
ever rediscovered the kind, so it's gone."""
from ..models.tag_alias import TagAlias
rows = (
await self.session.execute(
text(
"SELECT DISTINCT "
" (tagger_predictions::jsonb -> :n ->> 'category') "
" AS cat "
"FROM image_record "
"WHERE tagger_predictions IS NOT NULL "
" AND (tagger_predictions::jsonb) ? :n"
),
{"n": src_name},
category = src_kind.value if hasattr(src_kind, "value") else str(src_kind)
res = await self.session.execute(
pg_insert(TagAlias)
.values(
alias_string=src_name,
alias_category=category,
canonical_tag_id=tgt,
)
).all()
categories = {r.cat for r in rows if r.cat}
if not categories:
kind_val = (
src_kind.value
if hasattr(src_kind, "value")
else str(src_kind)
.on_conflict_do_nothing(
index_elements=["alias_string", "alias_category"]
)
categories = {kind_val}
created = False
for cat in categories:
res = await self.session.execute(
pg_insert(TagAlias)
.values(
alias_string=src_name,
alias_category=cat,
canonical_tag_id=tgt,
)
.on_conflict_do_nothing(
index_elements=["alias_string", "alias_category"]
)
)
if res.rowcount:
created = True
return created
)
return bool(res.rowcount)
# ---------------------------------------------------------------------------
+6 -7
View File
@@ -320,7 +320,12 @@ async def test_no_alias_when_purely_manual(db):
@pytest.mark.asyncio
async def test_alias_per_observed_prediction_category(db):
async def test_protective_alias_uses_tag_kind(db):
# The protective alias category is the tag's KIND — the tagger maps each name
# to exactly one category and a tag's kind is set from it, so kind already IS
# the tagger's category. The merge no longer scans image_record's predictions
# to rediscover it. Even with a (contrived) differing prediction category
# present, the merge writes a single (name, kind) alias.
from backend.app.models import ImageRecord
from backend.app.models.tag_alias import TagAlias
@@ -332,11 +337,6 @@ async def test_alias_per_observed_prediction_category(db):
await svc.add_to_image(img, a.id, source="ml_auto")
r1 = await db.get(ImageRecord, img)
r1.tagger_predictions = {
"predname": {"category": "general", "confidence": 0.9}
}
i2 = await _img(db)
r2 = await db.get(ImageRecord, i2)
r2.tagger_predictions = {
"predname": {"category": "copyright", "confidence": 0.8}
}
await db.flush()
@@ -353,7 +353,6 @@ async def test_alias_per_observed_prediction_category(db):
).all()
assert {(r.alias_string, r.alias_category) for r in rows} == {
("predname", "general"),
("predname", "copyright"),
}
assert all(r.canonical_tag_id == b.id for r in rows)