Github user chenghao-intel commented on a diff in the pull request:
https://github.com/apache/spark/pull/4394#discussion_r24238455
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala
---
@@ -454,6 +455,74 @@ object PushPredicateThroughProject extends
Rule[LogicalPlan] {
}
/**
+ * Push [[Filter]] operators through [[Generate]] operators. Part of the
predicate which referenced
+ * attributes generated in [[Generate]] will remain above, and the rest
should be pushed beneath.
+ */
+object PushPredicateThroughGenerate extends Rule[LogicalPlan] {
+ /**
+ * Split a condition / predicate into conjuncts
+ * @param condition predicate
+ * @return conjuncts
+ */
+ private def split(condition: Expression): List[Expression] = condition
match {
+ case And(left, right) => split(left) ++ split(right)
+ case e: Expression => List(e)
+ }
+
+ /**
+ * Join a list of conjuncts into a single predicate
+ * @param conjuncts conjuncts
+ * @return Some(predicate) or None if conjunct list is empty
+ */
+ private def joinConjuncts(conjuncts: Seq[Expression]):
Option[Expression] = {
+ conjuncts.foldRight(None.asInstanceOf[Option[Expression]]) {
+ (conjunct, joint) => (conjunct, joint) match {
+ case (c: Expression, Some(j)) => Some(And(c, j))
+ case (c: Expression, None) => Some(c)
+ }
+ }
+ }
+
+ def apply(plan: LogicalPlan): LogicalPlan = plan transform {
+ case filter @ Filter(condition,
+ generate @ Generate(generator, join, outer, alias, grandChild)) =>
+ val conjuncts = split(condition)
+ val referencedAttrsInConjuncts =
conjuncts.zip(conjuncts.map(_.references))
+ val generatedAttrNames = generator match {
--- End diff --
Use the `alias` instead?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
