Skip to content

Commit 636ce22

Browse files
authored
minor: Reduce misleading fallback warnings (#2283)
1 parent a576c22 commit 636ce22

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

spark/src/main/scala/org/apache/comet/rules/CometExecRule.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import org.apache.spark.sql.catalyst.rules.Rule
3030
import org.apache.spark.sql.comet._
3131
import org.apache.spark.sql.comet.execution.shuffle.{CometColumnarShuffle, CometNativeShuffle, CometShuffleExchangeExec, CometShuffleManager}
3232
import org.apache.spark.sql.execution._
33-
import org.apache.spark.sql.execution.adaptive.{AQEShuffleReadExec, BroadcastQueryStageExec, ShuffleQueryStageExec}
33+
import org.apache.spark.sql.execution.adaptive.{AdaptiveSparkPlanExec, AQEShuffleReadExec, BroadcastQueryStageExec, ShuffleQueryStageExec}
3434
import org.apache.spark.sql.execution.aggregate.{BaseAggregateExec, HashAggregateExec, ObjectHashAggregateExec}
3535
import org.apache.spark.sql.execution.exchange.{BroadcastExchangeExec, ReusedExchangeExec, ShuffleExchangeExec}
3636
import org.apache.spark.sql.execution.joins.{BroadcastHashJoinExec, ShuffledHashJoinExec, SortMergeJoinExec}
@@ -534,7 +534,8 @@ case class CometExecRule(session: SparkSession) extends Rule[SparkPlan] {
534534
case op =>
535535
op match {
536536
case _: CometExec | _: AQEShuffleReadExec | _: BroadcastExchangeExec |
537-
_: CometBroadcastExchangeExec | _: CometShuffleExchangeExec =>
537+
_: CometBroadcastExchangeExec | _: CometShuffleExchangeExec |
538+
_: BroadcastQueryStageExec | _: AdaptiveSparkPlanExec =>
538539
// Some execs should never be replaced. We include
539540
// these cases specially here so we do not add a misleading 'info' message
540541
op
@@ -799,7 +800,7 @@ case class CometExecRule(session: SparkSession) extends Rule[SparkPlan] {
799800
}
800801

801802
if (!isCometPlan(s.child)) {
802-
withInfo(s, s"Child ${s.child.getClass.getName} is not native")
803+
// we do not need to report a fallback reason if the child plan is not a Comet plan
803804
return false
804805
}
805806

spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ object QueryPlanSerde extends Logging with CometExprShim {
512512

513513
if (aggExpr.isDistinct) {
514514
// https://github.com/apache/datafusion-comet/issues/1260
515-
withInfo(aggExpr, "distinct aggregates are not supported")
515+
withInfo(aggExpr, s"distinct aggregate not supported: $aggExpr")
516516
return None
517517
}
518518

0 commit comments

Comments
 (0)