Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 12 additions & 10 deletions rust/lance-datafusion/src/exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ pub struct LanceExecutionOptions {
pub use_spilling: bool,
pub mem_pool_size: Option<u64>,
pub batch_size: Option<usize>,
pub target_partition: Option<usize>,
}

const DEFAULT_LANCE_MEM_POOL_SIZE: u64 = 100 * 1024 * 1024;
Expand Down Expand Up @@ -215,8 +216,11 @@ impl LanceExecutionOptions {
}

pub fn new_session_context(options: &LanceExecutionOptions) -> SessionContext {
let session_config = SessionConfig::new();
let mut session_config = SessionConfig::new();
let mut runtime_env_builder = RuntimeEnvBuilder::new();
if let Some(target_partition) = options.target_partition {
session_config = session_config.with_target_partitions(target_partition);
}
if options.use_spilling() {
runtime_env_builder = runtime_env_builder
.with_disk_manager(DiskManagerConfig::new())
Expand All @@ -240,17 +244,15 @@ lazy_static! {
}

pub fn get_session_context(options: &LanceExecutionOptions) -> SessionContext {
let session_ctx: SessionContext;
if options.mem_pool_size() == DEFAULT_LANCE_MEM_POOL_SIZE {
if options.use_spilling() {
session_ctx = DEFAULT_SESSION_CONTEXT_WITH_SPILLING.clone();
if options.mem_pool_size() == DEFAULT_LANCE_MEM_POOL_SIZE && options.target_partition.is_none()
{
return if options.use_spilling() {
DEFAULT_SESSION_CONTEXT_WITH_SPILLING.clone()
} else {
session_ctx = DEFAULT_SESSION_CONTEXT.clone();
}
} else {
session_ctx = new_session_context(options)
DEFAULT_SESSION_CONTEXT.clone()
};
}
session_ctx
new_session_context(options)
}

fn get_task_context(
Expand Down
3 changes: 2 additions & 1 deletion rust/lance/src/dataset/write/merge_insert.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ use futures::{
use lance_core::{
datatypes::{OnMissing, OnTypeMismatch, SchemaCompareOptions},
error::{box_error, InvalidInputSnafu},
utils::futures::Capacity,
utils::{futures::Capacity, tokio::get_num_compute_intensive_cpus},
Error, Result, ROW_ADDR, ROW_ADDR_FIELD, ROW_ID, ROW_ID_FIELD,
};
use lance_datafusion::{
Expand Down Expand Up @@ -665,6 +665,7 @@ impl MergeInsertJob {
use datafusion::logical_expr::{col, lit};
let session_ctx = get_session_context(&LanceExecutionOptions {
use_spilling: true,
target_partition: Some(get_num_compute_intensive_cpus().min(8)),
..Default::default()
});
let mut group_stream = session_ctx
Expand Down
Loading