From c6315975921dbebdfc202e9c260c29bfd3baf84d Mon Sep 17 00:00:00 2001 From: loneylee Date: Thu, 4 Jul 2024 15:00:17 +0800 Subject: [PATCH] tag --- .../apache/gluten/backendsapi/clickhouse/CHBackend.scala | 2 +- cpp-ch/local-engine/Parser/CrossRelParser.cpp | 1 - .../sql/execution/ColumnarBroadcastExchangeExec.scala | 8 ++++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHBackend.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHBackend.scala index 129e0857c898c..b0c077dcb9dbb 100644 --- a/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHBackend.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHBackend.scala @@ -300,7 +300,7 @@ object CHBackendSettings extends BackendSettingsApi with Logging { override def mergeTwoPhasesHashBaseAggregateIfNeed(): Boolean = true override def supportBroadcastNestedJoinJoinType: JoinType => Boolean = { - case _: InnerLike | LeftOuter | RightOuter | LeftSemi | FullOuter => true + case _: InnerLike | LeftSemi | FullOuter => true case _ => false } } diff --git a/cpp-ch/local-engine/Parser/CrossRelParser.cpp b/cpp-ch/local-engine/Parser/CrossRelParser.cpp index 2b573dc5055dc..af0bdba53b622 100644 --- a/cpp-ch/local-engine/Parser/CrossRelParser.cpp +++ b/cpp-ch/local-engine/Parser/CrossRelParser.cpp @@ -217,7 +217,6 @@ void CrossRelParser::addPostFilter(DB::QueryPlan & query_plan, const substrait:: { // It may be singular_or_list auto * in_node = getPlanParser()->parseExpression(actions_dag, expression); - auto a = isColumnConst(*in_node->column); filter_name = in_node->result_name; } else diff --git a/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarBroadcastExchangeExec.scala b/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarBroadcastExchangeExec.scala index 4da7a2f6f11ae..3d7a075bfb26f 100644 --- a/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarBroadcastExchangeExec.scala +++ b/gluten-core/src/main/scala/org/apache/spark/sql/execution/ColumnarBroadcastExchangeExec.scala @@ -134,6 +134,14 @@ case class ColumnarBroadcastExchangeExec(mode: BroadcastMode, child: SparkPlan) } override protected def doValidateInternal(): ValidationResult = { +// // CH backend does not support IdentityBroadcastMode used in BNLJ +// if ( +// mode == IdentityBroadcastMode && !BackendsApiManager.getSettings +// .supportBroadcastNestedLoopJoinExec() +// ) { +// return ValidationResult.notOk("This backend does not support IdentityBroadcastMode and BNLJ") +// } + BackendsApiManager.getValidatorApiInstance .doSchemaValidate(schema) .map {