Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
package org.apache.spark.sql.catalyst.optimizer

import org.apache.spark.sql.catalyst.analysis.PullOutNondeterministic
import org.apache.spark.sql.catalyst.expressions.{AliasHelper, AttributeSet}
import org.apache.spark.sql.catalyst.expressions.{Alias, AliasHelper, AttributeSet, ExpressionSet}
import org.apache.spark.sql.catalyst.expressions.aggregate.AggregateExpression
import org.apache.spark.sql.catalyst.plans.logical.{Aggregate, LogicalPlan}
import org.apache.spark.sql.catalyst.plans.logical.{Aggregate, LogicalPlan, Project}
import org.apache.spark.sql.catalyst.rules.Rule
import org.apache.spark.sql.catalyst.trees.TreePattern.AGGREGATE

Expand All @@ -47,6 +47,17 @@ object RemoveRedundantAggregates extends Rule[LogicalPlan] with AliasHelper {
} else {
newAggregate
}

case agg @ Aggregate(groupingExps, _, child)
if agg.groupOnly && child.deterministic &&
child.distinctKeys.exists(_.subsetOf(ExpressionSet(groupingExps))) =>
Project(agg.aggregateExpressions, child)

case agg @ Aggregate(groupingExps, aggregateExps, child)
if aggregateExps.forall(a => a.isInstanceOf[Alias] && a.children.forall(_.foldable)) &&
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about a mix? e.g. SELECT a, 1, b FROM ... GROUP BY a, b, c

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

child.deterministic &&
child.distinctKeys.exists(_.subsetOf(ExpressionSet(groupingExps))) =>
Project(agg.aggregateExpressions, child)
}

