Skip to content

Commit 3089ff5

Browse files
authored
Merge pull request #5392 from rmosolgo/execution-clean-ups
Remove needless job counting
2 parents 0c45b03 + bcd6308 commit 3089ff5

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

lib/graphql/execution/interpreter/runtime.rb

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,6 @@ def evaluate_selections(gathered_selections, selections_result, target_result, r
298298
end
299299

300300
call_method_on_directives(:resolve, selections_result.graphql_application_value, directives) do
301-
finished_jobs = 0
302-
enqueued_jobs = gathered_selections.size
303301
gathered_selections.each do |result_name, field_ast_nodes_or_ast_node|
304302
# Field resolution may pause the fiber,
305303
# so it wouldn't get to the `Resolve` call that happens below.
@@ -310,28 +308,19 @@ def evaluate_selections(gathered_selections, selections_result, target_result, r
310308
evaluate_selection(
311309
result_name, field_ast_nodes_or_ast_node, selections_result
312310
)
313-
finished_jobs += 1
314-
if finished_jobs == enqueued_jobs
315-
if target_result
316-
selections_result.merge_into(target_result)
317-
end
318-
end
319311
@dataloader.clear_cache
320312
}
321313
else
322314
@dataloader.append_job {
323315
evaluate_selection(
324316
result_name, field_ast_nodes_or_ast_node, selections_result
325317
)
326-
finished_jobs += 1
327-
if finished_jobs == enqueued_jobs
328-
if target_result
329-
selections_result.merge_into(target_result)
330-
end
331-
end
332318
}
333319
end
334320
end
321+
if target_result
322+
selections_result.merge_into(target_result)
323+
end
335324
selections_result
336325
end
337326
end

0 commit comments

Comments
 (0)