From a2d577f21ba0be9a81d2cae723ac22ac5dd4b40d Mon Sep 17 00:00:00 2001 From: lgbo-ustc Date: Tue, 13 Aug 2024 16:03:34 +0800 Subject: [PATCH] test --- .../apache/gluten/execution/CHHashJoinExecTransformer.scala | 4 ++-- cpp-ch/local-engine/Parser/JoinRelParser.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHHashJoinExecTransformer.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHHashJoinExecTransformer.scala index a4873e23365f6..f62b8d522f5da 100644 --- a/backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHHashJoinExecTransformer.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHHashJoinExecTransformer.scala @@ -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) diff --git a/cpp-ch/local-engine/Parser/JoinRelParser.cpp b/cpp-ch/local-engine/Parser/JoinRelParser.cpp index bb750a8d4b48b..ec36e29dc5626 100644 --- a/cpp-ch/local-engine/Parser/JoinRelParser.cpp +++ b/cpp-ch/local-engine/Parser/JoinRelParser.cpp @@ -310,6 +310,7 @@ DB::QueryPlanPtr JoinRelParser::parseJoin(const substrait::JoinRel & join, DB::Q } else { +#if 0 std::vector join_on_clauses; bool is_multi_join_on_clauses = isJoinWithMultiJoinOnClauses(table_join->getOnlyClause(), join_on_clauses, join, left_header, right_header); @@ -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)); }