peter-toth commented on code in PR #40268:
URL: https://github.com/apache/spark/pull/40268#discussion_r1126353859
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/expressions.scala:
##########
@@ -198,16 +192,15 @@ object ConstantPropagation extends Rule[LogicalPlan] {
private def safeToReplace(ar: AttributeReference, nullIsFalse: Boolean) =
!ar.nullable || nullIsFalse
- private def replaceConstants(condition: Expression, equalityPredicates:
EqualityPredicates)
- : Expression = {
- val constantsMap = AttributeMap(equalityPredicates.map(_._1))
- val predicates = equalityPredicates.map(_._2).toSet
- def replaceConstants0(expression: Expression) = expression transform {
- case a: AttributeReference => constantsMap.getOrElse(a, a)
- }
+ private def replaceConstants(
+ condition: Expression,
+ equalityPredicates: EqualityPredicates): Expression = {
+ val predicates = equalityPredicates.values.map(_._2).toSet
condition transform {
- case e @ EqualTo(_, _) if !predicates.contains(e) => replaceConstants0(e)
- case e @ EqualNullSafe(_, _) if !predicates.contains(e) =>
replaceConstants0(e)
+ case b: BinaryComparison if !predicates.contains(b) => b transform {
+ case a: AttributeReference if
equalityPredicates.contains(a.canonicalized) =>
+ equalityPredicates(a.canonicalized)._1
Review Comment:
I kept the current `mutable.Map` based `EqualityPredicates` so I chage it to
`case a: AttributeReference =>
equalityPredicates.get(a.canonicalized).map(_._1).getOrElse(a)`.
But if we decide to use `AttributeMap` then I can change it to the suggested.
--
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.
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
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
