Unverified Commit 052501aa authored by vercel-fleet-prod[bot]'s avatar vercel-fleet-prod[bot] Committed by GitHub

turbo-tasks-backend: skip merging diffs when the upper has no uppers

Co-authored-by: 's avatarTobias Koppers <1365881+sokra@users.noreply.github.com>
parent 56327d2f
...@@ -2971,8 +2971,9 @@ impl AggregationUpdateQueue { ...@@ -2971,8 +2971,9 @@ impl AggregationUpdateQueue {
if !diffs.is_empty() { if !diffs.is_empty() {
let upper_ids = get_uppers(&upper); let upper_ids = get_uppers(&upper);
drop(upper); drop(upper);
// Outside of the lock: merge the diffs into a single update for the uppers of if !upper_ids.is_empty() {
// the upper, instead of enqueuing one job per diff. // Outside of the lock: merge the diffs into a single update for the uppers
// of the upper, instead of enqueuing one job per diff.
let needs_optimize = diffs.len() > 1; let needs_optimize = diffs.len() > 1;
let mut iter = diffs.into_iter(); let mut iter = diffs.into_iter();
let mut update = iter.next().unwrap(); let mut update = iter.next().unwrap();
...@@ -2982,11 +2983,12 @@ impl AggregationUpdateQueue { ...@@ -2982,11 +2983,12 @@ impl AggregationUpdateQueue {
if needs_optimize { if needs_optimize {
update = update.optimize(); update = update.optimize();
} }
if !update.is_empty() && !upper_ids.is_empty() { if !update.is_empty() {
self.push(AggregatedDataUpdateJob { upper_ids, update }.into()); self.push(AggregatedDataUpdateJob { upper_ids, update }.into());
} }
} }
} }
}
if !inner_tasks.is_empty() { if !inner_tasks.is_empty() {
// STEP 6f // STEP 6f
if ctx.should_track_activeness() && !is_active { if ctx.should_track_activeness() && !is_active {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment