{"files":[{"status":"M","path":"src\/devtools\/ProfilingCache.js"},{"status":"M","path":"src\/devtools\/cache.js"},{"status":"M","path":"src\/devtools\/views\/Components\/InspectedElementContext.js"}],"body":"","commit":{"subject":"Fixed bug with cache invalidation","authorEmail":"bvaughn@fb.com","shortRevision":"64bb2d31f9","authorName":"Brian Vaughn","revision":"64bb2d31f91ea8234db6c6161c8256ade21180b9","authoredAt":"2019-04-22T15:18:32-07:00"},"parents":["64bc49d523c05e9fb23bd7b90c0969c0fb72edd2"],"patch":"diff --git a\/src\/devtools\/ProfilingCache.js b\/src\/devtools\/ProfilingCache.js\nindex 7dd8b3d946..d313111e67 100644\n--- a\/src\/devtools\/ProfilingCache.js\n+++ b\/src\/devtools\/ProfilingCache.js\n@@ -1,6 +1,6 @@\n \/\/ @flow\n \n-import { createResource, invalidateResources } from '.\/cache';\n+import { createResource } from '.\/cache';\n import Store from '.\/store';\n import {\n getCommitTree,\n@@ -297,8 +297,11 @@ export default class ProfilingCache {\n });\n \n invalidate() {\n- \/\/ Invalidate Susepnse caches.\n- invalidateResources();\n+ \/\/ Invalidate Suspense caches.\n+ this.CommitDetails.clear();\n+ this.FiberCommits.clear();\n+ this.Interactions.clear();\n+ this.ProfilingSummary.clear();\n \n \/\/ Invalidate non-Suspense caches too.\n invalidateCommitTrees();\ndiff --git a\/src\/devtools\/cache.js b\/src\/devtools\/cache.js\nindex ee3835fec3..bf509ce8f3 100644\n--- a\/src\/devtools\/cache.js\n+++ b\/src\/devtools\/cache.js\n@@ -39,6 +39,7 @@ type RejectedResult = {|\n type Result = PendingResult | ResolvedResult | RejectedResult;\n \n export type Resource = {\n+ clear(): void,\n invalidate(Key): void,\n read(Input): Value,\n preload(Input): void,\n@@ -66,7 +67,23 @@ function readContext(Context, observedBits) {\n \n const CacheContext = createContext(null);\n \n+type Config = {\n+ useLRU?: boolean,\n+};\n+\n const entries: Map, Map> = new Map();\n+const resourceConfigs: Map, Config> = new Map();\n+\n+function getEntriesForResource(resource: any): Map {\n+ let entriesForResource = ((entries.get(resource): any): Map);\n+ if (entriesForResource === undefined) {\n+ const config = resourceConfigs.get(resource);\n+ entriesForResource =\n+ config !== undefined && config.useLRU ? new LRU({ max: 10 }) : new Map();\n+ entries.set(resource, entriesForResource);\n+ }\n+ return entriesForResource;\n+}\n \n function accessResult(\n resource: any,\n@@ -74,7 +91,7 @@ function accessResult(\n input: Input,\n key: Key\n ): Result {\n- const entriesForResource = ((entries.get(resource): any): Map);\n+ const entriesForResource = getEntriesForResource(resource);\n const entry = entriesForResource.get(key);\n if (entry === undefined) {\n const thenable = fetch(input);\n@@ -108,11 +125,15 @@ function accessResult(\n export function createResource(\n fetch: Input => Thenable,\n hashInput: Input => Key,\n- useLRU?: boolean = false\n+ config?: Config = {}\n ): Resource {\n const resource = {\n+ clear(): void {\n+ entries.delete(resource);\n+ },\n+\n invalidate(key: Key): void {\n- const entriesForResource = ((entries.get(resource): any): Map);\n+ const entriesForResource = getEntriesForResource(resource);\n if (entriesForResource instanceof Map) {\n entriesForResource.delete(key);\n } else {\n@@ -156,7 +177,7 @@ export function createResource(\n },\n \n write(key: Key, value: Value): void {\n- const entriesForResource = ((entries.get(resource): any): Map);\n+ const entriesForResource = getEntriesForResource(resource);\n \n const resolvedResult: ResolvedResult = {\n status: Resolved,\n@@ -167,7 +188,7 @@ export function createResource(\n },\n };\n \n- entries.set(resource, useLRU ? new LRU({ max: 10 }) : new Map());\n+ resourceConfigs.set(resource, config);\n \n return resource;\n }\ndiff --git a\/src\/devtools\/views\/Components\/InspectedElementContext.js b\/src\/devtools\/views\/Components\/InspectedElementContext.js\nindex fbbc572f7b..99263e4c18 100644\n--- a\/src\/devtools\/views\/Components\/InspectedElementContext.js\n+++ b\/src\/devtools\/views\/Components\/InspectedElementContext.js\n@@ -31,6 +31,27 @@ type InProgressRequest = {|\n resolveFn: ResolveFn,\n |};\n \n+const inProgressRequests: Map = new Map();\n+const resource: Resource = createResource(\n+ (id: number) => {\n+ let request = inProgressRequests.get(id);\n+ if (request != null) {\n+ return request.promise;\n+ }\n+\n+ let resolveFn = ((null: any): ResolveFn);\n+ const promise = new Promise(resolve => {\n+ resolveFn = resolve;\n+ });\n+\n+ inProgressRequests.set(id, { promise, resolveFn });\n+\n+ return promise;\n+ },\n+ (id: number) => id,\n+ { useLRU: true }\n+);\n+\n type Props = {|\n children: React$Node,\n |};\n@@ -42,34 +63,6 @@ function InspectedElementContextController({ children }: Props) {\n \n const [count, setCount] = useState(0);\n \n- const inProgressRequests = useMemo>(\n- () => new Map(),\n- []\n- );\n-\n- const resource = useMemo>(\n- () =>\n- createResource(\n- (id: number) => {\n- let request = inProgressRequests.get(id);\n- if (request != null) {\n- return request.promise;\n- }\n-\n- let resolveFn = ((null: any): ResolveFn);\n- const promise = new Promise(resolve => {\n- resolveFn = resolve;\n- });\n-\n- inProgressRequests.set(id, { promise, resolveFn });\n-\n- return promise;\n- },\n- (id: number) => id\n- ),\n- [inProgressRequests]\n- );\n-\n \/\/ This effect handler invalidates the suspense cache and schedules rendering updates with React.\n useEffect(() => {\n const onInspectedElement = (\n@@ -103,7 +96,7 @@ function InspectedElementContextController({ children }: Props) {\n \n bridge.addListener('inspectedElement', onInspectedElement);\n return () => bridge.removeListener('inspectedElement', onInspectedElement);\n- }, [bridge, inProgressRequests, inspectedElementID, resource]);\n+ }, [bridge, inspectedElementID]);\n \n \/\/ This effect handler polls for updates on the currently selected element.\n useEffect(() => {\n"}

dillon1000/react

Files changed