Add cache to buildSearchQueryJSON to avoid re-parsing identical queries by OlimpiaZurek · Pull Request #82931 · Expensify/App

OlimpiaZurek · 2026-02-19T12:58:46Z

Explanation of Change

This PR adds a simple LRU cache to the buildSearchQueryJSON function to avoid re-parsing identical search queries with the PEG parser. The function is called from 64+ sites across the codebase, many of which fire during the same render cycle with identical query strings, causing the parser to run multiple times unnecessarily.

The cache uses a Map with a maximum size limit of 50 entries. When the limit is reached, the oldest entry is removed (simple FIFO eviction). The cache key includes both the main query and the optional rawQuery parameter to ensure correct cache hits.

Fixed Issues

$ #82994

Tests

Go to Reports
Set a chart view query (for example: type:expense groupBy:category view:bar)
Click on a chart bar to drill into a specific category
Press back to return to the chart view
Verify that the chart still renders correctly with the original groupBy and view, and doesn’t get flattened into a table view

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

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

🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>

…hQueryJSON

luacmartins

LGTM

melvin-bot · 2026-02-20T09:14:07Z

@Krishna2323 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

Krishna2323 · 2026-02-20T09:18:01Z

Reviewing...

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c74ed925f0

ℹ️ 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".

chatgpt-codex-connector · 2026-02-20T09:24:27Z

src/libs/SearchQueryUtils.ts

