perf(reactivity): avoid unnecessary recursion in removeSub (#12135)

This commit is contained in:
skirtle 2024-10-11 03:48:54 +01:00 committed by GitHub
parent f6d9926236
commit ec917cfdb9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 45 additions and 12 deletions

View File

@ -1107,4 +1107,36 @@ describe('reactivity/computed', () => {
end.prop4.value, end.prop4.value,
]).toMatchObject([-2, -4, 2, 3]) ]).toMatchObject([-2, -4, 2, 3])
}) })
test('performance when removing dependencies from deeply nested computeds', () => {
const base = ref(1)
const trigger = ref(true)
const computeds: ComputedRef<number>[] = []
const LAYERS = 30
for (let i = 0; i < LAYERS; i++) {
const earlier = [...computeds]
computeds.push(
computed(() => {
return base.value + earlier.reduce((sum, c) => sum + c.value, 0)
}),
)
}
const tail = computed(() =>
trigger.value ? computeds[computeds.length - 1].value : 0,
)
const t0 = performance.now()
expect(tail.value).toBe(2 ** (LAYERS - 1))
const t1 = performance.now()
expect(t1 - t0).toBeLessThan(process.env.CI ? 100 : 30)
trigger.value = false
expect(tail.value).toBe(0)
const t2 = performance.now()
expect(t2 - t1).toBeLessThan(process.env.CI ? 100 : 30)
})
}) })

View File

@ -426,23 +426,24 @@ function removeSub(link: Link, soft = false) {
nextSub.prevSub = prevSub nextSub.prevSub = prevSub
link.nextSub = undefined link.nextSub = undefined
} }
if (dep.subs === link) {
// was previous tail, point new tail to prev
dep.subs = prevSub
}
if (__DEV__ && dep.subsHead === link) { if (__DEV__ && dep.subsHead === link) {
// was previous head, point new head to next // was previous head, point new head to next
dep.subsHead = nextSub dep.subsHead = nextSub
} }
if (!dep.subs && dep.computed) { if (dep.subs === link) {
// if computed, unsubscribe it from all its deps so this computed and its // was previous tail, point new tail to prev
// value can be GCed dep.subs = prevSub
dep.computed.flags &= ~EffectFlags.TRACKING
for (let l = dep.computed.deps; l; l = l.nextDep) { if (!prevSub && dep.computed) {
// here we are only "soft" unsubscribing because the computed still keeps // if computed, unsubscribe it from all its deps so this computed and its
// referencing the deps and the dep should not decrease its sub count // value can be GCed
removeSub(l, true) dep.computed.flags &= ~EffectFlags.TRACKING
for (let l = dep.computed.deps; l; l = l.nextDep) {
// here we are only "soft" unsubscribing because the computed still keeps
// referencing the deps and the dep should not decrease its sub count
removeSub(l, true)
}
} }
} }