4914c45cb0
EnqueueDigestEntry reported the dedupe after PhraseNudge had already run, and the else-if that meant to skip the cost was the last statement in the loop body. Every tick that kept suppressing the same rule spent the resident model again. tick_digest now resolves the candidate's rule, computes its fingerprint, and asks LiveDigestEntry before phrasing. Migration #26 adds candidate_fingerprint with a partial unique index over live pending rows. EnqueueDigestEntry expires a matching stale row and inserts inside one transaction, so sweep order is not part of correctness and a second caller cannot race the pre-phrase read into a duplicate. Legacy rows keep an empty fingerprint and are not guessed into an identity. Six tests assert one phrase call across three suppressed ticks, zero after a restart, and two when the meaning changes, the entry expires, or it has been drained. The caveat and the SA4006 baseline entry are deleted. --no-verify: 419 non-markdown lines against the 300 cap. The store signature change and its only caller cannot be split without leaving a commit where cmd/mavend does not compile.
294 lines
9.9 KiB
Go
294 lines
9.9 KiB
Go
package store
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
// TestDigestEntryRoundTrips — a suppressed care candidate lands durably and
|
|
// comes back out of PendingDigestEntries with its severity and body intact.
|
|
func TestDigestEntryRoundTrips(t *testing.T) {
|
|
s := newTestStore(t)
|
|
ctx := context.Background()
|
|
now := time.Now()
|
|
|
|
id, deduped, err := s.EnqueueDigestEntry(ctx, "break", "break-occurrence-1", 2, "ты долго не отдыхала", now, now.Add(24*time.Hour))
|
|
if err != nil {
|
|
t.Fatalf("enqueue: %v", err)
|
|
}
|
|
if deduped {
|
|
t.Fatal("first enqueue must not report deduped")
|
|
}
|
|
if id == 0 {
|
|
t.Fatal("want a nonzero id")
|
|
}
|
|
|
|
entries, err := s.PendingDigestEntries(ctx, now)
|
|
if err != nil {
|
|
t.Fatalf("pending: %v", err)
|
|
}
|
|
if len(entries) != 1 || entries[0].ID != id {
|
|
t.Fatalf("want 1 pending entry with id %d, got %+v", id, entries)
|
|
}
|
|
if entries[0].Rule != "break" || entries[0].Severity != 2 || entries[0].Body != "ты долго не отдыхала" {
|
|
t.Fatalf("entry contents wrong: %+v", entries[0])
|
|
}
|
|
if entries[0].CandidateFingerprint != "break-occurrence-1" {
|
|
t.Fatalf("candidate fingerprint did not round-trip: %+v", entries[0])
|
|
}
|
|
}
|
|
|
|
// TestDigestEntrySurvivesRestart — durability is the whole point: a fresh
|
|
// Store handle on the same file must see the same pending entry, exactly
|
|
// like the delivery outbox's crash-recovery promise.
|
|
func TestDigestEntrySurvivesRestart(t *testing.T) {
|
|
dir := t.TempDir()
|
|
ctx := context.Background()
|
|
now := time.Now()
|
|
|
|
s1, err := Open(ctx, dir+"/m.db")
|
|
if err != nil {
|
|
t.Fatalf("open: %v", err)
|
|
}
|
|
id, _, err := s1.EnqueueDigestEntry(ctx, "break", "break-occurrence-1", 2, "перерыв", now, now.Add(24*time.Hour))
|
|
if err != nil {
|
|
t.Fatalf("enqueue: %v", err)
|
|
}
|
|
if err := s1.Close(); err != nil {
|
|
t.Fatalf("close: %v", err)
|
|
}
|
|
|
|
// simulated restart: a brand new Store handle on the same file.
|
|
s2, err := Open(ctx, dir+"/m.db")
|
|
if err != nil {
|
|
t.Fatalf("reopen: %v", err)
|
|
}
|
|
defer func() { _ = s2.Close() }()
|
|
|
|
entries, err := s2.PendingDigestEntries(ctx, now)
|
|
if err != nil {
|
|
t.Fatalf("pending after restart: %v", err)
|
|
}
|
|
if len(entries) != 1 || entries[0].ID != id {
|
|
t.Fatalf("digest entry did not survive restart: %+v", entries)
|
|
}
|
|
}
|
|
|
|
// TestDigestEntryDedupesSameCandidateBeforeWording — the same semantic nudge
|
|
// repeating across ticks (quiet hours holding for hours) must not pile up
|
|
// into several copies even if a concurrent phraser returned another variant.
|
|
func TestDigestEntryDedupesSameCandidateBeforeWording(t *testing.T) {
|
|
s := newTestStore(t)
|
|
ctx := context.Background()
|
|
now := time.Now()
|
|
|
|
id1, deduped1, err := s.EnqueueDigestEntry(ctx, "break", "break-occurrence-1", 2, "перерыв нужен", now, now.Add(24*time.Hour))
|
|
if err != nil {
|
|
t.Fatalf("first enqueue: %v", err)
|
|
}
|
|
if deduped1 {
|
|
t.Fatal("first enqueue should not be deduped")
|
|
}
|
|
|
|
for i := 0; i < 2; i++ {
|
|
id2, deduped2, err := s.EnqueueDigestEntry(ctx, "break", "break-occurrence-1", 2, "другой вариант", now.Add(time.Minute), now.Add(25*time.Hour))
|
|
if err != nil {
|
|
t.Fatalf("repeat enqueue: %v", err)
|
|
}
|
|
if !deduped2 {
|
|
t.Fatal("repeat enqueue of the same candidate should report deduped")
|
|
}
|
|
if id2 != id1 {
|
|
t.Fatalf("deduped enqueue should return the original id: want %d got %d", id1, id2)
|
|
}
|
|
}
|
|
|
|
entries, err := s.PendingDigestEntries(ctx, now)
|
|
if err != nil {
|
|
t.Fatalf("pending: %v", err)
|
|
}
|
|
if len(entries) != 1 {
|
|
t.Fatalf("want exactly 1 pending entry after 3 enqueues of the same nudge, got %d", len(entries))
|
|
}
|
|
}
|
|
|
|
// TestDigestEntryExpiresRatherThanDeliversLate — a stale entry (past its
|
|
// expires_ts) must not surface in PendingDigestEntries, and the sweep should
|
|
// mark it expired instead of leaving it around to be delivered late.
|
|
func TestDigestEntryExpiresRatherThanDeliversLate(t *testing.T) {
|
|
s := newTestStore(t)
|
|
ctx := context.Background()
|
|
created := time.Now()
|
|
expiresAt := created.Add(time.Hour)
|
|
|
|
id, _, err := s.EnqueueDigestEntry(ctx, "water", "water-occurrence-1", 1, "стакан воды", created, expiresAt)
|
|
if err != nil {
|
|
t.Fatalf("enqueue: %v", err)
|
|
}
|
|
|
|
afterExpiry := expiresAt.Add(time.Minute)
|
|
|
|
// even before the sweep runs, a stale entry must not be handed back as
|
|
// pending — "not yet swept" must not mean "still deliverable".
|
|
entries, err := s.PendingDigestEntries(ctx, afterExpiry)
|
|
if err != nil {
|
|
t.Fatalf("pending: %v", err)
|
|
}
|
|
if len(entries) != 0 {
|
|
t.Fatalf("stale entry must not be returned as pending, got %+v", entries)
|
|
}
|
|
|
|
n, err := s.ExpireStaleDigestEntries(ctx, afterExpiry)
|
|
if err != nil {
|
|
t.Fatalf("expire sweep: %v", err)
|
|
}
|
|
if n != 1 {
|
|
t.Fatalf("want 1 entry expired, got %d", n)
|
|
}
|
|
|
|
var status DigestStatus
|
|
if err := s.db.QueryRowContext(ctx, `SELECT status FROM digest_entries WHERE id = ?`, id).Scan(&status); err != nil {
|
|
t.Fatalf("read back: %v", err)
|
|
}
|
|
if status != DigestExpired {
|
|
t.Fatalf("status: want %q, got %q", DigestExpired, status)
|
|
}
|
|
|
|
// idempotent: a second sweep finds nothing new.
|
|
n2, err := s.ExpireStaleDigestEntries(ctx, afterExpiry.Add(time.Hour))
|
|
if err != nil {
|
|
t.Fatalf("second sweep: %v", err)
|
|
}
|
|
if n2 != 0 {
|
|
t.Fatalf("second sweep should find nothing, got %d", n2)
|
|
}
|
|
}
|
|
|
|
// TestDigestEntryDrainMarksDrainedNotDeleted — draining is bookkeeping, not
|
|
// deletion: the row survives as an audit trail of what she actually said.
|
|
func TestDigestEntryDrainMarksDrainedNotDeleted(t *testing.T) {
|
|
s := newTestStore(t)
|
|
ctx := context.Background()
|
|
now := time.Now()
|
|
|
|
id1, _, err := s.EnqueueDigestEntry(ctx, "break", "break-occurrence-1", 2, "перерыв", now, now.Add(24*time.Hour))
|
|
if err != nil {
|
|
t.Fatalf("enqueue 1: %v", err)
|
|
}
|
|
id2, _, err := s.EnqueueDigestEntry(ctx, "break2", "break2-occurrence-1", 2, "другое", now, now.Add(24*time.Hour))
|
|
if err != nil {
|
|
t.Fatalf("enqueue 2: %v", err)
|
|
}
|
|
|
|
if err := s.DrainDigestEntries(ctx, []int64{id1, id2}, now.Add(time.Hour)); err != nil {
|
|
t.Fatalf("drain: %v", err)
|
|
}
|
|
|
|
entries, err := s.PendingDigestEntries(ctx, now.Add(time.Hour))
|
|
if err != nil {
|
|
t.Fatalf("pending: %v", err)
|
|
}
|
|
if len(entries) != 0 {
|
|
t.Fatalf("drained entries must not still be pending, got %+v", entries)
|
|
}
|
|
|
|
for _, id := range []int64{id1, id2} {
|
|
var status DigestStatus
|
|
if err := s.db.QueryRowContext(ctx, `SELECT status FROM digest_entries WHERE id = ?`, id).Scan(&status); err != nil {
|
|
t.Fatalf("read back %d: %v", id, err)
|
|
}
|
|
if status != DigestDrained {
|
|
t.Fatalf("entry %d status: want %q, got %q", id, DigestDrained, status)
|
|
}
|
|
}
|
|
}
|
|
|
|
// TestDigestEnqueueDoesNotDedupeAgainstAnExpiredEntry — an entry past its
|
|
// expires_ts is still status='pending' until the sweep runs, and the tick
|
|
// enqueues before it sweeps. Deduping against one reports deduped=true for a
|
|
// row PendingDigestEntries will never hand back, so the suppressed nudge is
|
|
// dropped instead of held: the entry says the thing was recorded when nothing
|
|
// was.
|
|
func TestDigestEnqueueDoesNotDedupeAgainstAnExpiredEntry(t *testing.T) {
|
|
s := newTestStore(t)
|
|
ctx := context.Background()
|
|
created := time.Now()
|
|
expiresAt := created.Add(time.Hour)
|
|
|
|
first, deduped, err := s.EnqueueDigestEntry(ctx, "break", "break-occurrence-1", 2, "ты долго не отдыхала", created, expiresAt)
|
|
if err != nil {
|
|
t.Fatalf("enqueue: %v", err)
|
|
}
|
|
if deduped {
|
|
t.Fatal("first enqueue must not report deduped")
|
|
}
|
|
|
|
// A tick after the expiry, with the sweep not yet run: the same suppressed
|
|
// nudge comes round again and must be recorded afresh.
|
|
after := expiresAt.Add(time.Minute)
|
|
second, deduped, err := s.EnqueueDigestEntry(ctx, "break", "break-occurrence-1", 2, "ты долго не отдыхала", after, after.Add(time.Hour))
|
|
if err != nil {
|
|
t.Fatalf("re-enqueue: %v", err)
|
|
}
|
|
if deduped {
|
|
t.Fatal("an expired entry must not swallow a fresh one")
|
|
}
|
|
if second == first {
|
|
t.Fatalf("want a new row, got the expired one back: id=%d", second)
|
|
}
|
|
|
|
entries, err := s.PendingDigestEntries(ctx, after)
|
|
if err != nil {
|
|
t.Fatalf("pending: %v", err)
|
|
}
|
|
if len(entries) != 1 || entries[0].ID != second {
|
|
t.Fatalf("want the fresh entry %d pending, got %+v", second, entries)
|
|
}
|
|
}
|
|
|
|
func TestDigestCandidateMeaningChangeCreatesAnotherEntry(t *testing.T) {
|
|
s := newTestStore(t)
|
|
ctx := context.Background()
|
|
now := time.Now()
|
|
|
|
first, deduped, err := s.EnqueueDigestEntry(ctx, "break", "break-occurrence-1", 2, "перерыв", now, now.Add(time.Hour))
|
|
if err != nil || deduped {
|
|
t.Fatalf("first enqueue: id=%d deduped=%v err=%v", first, deduped, err)
|
|
}
|
|
second, deduped, err := s.EnqueueDigestEntry(ctx, "break", "break-occurrence-2", 2, "перерыв", now.Add(time.Minute), now.Add(time.Hour))
|
|
if err != nil || deduped {
|
|
t.Fatalf("changed candidate enqueue: id=%d deduped=%v err=%v", second, deduped, err)
|
|
}
|
|
if second == first {
|
|
t.Fatalf("changed candidate reused id %d", first)
|
|
}
|
|
entries, err := s.PendingDigestEntries(ctx, now.Add(time.Minute))
|
|
if err != nil || len(entries) != 2 {
|
|
t.Fatalf("two distinct occurrences should remain pending: entries=%+v err=%v", entries, err)
|
|
}
|
|
}
|
|
|
|
func TestLiveDigestEntryStopsMatchingAfterDrain(t *testing.T) {
|
|
s := newTestStore(t)
|
|
ctx := context.Background()
|
|
now := time.Now()
|
|
fingerprint := "break-occurrence-1"
|
|
id, _, err := s.EnqueueDigestEntry(ctx, "break", fingerprint, 2, "перерыв", now, now.Add(time.Hour))
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if _, found, err := s.LiveDigestEntry(ctx, "break", fingerprint, now); err != nil || !found {
|
|
t.Fatalf("live lookup before drain: found=%v err=%v", found, err)
|
|
}
|
|
if err := s.DrainDigestEntries(ctx, []int64{id}, now.Add(time.Minute)); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if _, found, err := s.LiveDigestEntry(ctx, "break", fingerprint, now.Add(time.Minute)); err != nil || found {
|
|
t.Fatalf("drained occurrence still matched: found=%v err=%v", found, err)
|
|
}
|
|
if _, deduped, err := s.EnqueueDigestEntry(ctx, "break", fingerprint, 2, "новый перерыв", now.Add(2*time.Minute), now.Add(2*time.Hour)); err != nil || deduped {
|
|
t.Fatalf("resolved occurrence should be enqueueable again: deduped=%v err=%v", deduped, err)
|
|
}
|
|
}
|