Skip to content
Draft
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
20 changes: 14 additions & 6 deletions datafusion/physical-plan/src/joins/hash_join/exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,12 @@ fn try_create_array_map(
let mem_size = ArrayMap::estimate_memory_size(min_val, max_val, num_row);
reservation.try_grow(mem_size)?;

let batch = concat_batches(schema, batches)?;
// Fast path for single batch, avoiding `concat_batches` which is expensive.
let batch = if batches.len() == 1 {
batches[0].clone()
} else {
concat_batches(schema, batches)?
};
let left_values = evaluate_expressions_to_arrays(on_left, &batch)?;

let array_map = ArrayMap::try_new(&left_values[0], min_val, max_val)?;
Expand Down Expand Up @@ -1656,10 +1661,8 @@ async fn collect_left_input(
let mut hashes_buffer = Vec::new();
let mut offset = 0;

let batches_iter = batches.iter().rev();

// Updating hashmap starting from the last batch
for batch in batches_iter.clone() {
for batch in batches.iter().rev() {
hashes_buffer.clear();
hashes_buffer.resize(batch.num_rows(), 0);
update_hash(
Expand All @@ -1675,8 +1678,13 @@ async fn collect_left_input(
offset += batch.num_rows();
}

// Merge all batches into a single batch, so we can directly index into the arrays
let batch = concat_batches(&schema, batches_iter.clone())?;
// Merge all batches into a single batch, so we can directly index into the arrays.
// Fast path for single batch, avoiding `concat_batches` which is expensive.
let batch = if batches.len() == 1 {
batches[0].clone()
} else {
concat_batches(&schema, batches.iter().rev())?
};

let left_values = evaluate_expressions_to_arrays(&on_left, &batch)?;

Expand Down