+    if (buildSearchQueryJSONCache.has(cacheKey)) {
+        return buildSearchQueryJSONCache.get(cacheKey);


Avoid returning mutable cached query objects

This now returns the same cached SearchQueryJSON instance to every caller, but some callers mutate the returned object in place (for example SearchChartView sets newQueryJSON.groupBy and newQueryJSON.view in src/components/Search/SearchChartView.tsx:165-166). After one such mutation, later buildSearchQueryJSON() calls for the same query can observe altered fields and stale hashes from the pre-mutation parse, which changes search behavior based on call order instead of input.

Useful? React with 👍 / 👎.

This is a critical bug.

Fixed, both cache miss and hit paths now return a shallow clone, so the cached object is never exposed directly. Checked all other callers and SearchChartView seems to be the only direct mutation site. Everything else is read-only, uses spread, or cloneDeep.

chatgpt-codex-connector · 2026-02-20T09:24:27Z

src/libs/SearchQueryUtils.ts

+const BUILD_SEARCH_QUERY_JSON_CACHE_MAX_SIZE = 50;
+
 function buildSearchQueryJSON(query: SearchQueryString, rawQuery?: SearchQueryString) {
+    const cacheKey = rawQuery ? `${query}|||${rawQuery}` : query;


Build an unambiguous cache key for query/rawQuery

The cache key rawQuery ? ${query}|||${rawQuery} : query can collide for valid inputs (e.g. query='foo|||bar', rawQuery=undefined vs query='foo', rawQuery='bar'), because the parser allows | in free-text tokens (src/libs/SearchParser/searchParser.peggy, freeTextFilter matches non-whitespace characters). A collision returns the wrong cached parse result and hash for the current inputs.

Useful? React with 👍 / 👎.

Krishna2323 · 2026-02-20T09:49:21Z

@OlimpiaZurek Does it make sense to add unit tests for the cache? Since it's a module-level Map that silently changes the behavior of a function used across 60+ call sites, it would be good to have a few tests locking in the contract — e.g. same input returns the same reference, eviction works at the size limit, and parse errors don't get cached.

heyjennahay

Product review not required

OlimpiaZurek · 2026-02-20T12:59:22Z

@OlimpiaZurek Does it make sense to add unit tests for the cache? Since it's a module-level Map that silently changes the behavior of a function used across 60+ call sites, it would be good to have a few tests locking in the contract — e.g. same input returns the same reference, eviction works at the size limit, and parse errors don't get cached.

Good idea! Added a few tests, including one that directly verifies the mutation fix.

Krishna2323 · 2026-02-20T16:43:25Z

@OlimpiaZurek I think manual testing would be helpful here since the cache impacts search behavior globally. We can add this as a QA test.

Chart view mutation scenario

Go to Reports
Set a chart view query (for example: type:expense groupBy:category view:bar)
Click on a chart bar to drill into a specific category
Press back to return to the chart view
Verify that the chart still renders correctly with the original groupBy and view, and doesn’t get flattened into a table view

Krishna2323 · 2026-02-20T17:00:21Z

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_native.mp4

Android: mWeb Chrome

android_chrome.mp4

iOS: HybridApp

ios_native.mp4

iOS: mWeb Safari

ios_safari.mp4

MacOS: Chrome / Safari

web_chrome.mp4

Krishna2323

LGTM! 🚀

We can add QA tests: #82931 (comment)

github-actions · 2026-02-20T17:09:05Z

🚧 @luacmartins has triggered a test Expensify/App build. You can view the workflow run here.

OSBotify · 2026-02-20T17:10:46Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2026-02-20T17:13:05Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #82931.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-f8835d1-98deb5d-c158ab6ef75fb0cef0b9ff206a8e41a5afd86799/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-f8835d1-98deb5d-0dc897430d4f2bb621ef258702be275bdf0960fa/index.html

Web 🕸️
https://82931.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

marcaaron

Woo! Looks great.

marcaaron · 2026-02-20T19:09:00Z

src/libs/SearchQueryUtils.ts


+// Cache for buildSearchQueryJSON to avoid re-running the PEG parser for identical queries.
+// This is a pure function called from 64+ sites — many fire during the same render cycle
+// with identical query strings, each running the full parser from scratch.


Suggested change

// with identical query strings, each running the full parser from scratch.

// with identical query strings and without this cache we would run the full parser from scratch.

OSBotify · 2026-02-24T01:18:44Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.3.25-0 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	failure ❌
🍎 iOS 🍎	cancelled 🔪

melvin-bot bot assigned OlimpiaZurek Feb 19, 2026

OlimpiaZurek force-pushed the perf/cache-buildSearchQueryJSON branch from 5fbe839 to 2bc1144 Compare February 19, 2026 13:01

OlimpiaZurek and others added 2 commits February 19, 2026 14:10

Add cache to buildSearchQueryJSON to avoid re-parsing identical queries

ffea2e9

🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>

Merge remote-tracking branch 'origin/main' into perf/cache-buildSearc…

c74ed92

…hQueryJSON

OlimpiaZurek force-pushed the perf/cache-buildSearchQueryJSON branch from 4c8fc7e to c74ed92 Compare February 19, 2026 13:10

adhorodyski approved these changes Feb 19, 2026

View reviewed changes

szymonzalarski98 approved these changes Feb 19, 2026

View reviewed changes

luacmartins self-requested a review February 19, 2026 15:06

luacmartins previously approved these changes Feb 19, 2026

View reviewed changes

marcaaron mentioned this pull request Feb 19, 2026

Cache buildSearchQueryJSON to avoid redundant PEG parsing #82994

Open

OlimpiaZurek marked this pull request as ready for review February 20, 2026 09:13

OlimpiaZurek requested review from a team as code owners February 20, 2026 09:14

melvin-bot bot requested review from Krishna2323 and heyjennahay and removed request for a team February 20, 2026 09:14

extract cache key separator

7d000e1

OlimpiaZurek dismissed luacmartins’s stale review via 7d000e1 February 20, 2026 09:16

chatgpt-codex-connector bot reviewed Feb 20, 2026

View reviewed changes

heyjennahay reviewed Feb 20, 2026

View reviewed changes

fix cache and add unit tests

073b2a5

fix test

026de96

Krishna2323 approved these changes Feb 20, 2026

View reviewed changes

melvin-bot bot requested a review from marcaaron February 20, 2026 17:01

luacmartins approved these changes Feb 20, 2026

View reviewed changes

JS00001 approved these changes Feb 20, 2026

View reviewed changes

luacmartins merged commit f8835d1 into Expensify:main Feb 20, 2026
33 checks passed

marcaaron reviewed Feb 20, 2026

View reviewed changes

OSBotify mentioned this pull request Feb 23, 2026

Deploy Checklist: New Expensify 2026-02-23 #83247

Open

		if (buildSearchQueryJSONCache.has(cacheKey)) {
		return buildSearchQueryJSONCache.get(cacheKey);

	// with identical query strings, each running the full parser from scratch.
	// with identical query strings and without this cache we would run the full parser from scratch.

Comments

Conversation

OlimpiaZurek commented Feb 19, 2026 • edited by luacmartins Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Feb 20, 2026

Uh oh!

Krishna2323 commented Feb 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

Krishna2323 Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

OlimpiaZurek Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

Krishna2323 commented Feb 20, 2026

Uh oh!

heyjennahay left a comment

Choose a reason for hiding this comment

Uh oh!

OlimpiaZurek commented Feb 20, 2026

Uh oh!

Krishna2323 commented Feb 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Krishna2323 commented Feb 20, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Krishna2323 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Feb 20, 2026

Uh oh!

OSBotify commented Feb 20, 2026

Uh oh!

github-actions bot commented Feb 20, 2026

Uh oh!

marcaaron left a comment

Choose a reason for hiding this comment

Uh oh!

marcaaron Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Feb 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

OlimpiaZurek commented Feb 19, 2026 •

edited by luacmartins

Loading

Krishna2323 commented Feb 20, 2026 •

edited

Loading

Krishna2323 commented Feb 20, 2026 •

edited

Loading