cloud-fan commented on a change in pull request #30504: URL: https://github.com/apache/spark/pull/30504#discussion_r530606734
########## File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala ########## @@ -873,24 +873,30 @@ object InferFiltersFromGenerate extends Rule[LogicalPlan] { if !e.deterministic || e.children.forall(_.foldable) => generate case generate @ Generate(g, _, false, _, _, _) if canInferFilters(g) => - // Exclude child's constraints to guarantee idempotency - val inferredFilters = ExpressionSet( - Seq( - GreaterThan(Size(g.children.head), Literal(0)), - IsNotNull(g.children.head) - ) - ) -- generate.child.constraints - - if (inferredFilters.nonEmpty) { - generate.copy(child = Filter(inferredFilters.reduce(And), generate.child)) - } else { - generate + g.children.head match { + case _: CreateNonEmptyNonNullCollection => + // we don't need to add filters when creating an array because we know its size + // is > 0 and its not null + generate + case _ => + // Exclude child's constraints to guarantee idempotency + val inferredFilters = ExpressionSet( + Seq( + GreaterThan(Size(g.children.head), Literal(0)), + IsNotNull(g.children.head) Review comment: In general, optimizer rules should be orthogonal. For this case, I think a better idea is to add a new optimizer rule, which optimizes `IsNotNull` and size check expressions above `CreateArray/Map` into true literal. ---------------------------------------------------------------- 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