[GitHub] [spark] ulysses-you commented on a change in pull request #32602: [SPARK-35455][SQL] Unify empty relation optimization between normal and AQE optimizer
ulysses-you commented on a change in pull request #32602:
URL: https://github.com/apache/spark/pull/32602#discussion_r642757227
##
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AQEOptimizer.scala
##
@@ -27,7 +28,9 @@ import org.apache.spark.util.Utils
*/
class AQEOptimizer(conf: SQLConf) extends RuleExecutor[LogicalPlan] {
private val defaultBatches = Seq(
-Batch("Eliminate Unnecessary Join", Once, EliminateUnnecessaryJoin),
+Batch("Propagate Empty Relations", Once,
+ AQEPropagateEmptyRelation,
+ UpdateAttributeNullability),
Review comment:
ah I see, will do this.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] [spark] ulysses-you commented on a change in pull request #32602: [SPARK-35455][SQL] Unify empty relation optimization between normal and AQE optimizer
ulysses-you commented on a change in pull request #32602:
URL: https://github.com/apache/spark/pull/32602#discussion_r642747242
##
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AQEOptimizer.scala
##
@@ -27,7 +28,9 @@ import org.apache.spark.util.Utils
*/
class AQEOptimizer(conf: SQLConf) extends RuleExecutor[LogicalPlan] {
private val defaultBatches = Seq(
-Batch("Eliminate Unnecessary Join", Once, EliminateUnnecessaryJoin),
+Batch("Propagate Empty Relations", Once,
+ AQEPropagateEmptyRelation,
+ UpdateAttributeNullability),
Review comment:
yeah, I noticed it. We can put it so that we can propagate empty through
`project/filter`. like such case:
```
Aggregate
Project
Join
Shuffle
```
But it need to isolate normal and AQE due to `transformWithPruning`.
Otherhand I feel that it's similar if we just let
`AQEPropagateEmptyRelation` support propagate `project/filter`. and the later
is simpler.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] [spark] ulysses-you commented on a change in pull request #32602: [SPARK-35455][SQL] Unify empty relation optimization between normal and AQE optimizer
ulysses-you commented on a change in pull request #32602:
URL: https://github.com/apache/spark/pull/32602#discussion_r638699902
##
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AQEPropagateEmptyRelation.scala
##
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.execution.adaptive
+
+import org.apache.spark.sql.catalyst.optimizer.PropagateEmptyRelationBase
+import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
+import org.apache.spark.sql.execution.joins.HashedRelationWithAllNullKeys
+
+/**
+ * Rule [[PropagateEmptyRelationBase]] at AQE side.
+ */
+object AQEPropagateEmptyRelation extends PropagateEmptyRelationBase {
+
+ override protected def checkRowCount(plan: LogicalPlan, hasRow: Boolean):
Option[Boolean] = {
+Some(plan match {
+ case LogicalQueryStage(_, stage: QueryStageExec) if
stage.resultOption.get().isDefined =>
+stage.getRuntimeStatistics.rowCount match {
+ case Some(count) => hasRow == (count > 0)
+ case _ => false
+}
+ case _ => false
+})
+ }
+
+ override protected def isRelationWithAllNullKeys(plan: LogicalPlan):
Option[Boolean] = {
+Some(plan match {
+ case LogicalQueryStage(_, stage: BroadcastQueryStageExec)
+if stage.resultOption.get().isDefined =>
+stage.broadcast.relationFuture.get().value ==
HashedRelationWithAllNullKeys
+ case _ => false
+})
+ }
+
+ // TODO we need use transformUpWithPruning instead of transformUp
+ def apply(plan: LogicalPlan): LogicalPlan = plan.transformUp {
Review comment:
@cloud-fan seems we don't need to use `transformUpWithPruning` here
since the AQE Optimizer always run once rather than fixed point ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] [spark] ulysses-you commented on a change in pull request #32602: [SPARK-35455][SQL] Unify empty relation optimization between normal and AQE optimizer
ulysses-you commented on a change in pull request #32602:
URL: https://github.com/apache/spark/pull/32602#discussion_r638384747
##
File path:
sql/core/src/test/scala/org/apache/spark/sql/execution/adaptive/AdaptiveQueryExecSuite.scala
##
@@ -1307,6 +1308,69 @@ class AdaptiveQueryExecSuite
}
}
+ test("SPARK-35455: Enhance EliminateUnnecessaryJoin - single join") {
Review comment:
Updated it and also updated the PR title.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
