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

refactor(turbo-tasks): Make State require OperationValue #73876

Merged
merged 2 commits into from
Dec 20, 2024

Conversation

bgw
Copy link
Member

@bgw bgw commented Dec 13, 2024

I started writing this PR by requiring OperationValue in State:

  impl<T> State<T> {
-     pub fn new(value: T) -> Self {
+     pub fn new(value: T) -> Self
+    where
+        T: OperationValue,
+    {

And then went through changing every compilation error that occurred as a result.

Hacks

There are some hacks in a number of places here where we incorrectly convert ResolvedVc to OperationValue.

Unfortunately these have to exist because it's impractical to convert everything to OperationValue. OperationValues are harder to construct as they must be created directly from the return value of an unresolved function call.

Why does State<T> need T: OperationValue?

OperationVc types require that .connect() is called before their value can be read.

As an internally-mutable type, State allows Vcs to be passed in ways that we cannot track. .connect() re-connects the Vc to the dependency graph so that strong resolution is possible.

Without this, you might end up with stale results when reading a Vc inside of State, which can be very hard to debug.

Fundamentally, I think State is unsound, but this is a band-aid on it until we can migrate to a better solution (likely effect-style Collectibles for VersionedContentMap).

Closes PACK-3675

@ijjk
Copy link
Member

ijjk commented Dec 13, 2024

Stats from current PR

Default Build
General
vercel/next.js canary vercel/next.js bgw/state-requires-operation-value Change
buildDuration 24.8s 22.4s N/A
buildDurationCached 21.1s 18.7s N/A
nodeModulesSize 416 MB 416 MB
nextStartRea..uration (ms) 628ms 587ms N/A
Client Bundles (main, webpack)
vercel/next.js canary vercel/next.js bgw/state-requires-operation-value Change
1187-HASH.js gzip 52.4 kB 52.4 kB N/A
8276.HASH.js gzip 169 B 168 B N/A
8377-HASH.js gzip 5.36 kB 5.36 kB N/A
bccd1874-HASH.js gzip 52.8 kB 52.8 kB N/A
framework-HASH.js gzip 57.5 kB 57.5 kB N/A
main-app-HASH.js gzip 232 B 235 B N/A
main-HASH.js gzip 34.1 kB 34.1 kB N/A
webpack-HASH.js gzip 1.71 kB 1.71 kB N/A
Overall change 0 B 0 B
Legacy Client Bundles (polyfills)
vercel/next.js canary vercel/next.js bgw/state-requires-operation-value Change
polyfills-HASH.js gzip 39.4 kB 39.4 kB
Overall change 39.4 kB 39.4 kB
Client Pages
vercel/next.js canary vercel/next.js bgw/state-requires-operation-value Change
_app-HASH.js gzip 193 B 193 B
_error-HASH.js gzip 193 B 193 B
amp-HASH.js gzip 512 B 510 B N/A
css-HASH.js gzip 343 B 342 B N/A
dynamic-HASH.js gzip 1.84 kB 1.84 kB
edge-ssr-HASH.js gzip 265 B 265 B
head-HASH.js gzip 363 B 362 B N/A
hooks-HASH.js gzip 393 B 392 B N/A
image-HASH.js gzip 4.49 kB 4.49 kB N/A
index-HASH.js gzip 268 B 268 B
link-HASH.js gzip 2.35 kB 2.34 kB N/A
routerDirect..HASH.js gzip 328 B 328 B
script-HASH.js gzip 397 B 397 B
withRouter-HASH.js gzip 323 B 326 B N/A
1afbb74e6ecf..834.css gzip 106 B 106 B
Overall change 3.59 kB 3.59 kB
Client Build Manifests
vercel/next.js canary vercel/next.js bgw/state-requires-operation-value Change
_buildManifest.js gzip 749 B 746 B N/A
Overall change 0 B 0 B
Rendered Page Sizes
vercel/next.js canary vercel/next.js bgw/state-requires-operation-value Change
index.html gzip 522 B 524 B N/A
link.html gzip 537 B 537 B
withRouter.html gzip 518 B 520 B N/A
Overall change 537 B 537 B
Edge SSR bundle Size
vercel/next.js canary vercel/next.js bgw/state-requires-operation-value Change
edge-ssr.js gzip 129 kB 129 kB N/A
page.js gzip 206 kB 206 kB N/A
Overall change 0 B 0 B
Middleware size
vercel/next.js canary vercel/next.js bgw/state-requires-operation-value Change
middleware-b..fest.js gzip 670 B 665 B N/A
middleware-r..fest.js gzip 155 B 156 B N/A
middleware.js gzip 31.3 kB 31.3 kB N/A
edge-runtime..pack.js gzip 844 B 844 B
Overall change 844 B 844 B
Next Runtimes
vercel/next.js canary vercel/next.js bgw/state-requires-operation-value Change
274-experime...dev.js gzip 322 B 322 B
274.runtime.dev.js gzip 314 B 314 B
app-page-exp...dev.js gzip 359 kB 359 kB
app-page-exp..prod.js gzip 129 kB 129 kB
app-page-tur..prod.js gzip 141 kB 141 kB
app-page-tur..prod.js gzip 137 kB 137 kB
app-page.run...dev.js gzip 348 kB 348 kB
app-page.run..prod.js gzip 125 kB 125 kB
app-route-ex...dev.js gzip 37.4 kB 37.4 kB
app-route-ex..prod.js gzip 25.5 kB 25.5 kB
app-route-tu..prod.js gzip 25.5 kB 25.5 kB
app-route-tu..prod.js gzip 25.3 kB 25.3 kB
app-route.ru...dev.js gzip 39.1 kB 39.1 kB
app-route.ru..prod.js gzip 25.3 kB 25.3 kB
pages-api-tu..prod.js gzip 9.69 kB 9.69 kB
pages-api.ru...dev.js gzip 11.6 kB 11.6 kB
pages-api.ru..prod.js gzip 9.68 kB 9.68 kB
pages-turbo...prod.js gzip 21.7 kB 21.7 kB
pages.runtim...dev.js gzip 27.5 kB 27.5 kB
pages.runtim..prod.js gzip 21.7 kB 21.7 kB
server.runti..prod.js gzip 916 kB 916 kB
Overall change 2.44 MB 2.44 MB
build cache
vercel/next.js canary vercel/next.js bgw/state-requires-operation-value Change
0.pack gzip 2.08 MB 2.08 MB N/A
index.pack gzip 73.9 kB 73.7 kB N/A
Overall change 0 B 0 B
Diff details
Diff for main-HASH.js

Diff too large to display

Commit: 7aa49a6

@bgw bgw force-pushed the bgw/operation-construction branch 2 times, most recently from 4643014 to 5e78f92 Compare December 13, 2024 21:04
@bgw bgw force-pushed the bgw/state-requires-operation-value branch from a0a77bc to 7db7c5c Compare December 13, 2024 21:04
@bgw bgw force-pushed the bgw/operation-construction branch 2 times, most recently from 2f5497e to 069afc7 Compare December 16, 2024 19:19
@bgw bgw force-pushed the bgw/state-requires-operation-value branch from 7db7c5c to d2b9792 Compare December 16, 2024 19:20
@bgw bgw force-pushed the bgw/operation-construction branch from 069afc7 to 2170acd Compare December 16, 2024 23:42
@bgw bgw force-pushed the bgw/state-requires-operation-value branch from d2b9792 to 3cf6efa Compare December 16, 2024 23:42
@bgw bgw changed the base branch from bgw/operation-construction to bgw/make-operation-values December 16, 2024 23:42
@ijjk
Copy link
Member

ijjk commented Dec 16, 2024

Tests Passed

@bgw bgw requested a review from sokra December 17, 2024 01:05
@bgw bgw marked this pull request as ready for review December 17, 2024 01:06
@bgw bgw changed the title draft(turbo-tasks): Make State require OperationValue refactor(turbo-tasks): Make State require OperationValue Dec 17, 2024
@bgw bgw force-pushed the bgw/make-operation-values branch from 455bc9a to 2b20793 Compare December 17, 2024 22:10
@bgw bgw force-pushed the bgw/state-requires-operation-value branch from 3cf6efa to 932adf3 Compare December 17, 2024 22:11
@bgw bgw changed the base branch from bgw/make-operation-values to bgw/operation-construction December 17, 2024 22:11
bgw added a commit that referenced this pull request Dec 17, 2024
…ed in `State<T>` types into OperationValues and/or NonLocalValues (#74008)

This is a refactor ahead of #73876

This adds the `OperationValue` trait (and in a few cases, `NonLocalValue`) to a large number of types where it can be trivially done.

These types are needed in #73876 because they're used somewhere inside of a `State<...>` type (most likely transitively).
@bgw bgw force-pushed the bgw/operation-construction branch 2 times, most recently from 6984ce9 to efe589d Compare December 17, 2024 23:49
@bgw bgw force-pushed the bgw/state-requires-operation-value branch from 932adf3 to 7b4adf4 Compare December 17, 2024 23:49
Deserialize,
Debug,
NonLocalValue,
)]
struct MapEntry {
// must not be resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// must not be resolved

The comment is no longer needed as OperationVc tells the same on type level

@@ -191,6 +191,7 @@ pub enum Update {
#[derive(PartialEq, Eq, Debug, Clone, TraceRawVcs, ValueDebugFormat, NonLocalValue)]
pub struct TotalUpdate {
/// The version this update will bring the object to.
// TODO: This trace_ignore is *very* wrong, and could cause problems if/when we add a GC
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's very unsound, but currently correct. All values that implement the Version trait, must not contain Vcs (they must be flat. This is a requirement of the Version trait, which represents a frozen version. It can't contain Vcs as they might change over-time, which is not what Version represents.

We should probably at least document that on the Version trait. Cool would be some kind of FrozenValue trait, but it was not worth it for the few cases where we use that (Version, PlainIssue, PlainDiagnostic`).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's actually not correct because EcmascriptDevChunkListVersion contains a ResolvedVc, but I suppose the blame for that is on EcmascriptDevChunkListVersion, not on this code.

I'll make some updates to the comments and document this on Version though!

Enforcing this statically would be rather painful, as it would require adding yet another marker trait for values with no vc (resolved, operation, or otherwise).

@bgw bgw force-pushed the bgw/operation-construction branch from efe589d to 60e589c Compare December 20, 2024 01:40
@bgw bgw force-pushed the bgw/state-requires-operation-value branch from 631ff59 to e6b66e1 Compare December 20, 2024 01:40
@bgw bgw changed the base branch from bgw/operation-construction to graphite-base/73876 December 20, 2024 02:08
@bgw bgw force-pushed the graphite-base/73876 branch from 60e589c to d240d45 Compare December 20, 2024 02:09
@bgw bgw force-pushed the bgw/state-requires-operation-value branch from e6b66e1 to c6fe120 Compare December 20, 2024 02:09
@bgw bgw changed the base branch from graphite-base/73876 to canary December 20, 2024 02:09
@bgw bgw force-pushed the bgw/state-requires-operation-value branch from c6fe120 to 7aa49a6 Compare December 20, 2024 02:09
@bgw bgw merged commit afddbe7 into canary Dec 20, 2024
125 of 130 checks passed
Copy link
Member Author

bgw commented Dec 20, 2024

Merge activity

  • Dec 19, 10:12 PM EST: A user merged this pull request with Graphite.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
created-by: Turbopack team PRs by the Turbopack team. Turbopack Related to Turbopack with Next.js.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants