Unverified Commit cdc390ba authored by dan's avatar dan Committed by GitHub

Serve cached misses from the filesystem route cache (#96230)

`getItem` stores `null` for paths that don't resolve, but checks the
cached value with `if (lruResult)`, so a cached `null` is never served:
every request for an unknown path — including every dynamic-route
request — re-runs the lookup. It's been this way since the cache was
introduced in #52492.

Return the cached entry whenever the key is present. This can't go
stale: in production the item sets are only populated during
`setupFsCheck`, and the LRU is disabled in dev.

Cached misses are stored as a dedicated sentinel instead of `null`.
Since serving a cached miss has no observable effect, no test can catch
this regressing — that is also why it went unnoticed. With the sentinel
it's a type error instead: reintroducing the truthy check fails `pnpm
types` (verified). Same pattern as `invalidSourceMap` in
`source-maps.ts`.

Stacked on #96229, which bounds what negative entries can retain.

## Test Plan

No direct test: the change is unobservable by design, and the existing
e2e suites assert that it stays that way. The regression guard is the
type system, as above. `test/e2e/app-dir/not-found/basic` passes in prod
mode (14/14), exercising the negative-cache path.
parent 9a31a176
...@@ -123,6 +123,10 @@ function flatKeyCopy(key: string): string { ...@@ -123,6 +123,10 @@ function flatKeyCopy(key: string): string {
return JSON.parse(JSON.stringify(key)) return JSON.parse(JSON.stringify(key))
} }
// Cached result for paths that resolve to nothing. Not null, so that a
// cached miss can't be conflated with an uncached key (undefined).
const notFound = Symbol('not-found')
export async function setupFsCheck(opts: { export async function setupFsCheck(opts: {
dir: string dir: string
dev: boolean dev: boolean
...@@ -130,12 +134,12 @@ export async function setupFsCheck(opts: { ...@@ -130,12 +134,12 @@ export async function setupFsCheck(opts: {
config: NextConfigRuntime config: NextConfigRuntime
}) { }) {
const getItemsLru = !opts.dev const getItemsLru = !opts.dev
? new LRUCache<FsOutput | null>(FS_LRU_MAX_SIZE, function length( ? new LRUCache<FsOutput | typeof notFound>(FS_LRU_MAX_SIZE, function length(
value, value,
key key
) { ) {
const size = FS_LRU_ENTRY_OVERHEAD + key.length const size = FS_LRU_ENTRY_OVERHEAD + key.length
if (!value) { if (value === notFound) {
// Negative cache entries only retain their key. // Negative cache entries only retain their key.
return size return size
} }
...@@ -491,8 +495,8 @@ export async function setupFsCheck(opts: { ...@@ -491,8 +495,8 @@ export async function setupFsCheck(opts: {
const itemKey = originalItemPath const itemKey = originalItemPath
const lruResult = getItemsLru?.get(itemKey) const lruResult = getItemsLru?.get(itemKey)
if (lruResult) { if (lruResult !== undefined) {
return lruResult return lruResult === notFound ? null : lruResult
} }
const { basePath } = opts.config const { basePath } = opts.config
...@@ -755,7 +759,7 @@ export async function setupFsCheck(opts: { ...@@ -755,7 +759,7 @@ export async function setupFsCheck(opts: {
} }
} }
getItemsLru?.set(flatKeyCopy(itemKey), null) getItemsLru?.set(flatKeyCopy(itemKey), notFound)
return null return null
}, },
getDynamicRoutes() { getDynamicRoutes() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment