Feature duckdb#1272: Window Distinct Merging

PR Feedback: Use all threads for all merges.
hawkfish · Aug 7, 2024 · 1d831a0 · 1d831a0
1 parent 1872a52
commit 1d831a0
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/execution/window_segment_tree.cpp b/src/execution/window_segment_tree.cpp
@@ -1595,12 +1595,12 @@ bool WindowDistinctAggregatorGlobalState::TryPrepareNextStage(WindowDistinctAggr
 			return false;
 		}
 		global_sort->PrepareMergePhase();
-		total_tasks = global_sort->sorted_blocks.size() / 2;
-		if (!total_tasks) {
+		if (!(global_sort->sorted_blocks.size() / 2)) {
 			break;
 		}
 		global_sort->InitializeMergeRound();
 		lstate.stage = stage = PartitionSortStage::MERGE;
+		total_tasks = locals;
 		tasks_assigned = 1;
 		tasks_completed = 0;
 		return true;
@@ -1614,11 +1614,12 @@ bool WindowDistinctAggregatorGlobalState::TryPrepareNextStage(WindowDistinctAggr
 		}
 		global_sort->CompleteMergeRound(true);
 		total_tasks = global_sort->sorted_blocks.size() / 2;
-		if (!total_tasks) {
+		if (!(global_sort->sorted_blocks.size() / 2)) {
 			break;
 		}
 		global_sort->InitializeMergeRound();
 		lstate.stage = PartitionSortStage::MERGE;
+		total_tasks = locals;
 		tasks_assigned = 1;
 		tasks_completed = 0;
 		return true;