private def isLowerRedundant(upper: Aggregate, lower: Aggregate): Boolean = {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
/*
* 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.catalyst.plans.logical

import org.apache.spark.sql.catalyst.expressions.{Alias, Expression, ExpressionSet, NamedExpression}
import org.apache.spark.sql.catalyst.planning.ExtractEquiJoinKeys
import org.apache.spark.sql.catalyst.plans.{Inner, LeftSemiOrAnti}

/**
* A visitor pattern for traversing a [[LogicalPlan]] tree and propagate the distinct attributes.
*/
object DistinctKeyVisitor extends LogicalPlanVisitor[Set[ExpressionSet]] {

private def projectDistinctKeys(
keys: Set[ExpressionSet], projectList: Seq[NamedExpression]): Set[ExpressionSet] = {
val outputSet = ExpressionSet(projectList.map(_.toAttribute))
val distinctKeys = keys.filter(_.subsetOf(outputSet))
val aliases = projectList.filter(_.isInstanceOf[Alias])
if (aliases.isEmpty) {
distinctKeys
} else {
val aliasedDistinctKeys = keys.map { expressionSet =>
expressionSet.map { expression =>
expression transform {
case expr: Expression =>
aliases
.collectFirst { case a: Alias if a.child.semanticEquals(expr) => a.toAttribute }
.getOrElse(expr)
}
}
}
aliasedDistinctKeys.collect {
case es: ExpressionSet if es.subsetOf(outputSet) => ExpressionSet(es)
} ++ distinctKeys
}.filter(_.nonEmpty)
}

override def default(p: LogicalPlan): Set[ExpressionSet] = Set.empty[ExpressionSet]

override def visitAggregate(p: Aggregate): Set[ExpressionSet] = {
val groupingExps = ExpressionSet(p.groupingExpressions) // handle group by a, a
projectDistinctKeys(Set(groupingExps), p.aggregateExpressions)
}

override def visitDistinct(p: Distinct): Set[ExpressionSet] = Set(ExpressionSet(p.output))

override def visitExcept(p: Except): Set[ExpressionSet] =
if (!p.isAll && p.deterministic) Set(ExpressionSet(p.output)) else default(p)

override def visitExpand(p: Expand): Set[ExpressionSet] = default(p)

override def visitFilter(p: Filter): Set[ExpressionSet] = p.child.distinctKeys

override def visitGenerate(p: Generate): Set[ExpressionSet] = default(p)

override def visitGlobalLimit(p: GlobalLimit): Set[ExpressionSet] = {
p.maxRows match {
case Some(value) if value <= 1 => Set(ExpressionSet(p.output))
case _ => p.child.distinctKeys
}
}

override def visitIntersect(p: Intersect): Set[ExpressionSet] = {
if (!p.isAll && p.deterministic) Set(ExpressionSet(p.output)) else default(p)
}

override def visitJoin(p: Join): Set[ExpressionSet] = {
p match {
case Join(_, _, LeftSemiOrAnti(_), _, _) =>
p.left.distinctKeys
case ExtractEquiJoinKeys(Inner, leftKeys, rightKeys, _, _, _, _, _)
if p.left.distinctKeys.exists(_.subsetOf(ExpressionSet(leftKeys))) &&
p.right.distinctKeys.exists(_.subsetOf(ExpressionSet(rightKeys))) =>
Set(ExpressionSet(leftKeys), ExpressionSet(rightKeys))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if p.left.distinctKeys.exists(_.subsetOf(ExpressionSet(leftKeys))), we can propagate the right side distinct keys, right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

case _ => default(p)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for left outer, we can propagate from right side.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spark.sql("create table t1(a int, b int) using parquet")
spark.sql("create table t2(x int, y int) using parquet")

spark.sql("insert into t1 values(1, 1), (2, 2)")
spark.sql("insert into t2 values(3, 3), (4, 4)")

spark.sql("select * from t1 left join (select distinct * from t2)t2 on t1.a = t2.x and t1.b = t2.y").show

The output is:

+---+---+----+----+
|  a|  b|   x|   y|
+---+---+----+----+
|  2|  2|null|null|
|  1|  1|null|null|
+---+---+----+----+

We can't distinguish the distinct keys.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry my fault. We can propagate the left side distinct keys if p.right.distinctKeys.exists(_.subsetOf(rightJoinKeySet))

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

}
}

override def visitLocalLimit(p: LocalLimit): Set[ExpressionSet] = p.child.distinctKeys

override def visitPivot(p: Pivot): Set[ExpressionSet] = default(p)

override def visitProject(p: Project): Set[ExpressionSet] = {
if (p.child.distinctKeys.nonEmpty) {
projectDistinctKeys(p.child.distinctKeys.map(ExpressionSet(_)), p.projectList)
} else {
default(p)
}
}

override def visitRepartition(p: Repartition): Set[ExpressionSet] = p.child.distinctKeys

override def visitRepartitionByExpr(p: RepartitionByExpression): Set[ExpressionSet] =
p.child.distinctKeys

override def visitSample(p: Sample): Set[ExpressionSet] = {
if (!p.withReplacement) p.child.distinctKeys else default(p)
}

override def visitScriptTransform(p: ScriptTransformation): Set[ExpressionSet] = default(p)

override def visitUnion(p: Union): Set[ExpressionSet] = default(p)

override def visitWindow(p: Window): Set[ExpressionSet] = p.child.distinctKeys

override def visitTail(p: Tail): Set[ExpressionSet] = p.child.distinctKeys

override def visitSort(p: Sort): Set[ExpressionSet] = p.child.distinctKeys

override def visitRebalancePartitions(p: RebalancePartitions): Set[ExpressionSet] =
p.child.distinctKeys

override def visitWithCTE(p: WithCTE): Set[ExpressionSet] = p.plan.distinctKeys
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ abstract class LogicalPlan
extends QueryPlan[LogicalPlan]
with AnalysisHelper
with LogicalPlanStats
with LogicalPlanDistinctKeys
with QueryPlanConstraints
with Logging {

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* 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.catalyst.plans.logical

import org.apache.spark.sql.catalyst.expressions.ExpressionSet
import org.apache.spark.sql.internal.SQLConf.PROPAGATE_DISTINCT_KEYS_ENABLED

/**
* A trait to add distinct attributes to [[LogicalPlan]]. For example:
* {{{
* SELECT a, b, SUM(c) FROM Tab1 GROUP BY a, b
* // returns a, b
* }}}
*/
trait LogicalPlanDistinctKeys { self: LogicalPlan =>
lazy val distinctKeys: Set[ExpressionSet] = {
if (conf.getConf(PROPAGATE_DISTINCT_KEYS_ENABLED)) DistinctKeyVisitor.visit(self) else Set.empty
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,15 @@ object SQLConf {
.booleanConf
.createWithDefault(true)

val PROPAGATE_DISTINCT_KEYS_ENABLED =
buildConf("spark.sql.optimizer.propagateDistinctKeys.enabled")
.internal()
.doc("When true, the query optimizer will propagate a set of distinct attributes from the " +
"current node and use it to optimize query.")
.version("3.3.0")
.booleanConf
.createWithDefault(true)

val ESCAPED_STRING_LITERALS = buildConf("spark.sql.parser.escapedStringLiterals")
.internal()
.doc("When true, string literals (including regex patterns) remain escaped in our SQL " +
Expand Down
Loading