Skip to content
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

refactor(batch): remove append_chunk in nested loop join and hash join #4381

Merged
merged 2 commits into from
Aug 3, 2022
Merged

refactor(batch): remove append_chunk in nested loop join and hash join #4381

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
202a278
remove append_chunk
wzzzzd Aug 2, 2022
b7b863f
Merge branch 'main' into remove_append_chunk
mergify[bot] Aug 3, 2022
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
26 changes: 4 additions & 22 deletions src/batch/src/executor/join/hash_join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use risingwave_common::hash::{
calc_hash_key_kind, HashKey, HashKeyDispatcher, PrecomputedBuildHasher,
};
use risingwave_common::types::DataType;
use risingwave_common::util::chunk_coalesce::{DataChunkBuilder, SlicedDataChunk};
use risingwave_common::util::chunk_coalesce::DataChunkBuilder;
use risingwave_expr::expr::{build_from_prost, BoxedExpression, Expression};
use risingwave_pb::batch_plan::plan_node::NodeBody;

Expand Down Expand Up @@ -253,10 +253,9 @@ impl<K: HashKey> HashJoinExecutor<K> {
#[for_await]
for chunk in stream {
#[for_await]
for output_chunk in Self::append_chunk(
&mut output_chunk_builder,
chunk?.reorder_columns(&self.output_indices),
) {
for output_chunk in output_chunk_builder
.trunc_data_chunk(chunk?.reorder_columns(&self.output_indices))
{
yield output_chunk?
}
}
Expand Down Expand Up @@ -1282,23 +1281,6 @@ impl<K: HashKey> HashJoinExecutor<K> {
}
}

// Disable clippy's annoying lifetime warning
#[allow(clippy::needless_lifetimes)]
#[try_stream(ok = DataChunk, error = RwError)]
async fn append_chunk(chunk_builder: &mut DataChunkBuilder, chunk: DataChunk) {
let (mut remain, mut output) =
chunk_builder.append_chunk(SlicedDataChunk::new_checked(chunk)?)?;
if let Some(output_chunk) = output {
yield output_chunk
}
while let Some(remain_chunk) = remain {
(remain, output) = chunk_builder.append_chunk(remain_chunk)?;
if let Some(output_chunk) = output {
yield output_chunk
}
}
}

fn append_one_row(
chunk_builder: &mut DataChunkBuilder,
probe_chunk: &DataChunk,
Expand Down
28 changes: 6 additions & 22 deletions src/batch/src/executor/join/nested_loop_join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use risingwave_common::buffer::BitmapBuilder;
use risingwave_common::catalog::Schema;
use risingwave_common::error::{Result, RwError};
use risingwave_common::types::DataType;
use risingwave_common::util::chunk_coalesce::{DataChunkBuilder, SlicedDataChunk};
use risingwave_common::util::chunk_coalesce::DataChunkBuilder;
use risingwave_expr::expr::{
build_from_prost as expr_build_from_prost, BoxedExpression, Expression,
};
Expand Down Expand Up @@ -129,22 +129,6 @@ impl NestedLoopJoinExecutor {
chunk.set_visibility(expr.eval(&chunk)?.as_bool().iter().collect());
Ok(chunk)
}

/// Append a chunk to the chunk builder and get a stream of the spilled chunks.
#[try_stream(boxed, ok = DataChunk, error = RwError)]
async fn append_chunk(chunk_builder: &mut DataChunkBuilder, chunk: DataChunk) {
let (mut remain, mut output) =
chunk_builder.append_chunk(SlicedDataChunk::new_checked(chunk)?)?;
if let Some(output_chunk) = output {
yield output_chunk
}
while let Some(remain_chunk) = remain {
(remain, output) = chunk_builder.append_chunk(remain_chunk)?;
if let Some(output_chunk) = output {
yield output_chunk
}
}
}
}

#[async_trait::async_trait]
Expand Down Expand Up @@ -252,7 +236,7 @@ impl NestedLoopJoinExecutor {
// 4. Yield the concatenated chunk.
if chunk.cardinality() > 0 {
#[for_await]
for spilled in Self::append_chunk(chunk_builder, chunk) {
for spilled in chunk_builder.trunc_data_chunk(chunk) {
yield spilled?
}
}
Expand Down Expand Up @@ -285,7 +269,7 @@ impl NestedLoopJoinExecutor {
if chunk.cardinality() > 0 {
matched.set(left_row_idx, true);
#[for_await]
for spilled in Self::append_chunk(chunk_builder, chunk) {
for spilled in chunk_builder.trunc_data_chunk(chunk) {
yield spilled?
}
}
Expand Down Expand Up @@ -370,7 +354,7 @@ impl NestedLoopJoinExecutor {
// chunk.visibility() must be Some(_)
matched = &matched | chunk.visibility().unwrap();
#[for_await]
for spilled in Self::append_chunk(chunk_builder, chunk) {
for spilled in chunk_builder.trunc_data_chunk(chunk) {
yield spilled?
}
}
Expand Down Expand Up @@ -418,7 +402,7 @@ impl NestedLoopJoinExecutor {
right_chunk.set_visibility(matched);
if right_chunk.cardinality() > 0 {
#[for_await]
for spilled in Self::append_chunk(chunk_builder, right_chunk) {
for spilled in chunk_builder.trunc_data_chunk(right_chunk) {
yield spilled?
}
}
Expand Down Expand Up @@ -451,7 +435,7 @@ impl NestedLoopJoinExecutor {
left_matched.set(left_row_idx, true);
right_matched = &right_matched | chunk.visibility().unwrap();
#[for_await]
for spilled in Self::append_chunk(chunk_builder, chunk) {
for spilled in chunk_builder.trunc_data_chunk(chunk) {
yield spilled?
}
}
Expand Down