Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove CacheNode.status field #59472

Merged
merged 1 commit into from Dec 11, 2023

Conversation

acdlite
Copy link
Contributor

@acdlite acdlite commented Dec 11, 2023

I'm about to make some changes to the CacheNode data structure, and before I add more complexity, I noticed an opportunity to remove some — the status field isn't logically necessary:

  • The DATA_FETCH and LAZY_INITIALIZED states are already treated as equivalent; in either case, they will cause the render to suspend during render, trigger a lazy data fetch (if one hasn't been triggered already), and then update the router with the result of the response.
  • subTreeData is null if and only if the node is in the DATA_FETCH or LAZY_INITIALIZED states, and it always causes the render to suspend. So rather than check if the status is one of those, we can check if subTreeData is null.

The most important changes are to CacheNode type in app-router-context.shared-runtime and the lazy fetching logic in LayoutRouter. Everything else in the diff is related to deleting the status field wherever a CacheNode is referenced, like in the reducer unit tests.

Closes NEXT-1842

@ijjk ijjk added created-by: Next.js team PRs by the Next.js team type: next labels Dec 11, 2023
@ijjk
Copy link
Member

ijjk commented Dec 11, 2023

Tests Passed

@acdlite acdlite force-pushed the remove-cachenode-status-field branch from cf00aa3 to b47a40b Compare December 11, 2023 03:12
@ijjk
Copy link
Member

ijjk commented Dec 11, 2023

Stats from current PR

Default Build
General
vercel/next.js canary acdlite/next.js remove-cachenode-status-field Change
buildDuration 10.9s 10.8s N/A
buildDurationCached 6.1s 6.1s N/A
nodeModulesSize 200 MB 200 MB N/A
nextStartRea..uration (ms) 423ms 429ms N/A
Client Bundles (main, webpack)
vercel/next.js canary acdlite/next.js remove-cachenode-status-field Change
170-HASH.js gzip 26.9 kB 26.7 kB N/A
199.HASH.js gzip 181 B 185 B N/A
3f784ff6-HASH.js gzip 53.3 kB 53.3 kB
framework-HASH.js gzip 45.2 kB 45.2 kB
main-app-HASH.js gzip 240 B 241 B N/A
main-HASH.js gzip 31.8 kB 31.6 kB N/A
webpack-HASH.js gzip 1.7 kB 1.7 kB N/A
Overall change 98.5 kB 98.5 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary acdlite/next.js remove-cachenode-status-field Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary acdlite/next.js remove-cachenode-status-field Change
_app-HASH.js gzip 195 B 194 B N/A
_error-HASH.js gzip 183 B 182 B N/A
amp-HASH.js gzip 501 B 501 B
css-HASH.js gzip 321 B 321 B
dynamic-HASH.js gzip 2.5 kB 2.5 kB N/A
edge-ssr-HASH.js gzip 255 B 255 B
head-HASH.js gzip 349 B 350 B N/A
hooks-HASH.js gzip 368 B 369 B N/A
image-HASH.js gzip 4.27 kB 4.27 kB N/A
index-HASH.js gzip 255 B 256 B N/A
link-HASH.js gzip 2.61 kB 2.6 kB N/A
routerDirect..HASH.js gzip 311 B 309 B N/A
script-HASH.js gzip 384 B 384 B
withRouter-HASH.js gzip 307 B 306 B N/A
1afbb74e6ecf..834.css gzip 106 B 106 B
Overall change 1.57 kB 1.57 kB
Client Build Manifests
vercel/next.js canary acdlite/next.js remove-cachenode-status-field Change
_buildManifest.js gzip 484 B 482 B N/A
Overall change 0 B 0 B
Rendered Page Sizes
vercel/next.js canary acdlite/next.js remove-cachenode-status-field Change
index.html gzip 529 B 527 B N/A
link.html gzip 541 B 540 B N/A
withRouter.html gzip 524 B 523 B N/A
Overall change 0 B 0 B
Edge SSR bundle Size
vercel/next.js canary acdlite/next.js remove-cachenode-status-field Change
edge-ssr.js gzip 93.8 kB 93.7 kB N/A
page.js gzip 146 kB 146 kB N/A
Overall change 0 B 0 B
Middleware size
vercel/next.js canary acdlite/next.js remove-cachenode-status-field Change
middleware-b..fest.js gzip 628 B 621 B N/A
middleware-r..fest.js gzip 151 B 151 B
middleware.js gzip 37.4 kB 37.4 kB N/A
edge-runtime..pack.js gzip 1.92 kB 1.92 kB
Overall change 2.07 kB 2.07 kB
Next Runtimes
vercel/next.js canary acdlite/next.js remove-cachenode-status-field Change
app-page-exp...dev.js gzip 168 kB 168 kB N/A
app-page-exp..prod.js gzip 94 kB 93.9 kB N/A
app-page-tur..prod.js gzip 94.7 kB 94.7 kB N/A
app-page-tur..prod.js gzip 89.3 kB 89.2 kB N/A
app-page.run...dev.js gzip 138 kB 138 kB N/A
app-page.run..prod.js gzip 88.6 kB 88.5 kB N/A
app-route-ex...dev.js gzip 24 kB 23.9 kB N/A
app-route-ex..prod.js gzip 16.7 kB 16.6 kB N/A
app-route-tu..prod.js gzip 16.7 kB 16.6 kB N/A
app-route-tu..prod.js gzip 16.3 kB 16.2 kB N/A
app-route.ru...dev.js gzip 23.4 kB 23.4 kB N/A
app-route.ru..prod.js gzip 16.3 kB 16.2 kB N/A
pages-api-tu..prod.js gzip 9.37 kB 9.37 kB
pages-api.ru...dev.js gzip 9.64 kB 9.64 kB
pages-api.ru..prod.js gzip 9.37 kB 9.37 kB
pages-turbo...prod.js gzip 22 kB 21.9 kB N/A
pages.runtim...dev.js gzip 22.6 kB 22.5 kB N/A
pages.runtim..prod.js gzip 21.9 kB 21.9 kB N/A
server.runti..prod.js gzip 49.4 kB 49.4 kB
Overall change 77.8 kB 77.8 kB
Diff details
Diff for page.js

Diff too large to display

Diff for edge-ssr.js

Diff too large to display

Diff for 170-HASH.js

Diff too large to display

Diff for main-HASH.js

Diff too large to display

Diff for app-page-exp..ntime.dev.js
failed to diff
Diff for app-page-exp..time.prod.js

Diff too large to display

Diff for app-page-tur..time.prod.js

Diff too large to display

Diff for app-page-tur..time.prod.js

Diff too large to display

Diff for app-page.runtime.dev.js

Diff too large to display

Diff for app-page.runtime.prod.js

Diff too large to display

Diff for app-route-ex..ntime.dev.js

Diff too large to display

Diff for app-route-ex..time.prod.js

Diff too large to display

Diff for app-route-tu..time.prod.js

Diff too large to display

Diff for app-route-tu..time.prod.js

Diff too large to display

Diff for app-route.runtime.dev.js

Diff too large to display

Diff for app-route.ru..time.prod.js

Diff too large to display

Diff for pages-turbo...time.prod.js

Diff too large to display

Diff for pages.runtime.dev.js

Diff too large to display

Diff for pages.runtime.prod.js

Diff too large to display

Commit: f4206e8

@acdlite acdlite force-pushed the remove-cachenode-status-field branch from b47a40b to 4fc6792 Compare December 11, 2023 03:17
I'm about to make some changes to the CacheNode data structure, and
before I add more complexity, I noticed an opportunity to remove some —
the `status` field isn't logically necessary:

- The `DATA_FETCH` and `LAZY_INITIALIZED` states are already treated as
  equivalent; in either case, they will cause the render to suspend
  during render, trigger a lazy data fetch (if one hasn't been triggered
  already), and then update the router with the result of the response.
- `subTreeData` is null if and only if the node is in the `DATA_FETCH`
  or `LAZY_INITIALIZED` states, and it always causes the render to
  suspend. So rather than check if the status is one of those, we can
  check if `subTreeData` is null.

The most important changes are to CacheNode type in
app-router-context.shared-runtime and the lazy fetching logic in
LayoutRouter. Everything else in the diff is related to deleting the
`status` field wherever a CacheNode is referenced, like in the reducer
unit tests.
@acdlite acdlite merged commit c370aa9 into vercel:canary Dec 11, 2023
68 checks passed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants