x

Author: forsaken628

src/query/service/src/pipelines/builders/builder_sort.rs

@@ -107,8 +107,8 @@ impl PipelineBuilder {
  SortStep::Single => {
  // Build for single node mode.
  // We build the full sort pipeline for it.
- if max_threads == 1 {
- self.main_pipeline.try_resize(1)?;
+ if self.main_pipeline.output_len() == 1 || max_threads == 1 {
+ self.main_pipeline.try_resize(max_threads)?;
  }
  builder
  .remove_order_col_at_last()
@@ -119,8 +119,8 @@ impl PipelineBuilder {
  // Build for each cluster node.
  // We build the full sort pipeline for it.
  // Don't remove the order column at last.
- if max_threads == 1 {
- self.main_pipeline.try_resize(1)?;
+ if self.main_pipeline.output_len() == 1 || max_threads == 1 {
+ self.main_pipeline.try_resize(max_threads)?;
  }
  builder.build_full_sort_pipeline(&mut self.main_pipeline)
  }
@@ -143,8 +143,8 @@ impl PipelineBuilder {
  }
 
  SortStep::Sample => {
- if max_threads == 1 {
- self.main_pipeline.try_resize(1)?;
+ if self.main_pipeline.output_len() == 1 || max_threads == 1 {
+ self.main_pipeline.try_resize(max_threads)?;
  }
  builder.build_sample(&mut self.main_pipeline)?;
  self.exchange_injector = TransformSortBuilder::exchange_injector();

tests/sqllogictests/suites/base/09_fuse_engine/09_0020_analyze.test

@@ -1,3 +1,7 @@
+# SortBoundBroadcast deadlock
+statement ok
+set enable_shuffle_sort = 0;
+
 statement ok
 DROP DATABASE IF EXISTS db_09_0020
 

tests/sqllogictests/suites/base/09_fuse_engine/09_0044_issue_17314.test

@@ -1,3 +1,7 @@
+# SortBoundBroadcast deadlock
+statement ok
+set enable_shuffle_sort = 0;
+
 statement ok
 create or replace database issue_17314;