-
-
Notifications
You must be signed in to change notification settings - Fork 652
Only Rebuild the Vendor that updated. #11820
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
Open
delphiactual
wants to merge
1
commit into
master
Choose a base branch
from
vendor-recompute-perf
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+66
−9
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,6 +35,71 @@ export interface D2Vendor { | |
|
|
||
| const vendorOrder = [VendorHashes.AdaTransmog, VendorHashes.Banshee, VendorHashes.Eververse]; | ||
|
|
||
| /** | ||
| * Cache of built vendors so that when a single vendor's data updates (e.g. its | ||
| * item components trickle in one vendor at a time on the vendors page), we only | ||
| * rebuild that vendor instead of every vendor. | ||
| * | ||
| * This works because immer's structural sharing means a trickle update only | ||
| * changes the reference of the affected vendor's `itemComponents`; `context`, | ||
| * `sales.data`, and `vendors.data` keep their references, so all the other | ||
| * vendors' cache entries stay valid. Keyed by `${characterId}-${vendorHash}`. | ||
| */ | ||
| interface BuiltVendorCacheEntry { | ||
| context: ItemCreationContext; | ||
| vendorComponent: DestinyVendorComponent | undefined; | ||
| sales: { [key: string]: DestinyVendorSaleItemComponent } | undefined; | ||
| itemComponents: NonNullable<DestinyVendorsResponse['itemComponents']>[number] | undefined; | ||
| salesData: DestinyVendorsResponse['sales']['data']; | ||
| result: D2Vendor | undefined; | ||
| } | ||
| const builtVendorCache = new Map<string, BuiltVendorCacheEntry>(); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Document what the key is
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This might want to be a WeakMap? |
||
|
|
||
| function buildVendorMemoized( | ||
| context: ItemCreationContext, | ||
| vendorsResponse: DestinyVendorsResponse, | ||
| characterId: string, | ||
| vendorHash: number, | ||
| ): D2Vendor | undefined { | ||
| const vendorComponent = vendorsResponse.vendors.data?.[vendorHash]; | ||
| const sales = vendorsResponse.sales.data?.[vendorHash]?.saleItems; | ||
| const itemComponents = vendorsResponse.itemComponents?.[vendorHash]; | ||
| // sales.data of the whole response is read when gathering (sub-)vendor | ||
| // currencies, so it's part of this vendor's inputs. | ||
| const salesData = vendorsResponse.sales.data; | ||
|
|
||
| const key = `${characterId}-${vendorHash}`; | ||
| const cached = builtVendorCache.get(key); | ||
| if ( | ||
| cached?.context === context && | ||
| cached.vendorComponent === vendorComponent && | ||
| cached.sales === sales && | ||
| cached.itemComponents === itemComponents && | ||
| cached.salesData === salesData | ||
| ) { | ||
| return cached.result; | ||
| } | ||
|
|
||
| const result = toVendor( | ||
| // Override the item components from the profile with this vendor's item components | ||
| { ...context, itemComponents }, | ||
| vendorHash, | ||
| vendorComponent, | ||
| characterId, | ||
| sales, | ||
| vendorsResponse, | ||
| ); | ||
| builtVendorCache.set(key, { | ||
| context, | ||
| vendorComponent, | ||
| sales, | ||
| itemComponents, | ||
| salesData, | ||
| result, | ||
| }); | ||
| return result; | ||
| } | ||
|
|
||
| export function toVendorGroups( | ||
| context: ItemCreationContext, | ||
| vendorsResponse: DestinyVendorsResponse, | ||
|
|
@@ -52,15 +117,7 @@ export function toVendorGroups( | |
| return { | ||
| def: groupDef, | ||
| vendors: filterMap(group.vendorHashes, (vendorHash) => { | ||
| const vendor = toVendor( | ||
| // Override the item components from the profile with this vendor's item components | ||
| { ...context, itemComponents: vendorsResponse.itemComponents?.[vendorHash] }, | ||
| vendorHash, | ||
| vendorsResponse.vendors.data?.[vendorHash], | ||
| characterId, | ||
| vendorsResponse.sales.data?.[vendorHash]?.saleItems, | ||
| vendorsResponse, | ||
| ); | ||
| const vendor = buildVendorMemoized(context, vendorsResponse, characterId, vendorHash); | ||
| return vendor?.items.length ? vendor : undefined; | ||
| }).sort(compareByIndex(vendorOrder, (v) => v.def.hash)), | ||
| }; | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What does immer have to do with anything?
Try to get the comments to be more about why than what