Skip to content

Commit e577b7e

Browse files
authored
chore(query): remove old sort spill (#17546)
remove old sort spill
1 parent da5d854 commit e577b7e

File tree

9 files changed

+10
-1159
lines changed

9 files changed

+10
-1159
lines changed

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

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ use databend_common_storage::DataOperator;
3434
use databend_common_storages_fuse::TableContext;
3535

3636
use crate::pipelines::memory_settings::MemorySettingsExt;
37-
use crate::pipelines::processors::transforms::create_transform_sort_spill;
3837
use crate::pipelines::processors::transforms::create_transform_stream_sort_spill;
3938
use crate::pipelines::PipelineBuilder;
4039
use crate::sessions::QueryContext;
@@ -251,35 +250,19 @@ impl SortPipelineBuilder {
251250
disk_spill: None,
252251
use_parquet: settings.get_spilling_file_format()?.is_parquet(),
253252
};
254-
let settings = self.ctx.get_settings();
255-
let enable_experimental_stream_sort_spilling =
256-
settings.get_enable_experimental_stream_sort_spilling()?;
257253
pipeline.add_transform(|input, output| {
258254
let op = DataOperator::instance().spill_operator();
259255
let spiller = Spiller::create(self.ctx.clone(), op, config.clone())?;
260-
if enable_experimental_stream_sort_spilling {
261-
Ok(ProcessorPtr::create(create_transform_stream_sort_spill(
262-
input,
263-
output,
264-
schema.clone(),
265-
self.sort_desc.clone(),
266-
self.limit,
267-
spiller,
268-
output_order_col,
269-
enable_loser_tree,
270-
)))
271-
} else {
272-
Ok(ProcessorPtr::create(create_transform_sort_spill(
273-
input,
274-
output,
275-
schema.clone(),
276-
self.sort_desc.clone(),
277-
self.limit,
278-
spiller,
279-
output_order_col,
280-
enable_loser_tree,
281-
)))
282-
}
256+
Ok(ProcessorPtr::create(create_transform_stream_sort_spill(
257+
input,
258+
output,
259+
schema.clone(),
260+
self.sort_desc.clone(),
261+
self.limit,
262+
spiller,
263+
output_order_col,
264+
enable_loser_tree,
265+
)))
283266
})?;
284267
}
285268

src/query/service/src/pipelines/processors/transforms/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ mod transform_recursive_cte_scan;
3434
mod transform_recursive_cte_source;
3535
mod transform_resort_addon;
3636
mod transform_resort_addon_without_source_schema;
37-
mod transform_sort_spill;
3837
mod transform_srf;
3938
mod transform_stream_sort_spill;
4039
mod transform_udf_script;
@@ -61,7 +60,6 @@ pub use transform_recursive_cte_scan::TransformRecursiveCteScan;
6160
pub use transform_recursive_cte_source::TransformRecursiveCteSource;
6261
pub use transform_resort_addon::TransformResortAddOn;
6362
pub use transform_resort_addon_without_source_schema::TransformResortAddOnWithoutSourceSchema;
64-
pub use transform_sort_spill::create_transform_sort_spill;
6563
pub use transform_srf::TransformSRF;
6664
pub use transform_stream_sort_spill::*;
6765
pub use transform_udf_script::TransformUdfScript;

0 commit comments

Comments
 (0)