Skip to content

[WIP] Make Onyx.update and Onyx.multiSet apply atomically - #858

Draft
fabioh8010 wants to merge 4 commits into
Expensify:mainfrom
callstack-internal:feature/atomic-onyx-update
Draft

fabioh8010 wants to merge 4 commits into
Expensify:mainfrom
callstack-internal:feature/atomic-onyx-update

Conversation

@fabioh8010

@fabioh8010 fabioh8010 commented Oct 18, 2026 •

Copy link
Copy Markdown
Contributor

Onyx.update wrote its keys to the cache over three microtasks (sets, then single-key merges, then grouped collections), notifying subscribers after each wave, so subscribers and React renders could see a half-applied batch.

Onyx.update now loads anything it needs from storage first (a pending clear, the persisted key index, merge targets evicted from the cache), then writes every key to the cache in one synchronous pass and notifies once. An Onyx.merge still queued for one of its keys is applied first, keeping call order. Onyx.multiSet notifies the same way.

Notifications are held by onyxSubscriptionManager.batch(), which delivers each key once with the value the cache holds at delivery time.

Details

Related Issues

Expensify/App#101801

Linked E/App PR

Expensify/App#104308

Automated Tests

Manual Tests

Author Checklist

  • I linked the correct issue in the ### Related Issues section above
  • I linked the corresponding Expensify/App PR in the ### Linked E/App PR section above, and verified this change against it (E/App CI passed and manual testing completed)
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android / native
    • Android / Chrome
    • iOS / native
    • iOS / Safari
    • MacOS / Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

Onyx.update wrote its keys to the cache over three microtasks (sets, then
single-key merges, then grouped collections), notifying subscribers after
each wave, so subscribers and React renders could see a half-applied batch.

Onyx.update now loads anything it needs from storage first (a pending
clear, the persisted key index, merge targets evicted from the cache),
then writes every key to the cache in one synchronous pass and notifies
once. An Onyx.merge still queued for one of its keys is applied first,
keeping call order. Onyx.multiSet notifies the same way.

Notifications are held by onyxSubscriptionManager.batch(), which delivers
each key once with the value the cache holds at delivery time.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
fabioh8010 and others added 3 commits October 19, 2026 11:21
When the update applied in separate microtask waves, individual sets
landed first, then snapshot merges, setCollection, partial collection
sets and single-key merges, and grouped collection merges last. That
order decides which members a collection gains first, so the key order
code sees when reading a collection. Apply the writes in that same order
and lock it with a test.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Applying the update inside the call changed what code right after
Onyx.update() reads. Actions that write in quick succession read module
state that subscribers keep in sync, and started seeing each other's
optimistic writes, which their rollback data was not written for. Some
App tests also stopped finishing.

The update now applies one microtask after the call, as before, still in
one synchronous pass with one round of notifications. An Onyx.merge
called earlier has its own microtask scheduled first, so it lands before
the update without being folded in. An Onyx.merge still queued when the
update applies was called after it, so it is left to apply on top.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
An update that has to read from storage first (a key evicted from the
cache, or a running Onyx.clear) applies later than one with nothing to
load. A later update in the same tick could then apply first, and the
earlier one would overwrite it.

While an update is waiting, updates called after it now wait behind it.
An update with nothing to wait for, and nothing waiting before it, still
applies a microtask after the call.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@fabioh8010

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 19, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-19T10:52:43.767809Z 82bc570 Manual request
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 82bc5700e0

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread lib/OnyxUtils.ts
Comment on lines +1275 to +1276
const applied = Promise.all([previousDelayedUpdate, preparation]).then(() => {
storageWrites = applyUpdate();

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Serialize later merges behind delayed updates

If the store has no cached keys or this update must prewarm an evicted merge target, preparation remains pending while an Onyx.merge() invoked immediately afterward can drain its queue before this continuation runs. Once preparation finishes, mergeInUpdate() applies the older update on top and overwrites overlapping fields (for example, update {value: 1} followed by merge {value: 2} can finish as 1), so Onyx.merge() also needs to respect this delayed-update barrier.

Useful? React with 👍 / 👎.

Comment thread lib/Onyx.ts
},
[OnyxUtils.METHOD.CLEAR]: () => {
clearPromise = clear();
clear();

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Hold clear notifications until the update batch

When an update payload contains CLEAR alongside SET or MERGE entries, this starts the normal asynchronous clear, which emits reset notifications before pendingClear lets applyUpdate enter onyxSubscriptionManager.batch. Existing subscribers therefore observe the empty/default state and are notified again with the final update, allowing callbacks to act on a partial update despite the new atomicity guarantee; the clear notifications need to be held with the rest of this update.

Useful? React with 👍 / 👎.

@huult

huult commented Oct 23, 2026

Copy link
Copy Markdown
Contributor

Tag me when it's ready

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants