Skip to content

refactor(query): unify window/cte spill to async_buffer path #20001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dqhl76 merged 1 commit into from
Jun 14, 2026
Merged

refactor(query): unify window/cte spill to async_buffer path #20001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/query/service/src/physical_plans/physical_materialized_cte.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ use crate::physical_plans::format::PhysicalFormat;
use crate::pipelines::PipelineBuilder;
use crate::pipelines::memory_settings::MemorySettingsExt;
use crate::pipelines::processors::transforms::MaterializedCteSink;
use crate::pipelines::processors::transforms::create_materialized_cte_spiller;

#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
pub struct MaterializedCTE {
Expand Down Expand Up @@ -121,15 +120,19 @@ impl IPhysicalPlan for MaterializedCTE {
self.ref_count,
self.channel_size,
);
let spiller =
create_materialized_cte_spiller(builder.ctx.clone(), builder.settings.clone())?;
let memory_settings =
databend_common_pipeline_transforms::MemorySettings::from_materialized_cte_settings(
&builder.ctx,
&builder.settings,
)?;
builder.main_pipeline.add_sink(|input| {
MaterializedCteSink::create(input, tx.clone(), spiller.clone(), memory_settings.clone())
MaterializedCteSink::create(
builder.ctx.clone(),
input,
tx.clone(),
&builder.settings,
memory_settings.clone(),
)
})
}
}
Expand Down
16 changes: 0 additions & 16 deletions src/query/service/src/physical_plans/physical_recluster.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ use databend_common_catalog::plan::DataSourceInfo;
use databend_common_catalog::plan::DataSourcePlan;
use databend_common_catalog::plan::ReclusterTask;
use databend_common_catalog::table::Table;
use databend_common_config::GlobalConfig;
use databend_common_exception::ErrorCode;
use databend_common_exception::Result;
use databend_common_expression::DataSchemaRef;
Expand All @@ -45,7 +44,6 @@ use databend_common_storages_fuse::FUSE_OPT_KEY_BLOCK_IN_MEM_SIZE_THRESHOLD;
use databend_common_storages_fuse::FuseTable;
use databend_common_storages_fuse::operations::TransformSerializeBlock;
use databend_common_storages_fuse::statistics::ClusterStatsGenerator;
use databend_storages_common_cache::TempDirManager;
use databend_storages_common_table_meta::meta::TableMetaTimestamps;

use crate::physical_plans::physical_plan::IPhysicalPlan;
Expand All @@ -58,9 +56,7 @@ use crate::pipelines::processors::transforms::CompactStrategy;
use crate::pipelines::processors::transforms::HilbertPartitionExchange;
use crate::pipelines::processors::transforms::TransformWindowPartitionCollect;
use crate::sessions::TableContextPartitionStats;
use crate::sessions::TableContextQueryIdentity;
use crate::sessions::TableContextSettings;
use crate::spillers::SpillerDiskConfig;

#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
pub struct Recluster {
Expand Down Expand Up @@ -334,17 +330,6 @@ impl IPhysicalPlan for HilbertPartition {
)?;

let settings = builder.settings.clone();
let temp_dir_manager = TempDirManager::instance();

let disk_bytes_limit = GlobalConfig::instance()
.spill
.window_partition_spill_bytes_limit();

let enable_dio = settings.get_enable_dio()?;
let disk_spill = temp_dir_manager
.get_disk_spill_dir(disk_bytes_limit, &builder.ctx.get_id())
.map(|temp_dir| SpillerDiskConfig::new(temp_dir, enable_dio))
.transpose()?;

let window_spill_settings = MemorySettings::from_window_settings(&builder.ctx)?;
let processor_id = AtomicUsize::new(0);
Expand All @@ -366,7 +351,6 @@ impl IPhysicalPlan for HilbertPartition {
num_processors,
self.num_partitions,
window_spill_settings.clone(),
disk_spill.clone(),
CompactStrategy::new(self.rows_per_block, max_bytes_per_block),
)?,
)))
Expand Down
15 changes: 0 additions & 15 deletions src/query/service/src/physical_plans/physical_window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ use std::sync::atomic;
use std::sync::atomic::AtomicUsize;

