Skip to content

Minor: reduce redundant code #6901

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
alamb merged 3 commits into from
Jul 10, 2023
Merged

Minor: reduce redundant code #6901

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b252705
Minor:reduce redundant code
Jul 10, 2023
3ac541e
nit
Jul 10, 2023
a97d881
nit
Jul 10, 2023
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
40 changes: 15 additions & 25 deletions datafusion/core/src/physical_plan/joins/nested_loop_join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
//! determined by the [`JoinType`].

use crate::physical_plan::joins::utils::{
adjust_right_output_partitioning, append_right_indices, apply_join_filter_to_indices,
build_batch_from_indices, build_join_schema, check_join_is_valid,
combine_join_equivalence_properties, estimate_join_statistics, get_anti_indices,
get_anti_u64_indices, get_final_indices_from_bit_map, get_semi_indices,
get_semi_u64_indices, BuildProbeJoinMetrics, ColumnIndex, JoinFilter, JoinSide,
OnceAsync, OnceFut,
append_right_indices, apply_join_filter_to_indices, build_batch_from_indices,
build_join_schema, check_join_is_valid, combine_join_equivalence_properties,
estimate_join_statistics, get_anti_indices, get_anti_u64_indices,
get_final_indices_from_bit_map, get_semi_indices, get_semi_u64_indices,
partitioned_join_output_partitioning, BuildProbeJoinMetrics, ColumnIndex, JoinFilter,
JoinSide, OnceAsync, OnceFut,
};
use crate::physical_plan::metrics::{ExecutionPlanMetricsSet, MetricsSet};
use crate::physical_plan::{
Expand Down Expand Up @@ -149,25 +149,15 @@ impl ExecutionPlan for NestedLoopJoinExec {

fn output_partitioning(&self) -> Partitioning {
// the partition of output is determined by the rule of `required_input_distribution`
// TODO we can replace it by `partitioned_join_output_partitioning`
match self.join_type {
// use the left partition
JoinType::Inner
| JoinType::Left
| JoinType::LeftSemi
| JoinType::LeftAnti
| JoinType::Full => self.left.output_partitioning(),
// use the right partition
JoinType::Right => {
// if the partition of right is hash,
// and the right partition should be adjusted the column index for the right expr
adjust_right_output_partitioning(
self.right.output_partitioning(),
self.left.schema().fields.len(),
)
}
// use the right partition
JoinType::RightSemi | JoinType::RightAnti => self.right.output_partitioning(),
if self.join_type == JoinType::Full {
self.left.output_partitioning()
} else {
partitioned_join_output_partitioning(
self.join_type,
self.left.output_partitioning(),
self.right.output_partitioning(),
self.left.schema().fields.len(),
)
}
}

Expand Down