From 43d6f26619a408f7db8cfb5bb14a58d90fcaa89b Mon Sep 17 00:00:00 2001 From: xufei Date: Wed, 12 Apr 2023 18:14:51 +0800 Subject: [PATCH] rename Signed-off-by: xufei --- dbms/src/Interpreters/Join.cpp | 4 ++-- dbms/src/Interpreters/Join.h | 2 +- dbms/src/Interpreters/JoinUtils.cpp | 2 +- dbms/src/Interpreters/JoinUtils.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dbms/src/Interpreters/Join.cpp b/dbms/src/Interpreters/Join.cpp index e440977a577..29a4f4e57ca 100644 --- a/dbms/src/Interpreters/Join.cpp +++ b/dbms/src/Interpreters/Join.cpp @@ -131,7 +131,7 @@ Join::Join( , kind(kind_) , strictness(strictness_) , original_strictness(strictness) - , may_block_expanded_after_join_block(mayBlockExpandedAfterJoinBlock(kind, strictness)) + , may_probe_side_expanded_after_join(mayProbeSideExpandedAfterJoin(kind, strictness)) , key_names_left(key_names_left_) , key_names_right(key_names_right_) , build_concurrency(0) @@ -982,7 +982,7 @@ Block Join::joinBlockHash(ProbeProcessInfo & probe_process_info) const /// exit the while loop if /// 1. probe_process_info.all_rows_joined_finish is true, which means all the rows in current block is processed /// 2. the block may be expanded after join and result_rows exceeds the min_result_block_size - if (probe_process_info.all_rows_joined_finish || (may_block_expanded_after_join_block && result_rows >= probe_process_info.min_result_block_size)) + if (probe_process_info.all_rows_joined_finish || (may_probe_side_expanded_after_join && result_rows >= probe_process_info.min_result_block_size)) break; } assert(!result_blocks.empty()); diff --git a/dbms/src/Interpreters/Join.h b/dbms/src/Interpreters/Join.h index b4e823ef808..960a4fc4589 100644 --- a/dbms/src/Interpreters/Join.h +++ b/dbms/src/Interpreters/Join.h @@ -266,7 +266,7 @@ class Join ASTTableJoin::Kind kind; ASTTableJoin::Strictness strictness; ASTTableJoin::Strictness original_strictness; - const bool may_block_expanded_after_join_block; + const bool may_probe_side_expanded_after_join; /// Names of key columns (columns for equi-JOIN) in "left" table (in the order they appear in USING clause). const Names key_names_left; diff --git a/dbms/src/Interpreters/JoinUtils.cpp b/dbms/src/Interpreters/JoinUtils.cpp index e62673575bf..4cd13d0c52c 100644 --- a/dbms/src/Interpreters/JoinUtils.cpp +++ b/dbms/src/Interpreters/JoinUtils.cpp @@ -67,7 +67,7 @@ void computeDispatchHash(size_t rows, } } -bool mayBlockExpandedAfterJoinBlock(ASTTableJoin::Kind kind, ASTTableJoin::Strictness strictness) +bool mayProbeSideExpandedAfterJoin(ASTTableJoin::Kind kind, ASTTableJoin::Strictness strictness) { /// null aware semi/left semi/anti join never expand the block if (isNullAwareSemiFamily(kind)) diff --git a/dbms/src/Interpreters/JoinUtils.h b/dbms/src/Interpreters/JoinUtils.h index 4b55cfdf7e0..8f60f1e4760 100644 --- a/dbms/src/Interpreters/JoinUtils.h +++ b/dbms/src/Interpreters/JoinUtils.h @@ -59,7 +59,7 @@ inline bool isNullAwareSemiFamily(ASTTableJoin::Kind kind) || kind == ASTTableJoin::Kind::NullAware_LeftSemi; } -bool mayBlockExpandedAfterJoinBlock(ASTTableJoin::Kind kind, ASTTableJoin::Strictness strictness); +bool mayProbeSideExpandedAfterJoin(ASTTableJoin::Kind kind, ASTTableJoin::Strictness strictness); struct ProbeProcessInfo {