Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
lgbo-ustc committed Aug 13, 2024
1 parent 921f430 commit 719bb3a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ case class CHShuffledHashJoinExecTransformer(
override protected lazy val substraitJoinType: JoinRel.JoinType =
JoinTypeTransform.toSubstraitType(joinType)

def genJoinParameters1(): Any = {
val (isBHJ, isNullAwareAntiJoin, buildHashTableId) = genJoinParametersInternal()
override def genJoinParameters(): Any = {
val (isBHJ, isNullAwareAntiJoin, buildHashTableId): (Int, Int, String) = (0, 0, "")

// Don't use lef/right directly, they may be reordered in `HashJoinLikeExecTransformer`
val leftStats = getShuffleStageStatistics(streamedPlan)
Expand Down Expand Up @@ -157,12 +157,15 @@ case class CHShuffledHashJoinExecTransformer(
private def getShuffleStageStatistics(plan: SparkPlan): ShuffleStageStaticstics = {
plan match {
case queryStage: ShuffleQueryStageExec =>
/*
ShuffleStageStaticstics(
queryStage.shuffle.numPartitions,
queryStage.shuffle.numMappers,
queryStage.getRuntimeStatistics.rowCount)
*/
ShuffleStageStaticstics(-1, -1, None)
case shuffle: ColumnarShuffleExchangeExec =>
ShuffleStageStaticstics(shuffle.numPartitions, shuffle.numMappers, None)
ShuffleStageStaticstics(-1, -1, None)
case _ =>
if (plan.children.length == 1) {
getShuffleStageStatistics(plan.children.head)
Expand Down
2 changes: 2 additions & 0 deletions cpp-ch/local-engine/Parser/JoinRelParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ DB::QueryPlanPtr JoinRelParser::parseJoin(const substrait::JoinRel & join, DB::Q
}
else
{
#if 0
std::vector<DB::TableJoin::JoinOnClause> join_on_clauses;
bool is_multi_join_on_clauses
= isJoinWithMultiJoinOnClauses(table_join->getOnlyClause(), join_on_clauses, join, left_header, right_header);
Expand All @@ -321,6 +322,7 @@ DB::QueryPlanPtr JoinRelParser::parseJoin(const substrait::JoinRel & join, DB::Q
query_plan = buildMultiOnClauseHashJoin(table_join, std::move(left), std::move(right), join_on_clauses);
}
else
#endif
{
query_plan = buildSingleOnClauseHashJoin(join, table_join, std::move(left), std::move(right));
}
Expand Down

0 comments on commit 719bb3a

Please sign in to comment.