* perf(jellycompat,sections): bound resume scan, batch leaf detail progress, widen section concurrency Three low-risk fixes from the section-fetch performance investigation (docs/superpowers/plans/2026-07-03-section-fetch-performance.md): - jellycompat: bound loadProgressPage at resumeScanMaxRows=300 so a single request never pages through more than that many in-progress rows. The cap is unconditional: it also covers the sparse-visible-set case (a heavy watcher whose recent rows are mostly dismissed/superseded, or a Series/Season-only request that matches no leaf in-progress row), where the page never fills and the loop would otherwise scan the entire history — previously an O(history) scan reaching tens of seconds. In the common case the loop exits far earlier, so the cap only bounds the pathological worst case; 300 leaves ample headroom to fill a ~20-item Continue Watching page. Beyond the cap the reported total is a clamped lower bound. Covered by TestLoadProgressPage_BoundsScanForSparseVisibleSet. - jellycompat: batch the leaf-item (movie/episode) progress lookup in GetItemDetailsByIDs via ListProgressWithCompletedHistory instead of a per-item GetProgressWithCompletedHistory (~100 sequential queries for a 50-item detail page). Series keep the per-item episode-rollup path (they own no progress row). Output is unchanged; a batch-lookup failure is now logged rather than silently dropping played state for the whole page. - sections: raise fetchAllMaxConcurrency 4 -> 6 to cut FetchAll wave count for large home layouts, staying within the default 20-conn pool. Part of the home/continue-watching latency work. AI-use disclosure: implemented with AI (Claude) assistance. * perf(jellycompat): keep Latest browse on the cross-library fast path under isPlayed /Items/Latest with isPlayed=false is the highest-frequency compat browse (~10.8k calls/day). The played overlay can't be pushed into SQL, so browse over-fetches and filters locally. The cross-library recently_added fast path (BrowseRecentlyAddedAcrossLibraries: one ~1ms index walk per library) was gated on Offset==0, so a heavy watcher who had already seen the newest items needed a 2nd chunk and fell through to BrowsePage — a whole-catalog MIN(first_seen_at) + GROUP BY HashAggregate over ~147k movies measured at ~755ms per call (0.8-1.6s observed end-to-end). Fetch the entire over-fetch budget (maxScannedRows) in a single merged fast-path walk instead of paging into BrowsePage, so the loop fills from one call. The clamp caveat (MaxLimit=1000 leaves a fall-through only for requestedLimit>200, off the Latest hot path) is documented inline. Part of the home/browse latency work. AI-use disclosure: implemented with AI (Claude) assistance. * fix(jellycompat): scope resume scan cap to resume path and bound the fast-path loop Addresses PR #292 review feedback: - Codex (P2): the resumeScanMaxRows cap was applied unconditionally in the general loop, which also paginates the completed (watched-items) list. Gate it on resumeFiltered so the completed path keeps exact TotalRecordCount and deep StartIndex pagination. Covered by TestLoadProgressPage_CompletedScanNotCapped. - CodeRabbit (Critical): the earlier raw-offset fast-path loop — the default Continue Watching shape and the sections-fallback route — had the same unbounded-scan bug and was not covered by the cap (the existing test forces EnableTotalRecordCount=true, routing around it). Bound it with the same resumeScanMaxRows guard. Covered by TestLoadProgressPage_BoundsFastPathScanForSparseVisibleSet. - CodeRabbit (Minor): tag the doc's fenced example blocks as text to satisfy markdownlint MD040. AI-use disclosure: implemented with AI (Claude) assistance. * perf(sections): cache shared user-agnostic home rails per access scope Home-screen rails that are identical for everyone who can see the same libraries (recently added, recently released, genre, trending on server, most watched, new to library, critically acclaimed, award winners, format showcase, seasonal, mood, trending discover, admin-curated lists, and library collections) were rebuilt from Postgres once per request, per user. Only the overlay on top of each row (watched flags, play position, presigned poster URLs) is actually per-user. Insert a process-global resolved-list cache at the FetchOne choke point in internal/sections. Each cacheable row is built once per access scope, held with a 15m TTL, and refreshed in the background 3m before expiry; singleflight collapses cold-miss stampedes into a single build. The per-user overlay still runs fresh in buildSectionsResponse, so no profile state is ever shared. Random and per-user rows (continue watching, next up, recommendations, hidden gems, forgotten favorites, activity feed, user collections) bypass the cache. The access-scope key captures every access boundary the fetch path enforces -- section identity (type + id + config hash) + item limit + accessible and disabled libraries + max content rating + excluded media types + name prefix + allowed-content-id allowlist -- and nothing per-user, so entries are safely shared. Empty membership is never cached (avoids freezing a transiently empty rail); background refreshes are bounded by a timeout. Scale (analytical, derived from the cache behavior -- not a measured latency): for the user-agnostic rows, Postgres section-query volume collapses from O(rows x concurrent requests) to O(rows x distinct access scopes) per 15m refresh window, because most users share a handful of access scopes. Illustrative -- 40 cacheable rows on a home screen, 1000 concurrent users falling into ~5 distinct access scopes: - before: ~40 x 1000 = ~40,000 section queries per wave of home loads - after: ~40 x 5 = ~200 builds per 15m window (plus one background refresh per row per scope), i.e. a warm home load runs zero section queries for these rows. That is a ~99% reduction in shared section-query load at that concurrency; the win grows with concurrency and shrinks as access-scope diversity rises. Design/plan doc added under docs/superpowers/plans/. * perf(jellycompat): serve per-library Latest via the cached recently-added section A jellyfin-compat per-library /Items/Latest rail is the same user-agnostic list as the native "recently added" library rail -- both order by mil.first_seen_at DESC. It was rebuilt on every request through directContentService.BrowseItems, missing the resolved-list cache entirely. Route per-library Latest for movies and series libraries through the native section fetch instead, so it reuses the shared cache. HandleLatest resolves the library's type once, and for a movies/series library builds a synthetic SectionRecentlyAdded with the same type + config + limit + access scope the native rail uses and calls FetchOne; the per-user overlay (favorites, progress, episode targets, presign) is extracted into buildLatestItemDTOs and shared by both the native and BrowseItems paths, so no overlay logic is duplicated. Cached *models.MediaItem values are read-only -- LocalizeItemModels deep-copies before any presign mutation. To let the two surfaces share one entry, resolvedListCacheKey no longer includes the arbitrary section ID: every cacheable section type derives its membership from type + config + limit + scope, never from its own ID (audited all 14 cacheable types plus the library-collection path; the sole s.ID read lives in the non-cacheable user-collection branch). A native recently-added rail and the compat Latest for the same library + scope now collapse to ONE cache entry, built once and reused. Access-scope isolation is unchanged -- the removed ID never carried access information, and every access boundary (libraries, rating cap, excluded types, content allow-list, name prefix) still keys the entry. Guardrails: the native path is restricted to movies and series libraries; every other library type (ebook, music, manga, mixed) is ignored and keeps its exact BrowseItems behavior -- important because an unfiltered recently-added fetch would otherwise surface non-video items to Jellyfin clients that only expect video. Deeper pages, played-filter and backdrop-required requests, a client asking for a type other than the library's own, and any FetchOne error also fall back to BrowseItems. Chosen over an alternative that gave the synthetic section a deterministic ID (which kept two separate cache entries): both returned identical data with similar complexity, so the shared-entry design won. * fix(sections,jellycompat): post-review fixes for the shared-list cache and Latest path Consolidates fixes from the branch's adversarial review and PR #292 review comments into one commit: - Latest fast path: fall back to BrowseItems when a request carries a genre, name-prefix, or person filter (the synthetic recently-added section cannot express these, so serving it unfiltered would return a wrong, broader set). Eligibility is decided by latestFastPathEligible and covered by a test. - Clamp the /Items/Latest page size to compatBrowseMaxLimit before building the section, matching the BrowseItems fallback, so a large client Limit can't drive an oversized recently-added fetch or explode the shared cache key with unbounded ItemLimit values. - Evict expired entries from the process-global resolvedListCache: resolvedListSet sweeps expired keys at most once per minute, bounding the map to scopes seen within one TTL window. Covered by TestResolvedListCacheEvictsExpiredEntries. - Log a short digest of the cache key (resolvedListLogKey) instead of the raw key in the background-refresh panic/error paths, since the key embeds user-controlled access-scope fields such as NamePrefix. Skipped review comments (verified already fixed or stale against current code): the resume fast-path scan bound and watched-items cap (04d2e795) and the docs fence-language tags (already addressed). Build, vet, and go test -race pass for internal/sections and internal/jellycompat. * perf(plugins): cache plugin installations in-memory, invalidated on lifecycle change ## Problem Every poster/image on a warm home rail re-read plugin_installations from Postgres to answer "is this plugin enabled?" and to acquire the plugin client (Source A: metadata chain buildProviders enabled-check; Source B: ensureClient -> loadInstallation). Plugin-resolved image URLs are never URL-cached, so the plugin source and the DB read behind it fired again on every identical warm request; 100% of images in the target library are plugin-backed. ## Solution - Guarded in-memory installation cache (map[int]*Installation + RWMutex) in plugins.Service. loadInstallation reads through it; the requireEnabled gate stays after the cache read so ErrInstallationDisabled semantics are unchanged. invalidateInstallationCache clears it and is self-registered as a lifecycle hook, so Service.OnLifecycleChange wipes it on install/enable/disable/update/ uninstall. - A generation counter closes an invalidate-vs-repopulate race: captured before installations.GetByID and re-checked under the write lock, so a row fetched before a lifecycle mutation is never written into a freshly cleared cache (would otherwise resurrect a just-disabled plugin). - Route the metadata chain enabled-check through the same cache via a structural InstallationEnabledChecker interface (nil-safe: falls back to the pool query when no checker is injected), wired in cmd/silo/main.go. ## Post-review fix (auto-update reliability blocker) AutoUpdateService mutated installations (new InstallPath, old dir deleted) on the default auto update policy without firing OnLifecycleChange, leaving the cache stale and breaking plugins with "stored plugin manifest mismatch" until restart. It now takes an onChange callback wired to Service.OnLifecycleChange and fires it once per Check run that mutated a row. ## Verification go build/vet, go test ./internal/plugins/... ./internal/metadata/... (-race). Tests: cache hit/invalidation, racing-invalidation guard, IsInstallationEnabled, auto-update fires onChange. ## AI-use disclosure Implemented with AI assistance (Claude). * perf(jellycompat): batch per-item presign, and enrich series on the cached Latest path ## Problem List rails presigned each item's poster/backdrop/logo/still image individually (~160 singular resolver calls for a 40-item page where 4 batched calls suffice), and ItemsHandler carried a near-verbatim duplicate of the batch presigner. ## Solution (batching) Promote the batch presigner to a shared package-level presignCompatListItems (presign_list.go) with a generic collectImagePaths[T]; convert the per-item loops (cached home/Latest rail, favorites, batch loaders, userdata favorites) to one batched PresignImageURLsWithExpiry per image type per page; batch the season/episode collections; delete the three duplicate presign helpers. URL output is unchanged (verified byte-for-byte). ## Post-review fix (series Latest data-parity regression) The native cached Latest fast path built items via compatListItemsFromModels + buildLatestItemDTOs and never ran the series watch-state rollup, so a series library's Latest lost Played / UnplayedItemCount and page 1 disagreed with the BrowseItems fallback. enrichSeriesUserData is promoted to the ContentService interface and called on the native path (reused, not duplicated). ## Verification go build/vet, go test ./internal/jellycompat/... ./internal/catalog/... Tests: bounded presign invocation counts + per-item URL mapping; series rollup populated on the native Latest path. ## AI-use disclosure Implemented with AI assistance (Claude). * perf(sections): gate personalized rails out of the shared cache; widen refresh lead ## Problem 1. The shared home-rail cache whitelisted custom_filter/genre sections by TYPE alone, but those route through fetchFiltered -> ParseQueryDefinition and can carry personalized (per-profile) rules/sorts (watched, favorited, in_watchlist, in_progress, last_watched; sorts progress/date_viewed/plays). Their membership is per-profile yet the cache key excludes userID/profileID, so a personalized rail built for one profile was served to others in the same access scope for up to 15m -- a cross-profile watchlist/watch-state leak. 2. The background-refresh lead was tuned so steady traffic is served a warm entry from a longer soft window. ## Solution - Add QueryDefinition.IsPersonalized() (reusing the existing QueryFieldRequiresProfile/QuerySortRequiresProfile helpers). isCacheableSectionType now parses the section QueryDefinition and refuses to cache custom_filter/genre when personalized; non-personalized definitions stay cacheable. Seasonal/mood/trending build their definitions server-side and stay unconditionally cacheable. - resolvedListRefreshLead 3m -> 10m (soft threshold builtAt+5min instead of builtAt+12min). ## Verification go build/vet, go test ./internal/sections/... ./internal/catalog/... (-race). Test: personalized custom_filter/genre not cacheable; non-personalized are. ## AI-use disclosure Implemented with AI assistance (Claude). * fix(sections,metadata): post-review fixes for shared cache and plugin chain staleness Addresses three review findings on PR #292: - sections: canonicalize section config JSON before hashing so configs differing only in whitespace/field order share a cache entry (native + jellycompat rail sharing). Added TestHashSectionConfigCanonicalizes. - metadata: invalidate the resolved-chain cache on plugin lifecycle changes; the installation-enabled check already reads the invalidated plugin cache, but resolveChainCached could serve a stale provider chain for up to chainCacheTTL after a provider's availability changed. - jellycompat: move ctx to the first parameter of presignCompatListItems for consistency with the other presign helpers. Skipped the episode-image presign batching nitpick: the resolver already dedupes+singleflights, so it is a Minor perf-only item not worth the two-pass refactor risk in this pass. * fix(sections,jellycompat): harden shared rail cache and Latest fast path per review Addresses the eight findings from the deep review of this PR: - Detach the blocking cold-miss rebuild from the singleflight leader's request context (context.WithoutCancel + the shared 30s build timeout) so one client disconnect no longer fails every collapsed waiter and leaves the entry uncached. - Stop client-controlled values minting unbounded cache entries: the compat Latest fast path now always fetches a fixed 100-row budget and slices to the requested limit (one entry per scope+library instead of one per Limit value), and an unrecognized MaxOfficialRating string disqualifies the fast path instead of entering the global cache key. - Add release_date to the sections item projection/scan so movies served via the Latest fast path keep PremiereDate (Jellyfin default-set field) in parity with the BrowseItems fallback. - Fall back to per-item progress lookups when the batched leaf progress query fails, restoring one-item-at-a-time degradation instead of blanking played state for the whole page. - Derive cache eligibility from a single source of truth: fetchSection and isCacheableSectionType now share the userAgnosticSectionFetcher table, whose no-userID/profileID signature makes a fetcher drop out of the cacheable set at compile time if it ever gains per-profile inputs. - Decide Latest fast-path eligibility off the actual browse params the fallback would receive, so any filter later added to buildBrowseParams automatically disqualifies the cached path; share one compatDefaultBrowseLimit constant between both paths. - Extract AccessFilter.WriteAccessScopeCacheKey as the shared, security- critical serializer for all access-scoped caches (resolved-list, editorial candidates, audiobook groups); the editorial key now captures ExcludedMediaTypes, which its loaders already applied in SQL. - Strip leaked agent-transcript markup from the section-fetch plan doc. go build ./..., go vet, gofmt clean; go test -race on internal/sections, internal/catalog, internal/jellycompat passes (TestBeginWebOperation* failures are the known pre-existing flakes). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Quick <31828688+Quick104@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
18 KiB
Section-fetch & jellycompat performance plan
Status: in progress. Commands assume the repository root is the cwd.
Log provenance / staleness check. The production logs analyzed here were captured against commit
b1b3a9b4(2026-07-01). Currentorigin/mainis3d82aa59(2026-07-02), 15 commits ahead. Only two of those commits touch the hot files, and both are unrelated (3d8a63demetadata-language upsert precedence;d6c4dce1playback-session conflict error) — verified they do not changeListBySeries,loadProgressPage, the next-up query, the browse fast-path, or the detail-enrich path. So the diagnoses below still apply to currentmain; nothing since the logs has fixed these.
Revised implementation scope (2026-07-03, after code verification)
After reading the current code, several original fixes were re-scoped or deferred. This section is authoritative; the "Proposed fixes" section further down is the original analysis and is kept for context.
Commit 1 (safe subset):
- #2 Resume scan cap — IMPLEMENTED.
loadProgressPagenow bounds its scan toresumeScanMaxRows = 300soEnableTotalRecordCount=truecan't drive the O(history) scan (internal/jellycompat/handlers_items.go). Builds clean. Caveat: the specific logged 35.9s Resume call actually went through the cappedFetchOnefast path (the deferred #1 cold recompute), so this removes a latent risk rather than that exact spike. - #9 drop redundant enrich — RE-SCOPED (do not remove wholesale).
enrichDetailUserData(content_direct.go:612-626) is redundant only for movie/episode leaf items (allbatchListItemDetailscallers re-apply batchedprogress[...]which overrides it). For series it builds the episode-rollupUserData(Played/UnplayedItemCount) that no progress row covers — removing it would strip series watch-state from/Items//Items/Latest(which can return Series). Correct fix: skip enrich for leaf types only, keep it for series (or batch the leaf-progress lookup so output is identical). - #4 concurrency — RE-SCOPED (pool-constrained).
pgxpoolMaxConns defaults to 20 (internal/config/db_loader.go:162); live usage already ~25 across the DB. RaisingfetchAllMaxConcurrency4→8 doubles per-request pool pressure, so ~2–3 concurrent home requests would saturate the pool and could regress under load. Only bump conservatively (e.g. 4→6) or after a load test; not a blind constant change.
Deferred to their own PRs (heavier than "light"):
- #1 continue-watching latency. There is no existing result cache to "warm";
the Resume/CW path recomputes via
FetchOneevery call. The hourly:12spike lines up with thecollection sync scheduler/ hourly session-cleanup jobs, so the root cause may be periodic DB contention, not a cache miss. Needs its own investigation (contention vs. adding a short-TTL result cache with progress-write invalidation) — carries user-visible staleness risk. - #3
/Shows/{id}/Episodes. ALIMITonListBySeriestruncates a series; the real fix is client-visible pagination requiring Android/Apple coordination. - #5 dedup + SQL-side filtering. The dedup needs cross-section memoization that
FetchAlldoes not currently have; the SQL-filter half is auserstoreinterface refactor. Both are structural, not light.
Dropped:
- #6 content_id NextUp rewrite. ~28ms off an already ~91ms warm query,
invisible once cached, highest correctness risk (
::int/lexicographic trap). Not worth it.
Commit 2 (separate) — IMPLEMENTED:
- #8 browse fast-path. When a cross-library
recently_addedbrowse also has anisPlayedfilter, the over-fetch loop no longer advancesfilters.OffsetintoBrowsePage's whole-catalog GROUP BY on the 2nd chunk. Instead it pulls the entire over-fetch budget (maxScannedRows) in a singleBrowseRecentlyAddedAcrossLibrariesmerged index walk (internal/jellycompat/content_direct.go), so/Items/Lateststays on the ~1ms/library fast path. Expected ~0.8–1.6s → ~50–150ms for heavy watchers with 2+ libraries.
Problem (what operators/users saw)
Production silo logs (24h window) show recurring multi-second stalls on the
home screen and continue-watching rails, on both native clients and Jellyfin
compat clients.
- Continue Watching is the worst offender. The native
slow section fetchwarning fired 132× in 24h (126 of themtype=continue_watching), with the aggregate home fetch (slow aggregate section fetch) firing 17× atsection_count=32. Distribution ofslow section fetch: p50 ≈ 1.1s, p90 ≈ 3.8s, worst 35.8s. - A very regular hourly spike.
section_id=compat-resumereliably jumps to ~3.5s clustered at :12–:14 past every hour, then returns to fast. This is the fingerprint of an ~1h cache TTL expiring followed by a cold recompute that a live request pays for. - Jellycompat resume/next-up/episodes are slow under field expansion.
Excluding long-lived websocket/stream/transcode connections (expected to be
long), the slowest query-backed endpoints were:
- the Resume endpoints (
UserItems/Resume+ the per-userUsers/{id}/Items/Resumeform) — 275 calls >500ms, worst 35.9s (a VidHub client requestingLimit=20with total-record-count). Shows/NextUp— 399 >500ms, 139 >1000ms.Shows/{id}/Episodes— 58 >500ms, worst 10.1s (long series, all slow calls requestedMediaSources/MediaStreamsexpansion).- the native home-sections aggregate (
api/v1/homesections) — worst 5.4s. /api/v1/recommendations/taste-seed/items— 55 >1000ms, worst 5.6s.
- the Resume endpoints (
What is NOT the problem
The base SQL is fast. EXPLAIN ANALYZE of the continue-watching base fetch for
the single heaviest user on the box (user_id=627, 11,459 in-progress rows)
returns in ~1ms on the existing partial indexes
(idx_uwp_profile_in_progress, idx_uwp_profile_completed). The multi-second
cost is application-side: over-scanning, per-section serialization, cold-cache
recompute, and one avoidable large join in the NextUp query.
Evidence: the NextUp query cost breakdown
EXPLAIN (ANALYZE, BUFFERS) of the real buildListNextUpQuery
(internal/catalog/nextup_repo.go:112) for user_id=627 executed in 91ms
warm, and the cost is dominated by one thing:
completed_episodes CTE:
Nested Loop (actual 60.8ms, 56,884 buffers)
-> Index Scan idx_user_watch_progress_profile (14,512 rows, 847 buffers)
-> Index Scan episodes_pkey (loops=14,512, 56,037 buffers) <-- dominant
LATERAL next-episode lookup: fast (~9k buffers total across 137 series)
Execution Time: 91.163 ms (warm; cold/disk-bound is the 3.5s production case)
The completed_episodes CTE does
JOIN episodes e ON e.content_id = uwp.media_item_id and probes
episodes_pkey once per completed-progress row (14,512×) purely to read
series_id, season_number, and episode_number. That single join is ~60ms of
91ms warm and is the largest driver of the cold-cache blowup.
The content_id insight (validated)
content_id is a deterministic, structured natural key, not a random DB id
(internal/contentid/contentid.go, migration
migrations/sql/20260612130000_deterministic_content_id.sql). An episode's id
embeds its series anchor, season, and episode:
episode-tvdb-296762-1-5 -> series = series-tvdb-296762, season = 1, episode = 5
This is a documented, frozen, load-bearing invariant (contentid.go:29-32:
"the watch-history query relies on this to resolve a show without an episodes
table lookup. Never break it."). It is exposed as SeriesIDFromContentID
(contentid.go:256).
Measured coverage on this DB:
- 2,110,532 of 2,111,778 episode rows (99.94%) are provider-anchored and
derivable; the derived series id matches
series_idfor 100% of them. - Only 1,246 rows / 134 series are legacy/
local-ids with no embedded anchor. - Of in-progress
user_watch_progressrows, 86k areepisode-(derivable) and 44k are movies/books/other (not episodes at all).
Crucially, there is already a proven in-repo SQL pattern for exactly this,
used by the watch-history source to avoid the episodes join
(internal/catalog/history_source.go:218-282):
seriesFromAnchoredEpisodeExpr—'series-' || split_part(id,'-',2) || '-' || split_part(id,'-',3).anchoredEpisodePredicate— requires 5 non-empty-components before treating an id as anchored.- Null-poisons the episodes join key for anchored ids
(
CASE WHEN <anchored> THEN NULL ELSE media_item_id END) so the planner skips theepisodes_pkeyprobe, and only legacy/local idsLEFT JOIN episodes.
Season/episode numbers are also parseable from the id (last two - segments),
so the CTE can obtain all three values it needs (series_id,
season_number, episode_number) without touching episodes for the 99.94%
anchored majority — while COALESCE-ing to the existing join for the legacy tail.
This makes the NextUp optimization low-risk and well-precedented, not novel.
Proposed fixes (ranked by expected impact)
The ranking below was re-ordered after an adversarial review. The production pain is cold-cache spikes hitting live requests, so caching is the highest- impact lever, not the query rewrite. The content_id rewrite is a real warm/cold I/O trim but is demoted and gated on a correctness fix (see #6).
Tier 1 — highest impact, addresses the actual production symptom
-
Warm / lengthen the continue-watching cache so the hourly
:12cold recompute never lands on a live request. Options: background refresh before TTL expiry, or a longer TTL with async invalidation on progress write. The evidence (base query ~1–91ms, prod 3.5s clustered at:12–:14hourly) says this single fix most likely kills the headline spike on its own. -
Cap the Resume full-history scan. When
EnableTotalRecordCount=true,loadProgressPage(handlers_items.go:2446-2483) keeps paging the user's entire in-progress history to compute a total — the documented 35.9s path. Stop scanning to the end: cap scan depth (e.g. reusecontinueProgressMaxScanned) and return an approximate/clamped total, or omit the exact total for oversized histories. -
Bound
/Shows/{id}/Episodes.ListBySeries(internal/catalog/episode_repo.go:684) returns the whole series with noLIMIT; paginate it (the worst 10.1s case). Also fix theepisodeRepo == nilfallback that fans out oneListEpisodesper season — a genuine N+1 (internal/jellycompat/handlers_items.go:2673).- NOTE (review correction): do not bother adding a
LIMITtolistResumableFirstEpisodes— its input already comes fromListProgress(..., 100, 0)(nextup_repo.go:290), soANY($3)is already ≤100 ids. That would be a cosmetic no-op.
- NOTE (review correction): do not bother adding a
Tier 2 — cheap serialization/dedup wins
-
Raise/tune
fetchAllMaxConcurrency(currently4,internal/sections/fetcher.go:51). With 32 home sections this serializes into ~8 waves; total ≈ceil(N/4) × slowest-section. Likely a bigger aggregate- latency lever than the NextUp micro-optimization and cheaper. Measurepgxpoolmax conns first — raising concurrency while cold queries are slow amplifies pool pressure. -
Avoid double NextUp work in combined mode.
fetchContinueWatchingSectioncallsFetchNextUpItemsinline whennext_up_mode="combined"(fetcher.go:436) while thenext_upsection computes it again — compute once and share. Also push dismissal/access filtering into SQL for continue-watching so it stops scanning up to 1000 rows across 10 sequentialListProgressround-trips to fill a 20-item section (fetcher.go:498-522).
Tier 3 — the NextUp content_id rewrite (warm/cold I/O trim, NOT the spike fix)
-
Derive series/season/episode from
content_idin the NextUp CTE instead of joiningepisodes. Confirmed effect: thecompleted_episodesCTE for user 627 drops from 67.5ms / 56,893 buffers to 38.8ms / 13,362 buffers — the 56kepisodes_pkeyprobes vanish. But this does NOT touch the LATERAL (episodes + media_files), which is the legitimately irreducible part and becomes the new dominant term, and it does NOT address the cold-cache spike that Tier 1 #1 fixes. Keep it, but as an optimization, not the headline.Mandatory correctness requirements (do not skip):
::intcasts are required.split_partreturns TEXT. The LATERAL compares against integer columns(e2.season_number, e2.episode_number), and theDISTINCT ONorders byseason_number DESC, episode_number DESC. Mixed(text,text) > (int,int)raisesoperator does not exist: text > integer; forcing both sides to text makes('1','2') > ('1','10')return TRUE (lexicographic), so NextUp would surface the wrong episode. Cast every derived season/episode value toint.- This is NOT fully precedented.
history_source.go:275-282derives only the series-id string (never used numerically). The numeric season/episode derivation is new and is exactly where the lexicographic landmine lives — copyinghistory_sourceverbatim gives the series expr but not the casts. - Fallback for the legacy tail is mandatory. COALESCE to the episodes join
for the 0.06% legacy/local (
local-/Sonyflake) ids using the sameanchoredEpisodePredicate(5 non-empty-components) ashistory_source.go. - Data validated safe for anchored ids: across all 2,110,532 anchored episode rows, derived season/episode match the table columns with 0 mismatches (including season-0/specials); all segments numeric.
Tier 2 — high-frequency jellycompat browse (/Items/Latest, /Items)
These are very high traffic — 10,837 /Items/Latest + 6,030 /Items calls in
24h — so even sub-second slowness is a large aggregate load. 333 /Items/Latest
calls ran >800ms (p50 1.1s, max 1.6s); every slow one requested full Fields
(MediaSources+MediaStreams) with isPlayed=false&groupItems=true.
Root cause is not the detail expansion. It is isPlayed=false (a per-profile
overlay that can't be pushed into SQL) forcing BrowseItems into an over-fetch
loop that advances filters.Offset (internal/jellycompat/content_direct.go:477).
The cross-library recently-added fast path is gated on Offset == 0
(content_direct.go:430); as soon as a heavy watcher needs a 2nd chunk it falls
through to the generic BrowsePage (content_direct.go:435), whose multi-library
plan is a whole-catalog GROUP BY HashAggregate + top-N heapsort over ~147k
movies (internal/catalog/browse.go:544-548).
EXPLAIN (ANALYZE, BUFFERS) of the 2nd-chunk shape (LIMIT 150 OFFSET 150,
type=movie, full projection): 755ms per call (HashAggregate over 147,212
rows, top-N heapsort). The offset-0 fast path
(BrowseRecentlyAddedAcrossLibraries, index walk on
idx_item_libraries_folder_seen_content) is ~1ms/library. So one fall-through =
0.8–1.6s; two (very heavy watchers) reach the top of the range. Only affects
users with 2+ libraries and lots of movie watch history — consistent with "some
calls slow."
-
Keep the
isPlayedover-fetch loop on the fast path. Track a separate chunk offset and re-callBrowseRecentlyAddedAcrossLibrariesfor each chunk (growing top-N bound) instead of advancingfilters.OffsetintoBrowsePage— or give the multi-library recently-added GROUP BY an offset-capable index-ordered plan. Expected: ~0.8–1.6s → ~50–150ms (≈8–10×). -
Drop the redundant per-item
enrichDetailUserDatainGetItemDetailsByIDs(content_direct.go:693-702→:612-614): it runs a single-itemGetProgress+ListCompletedHistoryItemsper item (~100 sequential point queries for 50 items), but the handler already fetched progress in one batched call (resolveUserStateForContentIDs,handlers_items.go:961) anduserDataDTOoverrides it (mapping.go:551-559), so the per-item work is thrown away. Remove or batch it. Expected: shave ~50–150ms of pure waste.
Explicitly out of scope
/api/v1/recommendations/taste-seed/items(4.4–5.5s, every call). Confirmed it only fires on the explicit/taste-seedonboarding page (web/src/pages/TasteSeed.tsxviauseTasteSeedItems); the Home screen renders onlyTasteSeedBanner(dismissed-state check, no items query). 56 calls / 4 users in 24h. Rare, opt-in, not on the homescreen — deliberately deferred.
Ops (not code)
- Enable
pg_stat_statements— confirmed OFF (shared_preload_librariesempty). Enabling it makes future regressions measurable, but it requires a Postgres restart (not a live toggle) — schedule accordingly.
Risk / follow-ups
- The content_id rewrite's
::intcast + lexicographic-ordering trap is the single biggest correctness gap; gate it on an explicit test (episode 2 vs 10 within a season, and theseason DESC, episode DESCtiebreak) before merge. - After the rewrite, the LATERAL (episodes + media_files) becomes the dominant term; measure its cold cost separately — it may warrant its own index review.
- Raising
fetchAllMaxConcurrencytrades DB pool pressure for latency; validate againstpgxpoolmax conns under real concurrency, not just latency. - Cache warming changes staleness semantics for continue-watching; confirm progress writes still invalidate promptly enough that a just-watched item moves.
/Shows/{id}/Episodespagination is client-visible (jellycompat); verify Android/Apple clients tolerate a bounded page +startItemIdcontinuation.
Verification plan
EXPLAIN (ANALYZE, BUFFERS)before/after on the NextUp rewrite foruser_id=627; assert theepisodes_pkeyloop count drops from ~14.5k to ~0 for anchored users.- Replay the worst production queries (Resume
Limit=20+ total-count; long-series Episodes) and confirm sub-second. - Watch
slow section fetch/slow aggregate section fetchcounts in logs after deploy; the hourly:12compat-resume spike should disappear. - Dedicated ordering test for the content_id derivation: a series with episodes
2 and 10 in one season, asserting NextUp picks episode 2 → 3 (not 10 → 11) and
the
DISTINCT ON ... DESCtiebreak picks the highest-numbered completed episode. make lint,go build ./..., targeted unit tests for the content_id SQL derivation (mirror existinghistory_sourcetests, plus the::intcast path).