Skip to content

Conversation

@TMisiukiewicz
Copy link
Contributor

@TMisiukiewicz TMisiukiewicz commented Jun 25, 2025

Details

Performance improvements related to accessing data from cache. Instead of looping on all keys when connecting to entire collection, hold an indexed map for quick access to all collection items.

Related Issues

$ Expensify/App#64950

Automated Tests

Manual Tests

  1. Login into the app
  2. Verify the app loads correctly
  3. Close the app/Refresh the app (if web)
  4. Open the app again
  5. Verify the app loads correctly

Author Checklist

  • I linked the correct issue in the ### Related Issues section above
  • 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
    • MacOS / Desktop
  • 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.mov
Android: mWeb Chrome
android-web.mov
iOS: Native
ios.mp4
iOS: mWeb Safari
ios.web.mp4
MacOS: Chrome / Safari
web.mov
MacOS: Desktop
desktop.mov

@mountiny
Copy link
Contributor

@TMisiukiewicz how will we ensure the old cache is not used once the app loads with this new structure?

@mountiny mountiny requested a review from allgandalf June 26, 2025 06:09
@allgandalf
Copy link

@TMisiukiewicz can you please take the PR out of draft

@TMisiukiewicz
Copy link
Contributor Author

@allgandalf I'll get back to this on Monday - I want to verify the approach where keys are not duplicated across two objects in memory

@mountiny
Copy link
Contributor

@TMisiukiewicz lets keep this one at the top of your list except deploy blockers please, thanks

@TMisiukiewicz
Copy link
Contributor Author

@mountiny yup I'm on it today

@TMisiukiewicz
Copy link
Contributor Author

Ok I feel we can proceed with this PR with the current approach. With keeping the indexed collection items as a separate map we can provide a backward compatible solution and avoid building additional complexity around cache eviction. Let me do some more tests before I open PR for a review

@TMisiukiewicz TMisiukiewicz marked this pull request as ready for review June 30, 2025 12:13
@TMisiukiewicz TMisiukiewicz requested a review from a team as a code owner June 30, 2025 12:13
@TMisiukiewicz
Copy link
Contributor Author

Opened PR for a review. Seems like perf tests are failing due to its flakiness

@melvin-bot melvin-bot bot requested review from arosiclair and removed request for a team June 30, 2025 12:13
Copy link
Contributor

@arosiclair arosiclair left a comment

Choose a reason for hiding this comment

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

Changes LGTM

@allgandalf
Copy link

Please fix reassure test

@mountiny mountiny self-requested a review June 30, 2025 22:05
@mountiny
Copy link
Contributor

@allgandalf The reassure tests are flaky, please proceed with testing with priority and test these changes withing app please. If you are not available for this one, we can re-assign. Thank you

lib/OnyxCache.ts Outdated
* Get all data for a collection key
*/
getCollectionData(collectionKey: OnyxKey): Record<OnyxKey, OnyxValue<OnyxKey>> | undefined {
const memberKeys = this.collectionIndex[collectionKey];
Copy link
Contributor

Choose a reason for hiding this comment

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

Should you use the getCollectionMemberKeys you created?

lib/OnyxCache.ts Outdated
this.collectionKeys = collectionKeys;
// Initialize collection indexes for existing collection keys
collectionKeys.forEach((collectionKey) => {
if (this.collectionIndex[collectionKey]) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Should you use getCollectionMemberKeys?

lib/OnyxCache.ts Outdated
if (value === null || value === undefined) {
this.addNullishStorageKey(key);
// Remove from collection index if it's a collection member
if (collectionKey && this.collectionIndex[collectionKey]) {
Copy link
Contributor

Choose a reason for hiding this comment

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

getCollectionMemberKeys

lib/OnyxCache.ts Outdated

// Update collection index if this is a collection member
const collectionKey = this.getCollectionKey(key);
if (collectionKey && this.collectionIndex[collectionKey]) {
Copy link
Contributor

Choose a reason for hiding this comment

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

getCollectionMemberKeys

lib/OnyxCache.ts Outdated

// Update collection index if this is a collection member
if (collectionKey) {
if (!this.collectionIndex[collectionKey]) {
Copy link
Contributor

Choose a reason for hiding this comment

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

getCollectionMemberKeys

lib/OnyxCache.ts Outdated
if (value === null || value === undefined) {
delete this.storageMap[key];
// Remove from collection index if it's a collection member
if (collectionKey && this.collectionIndex[collectionKey]) {
Copy link
Contributor

Choose a reason for hiding this comment

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

getCollectionMemberKeys

@mountiny
Copy link
Contributor

@TMisiukiewicz Can you please merge main to check if the tests are now not flaky anymore cc @fabioh8010

@mountiny mountiny moved this from Done to CRITICAL PR in [#whatsnext] #quality Jul 1, 2025
@TMisiukiewicz
Copy link
Contributor Author

thank you @mountiny, comments addressed. Updated the branch with main, let's see if Reassure job is green now

@TMisiukiewicz
Copy link
Contributor Author

Reassure is still failing, I think it is still due to flakiness because it does not seem to be related to my changes 😞

@fabioh8010
Copy link
Contributor

@TMisiukiewicz yeah I think the same, let me test this PR locally a couple of times.

@fabioh8010
Copy link
Contributor

@TMisiukiewicz @mountiny I ran Reassure on this PR locally a couple of times and we don't have regressions from it

@allgandalf
Copy link

allgandalf commented Jul 1, 2025

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I verified proper code patterns were followed (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 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 any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • 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 verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • 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.ts or at the top of the file that uses the constant) are defined as such
  • 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
    • 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 a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • 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 PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • 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 reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2025-07-02.at.9.42.11.AM.mov
MacOS: Desktop

@mountiny mountiny merged commit 79ba513 into Expensify:main Jul 2, 2025
4 of 5 checks passed
@github-project-automation github-project-automation bot moved this from CRITICAL PR to Done in [#whatsnext] #quality Jul 2, 2025
@os-botify
Copy link
Contributor

os-botify bot commented Jul 2, 2025

🚀 Published to npm in 2.0.116 🎉

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

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

6 participants