use databend_common_catalog::plan::DataSourcePlan;
use databend_common_config::GlobalConfig;
use databend_common_exception::ErrorCode;
use databend_common_exception::Result;
use databend_common_expression::Constant;
Expand Down Expand Up @@ -48,7 +47,6 @@ use databend_common_sql::optimizer::ir::SExpr;
use databend_common_sql::plans::WindowFuncFrame;
use databend_common_sql::plans::WindowFuncFrameBound;
use databend_common_sql::plans::WindowFuncType;
use databend_storages_common_cache::TempDirManager;

use super::LagLeadDefault;
use super::LagLeadFunctionDesc;
Expand Down Expand Up @@ -79,8 +77,6 @@ use crate::pipelines::processors::transforms::WindowFunctionInfo;
use crate::pipelines::processors::transforms::WindowPartitionExchange;
use crate::pipelines::processors::transforms::WindowPartitionTopNExchange;
use crate::pipelines::processors::transforms::WindowSortDesc;
use crate::sessions::TableContextQueryIdentity;
use crate::spillers::SpillerDiskConfig;

#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
pub struct Window {
Expand Down Expand Up @@ -473,16 +469,6 @@ fn apply_window_partition(
)?;
}

let temp_dir_manager = TempDirManager::instance();
let disk_bytes_limit = GlobalConfig::instance()
.spill
.window_partition_spill_bytes_limit();
let enable_dio = settings.get_enable_dio()?;
let disk_spill = temp_dir_manager
.get_disk_spill_dir(disk_bytes_limit, &builder.ctx.get_id())
.map(|temp_dir| SpillerDiskConfig::new(temp_dir, enable_dio))
.transpose()?;

let window_spill_settings = MemorySettings::from_window_settings(&builder.ctx)?;
let plan_schema = DataSchemaRefExt::create(input_schema.fields().clone());
let processor_id = AtomicUsize::new(0);
Expand All @@ -498,7 +484,6 @@ fn apply_window_partition(
num_processors,
num_partitions,
window_spill_settings.clone(),
disk_spill.clone(),
strategy,
)?,
)))
Expand Down
15 changes: 0 additions & 15 deletions src/query/service/src/physical_plans/physical_window_partition.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,12 @@ use std::sync::atomic;
use std::sync::atomic::AtomicUsize;

use databend_common_catalog::plan::DataSourcePlan;
use databend_common_config::GlobalConfig;
use databend_common_exception::Result;
use databend_common_expression::SortColumnDescription;
use databend_common_pipeline::core::ProcessorPtr;
use databend_common_pipeline_transforms::MemorySettings;
use databend_common_sql::Symbol;
use databend_common_sql::executor::physical_plans::SortDesc;
use databend_storages_common_cache::TempDirManager;

use crate::physical_plans::explain::PlanStatsInfo;
use crate::physical_plans::format::PhysicalFormat;
Expand All @@ -38,8 +36,6 @@ use crate::pipelines::processors::transforms::SortStrategy;
use crate::pipelines::processors::transforms::TransformWindowPartitionCollect;
use crate::pipelines::processors::transforms::WindowPartitionExchange;
use crate::pipelines::processors::transforms::WindowPartitionTopNExchange;
use crate::sessions::TableContextQueryIdentity;
use crate::spillers::SpillerDiskConfig;

#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
pub struct WindowPartition {
Expand Down Expand Up @@ -145,16 +141,6 @@ impl IPhysicalPlan for WindowPartition {
)?;
}

let temp_dir_manager = TempDirManager::instance();
let disk_bytes_limit = GlobalConfig::instance()
.spill
.window_partition_spill_bytes_limit();
let enable_dio = settings.get_enable_dio()?;
let disk_spill = temp_dir_manager
.get_disk_spill_dir(disk_bytes_limit, &builder.ctx.get_id())
.map(|temp_dir| SpillerDiskConfig::new(temp_dir, enable_dio))
.transpose()?;

let window_spill_settings = MemorySettings::from_window_settings(&builder.ctx)?;

let processor_id = AtomicUsize::new(0);
Expand All @@ -171,7 +157,6 @@ impl IPhysicalPlan for WindowPartition {
num_processors,
num_partitions,
window_spill_settings.clone(),
disk_spill.clone(),
strategy,
)?,
)))
Expand Down
Loading
Loading