AngersZhuuuu commented on code in PR #53526:
URL: https://github.com/apache/spark/pull/53526#discussion_r2641737019
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/normalizer/NormalizeCTEIds.scala:
##########
@@ -17,29 +17,44 @@
package org.apache.spark.sql.catalyst.normalizer
+import java.util.concurrent.atomic.AtomicLong
+
+import scala.collection.mutable
+
import org.apache.spark.sql.catalyst.plans.logical.{CacheTableAsSelect,
CTERelationRef, LogicalPlan, UnionLoop, UnionLoopRef, WithCTE}
import org.apache.spark.sql.catalyst.rules.Rule
-object NormalizeCTEIds extends Rule[LogicalPlan]{
+object NormalizeCTEIds extends Rule[LogicalPlan] {
override def apply(plan: LogicalPlan): LogicalPlan = {
val curId = new java.util.concurrent.atomic.AtomicLong()
- plan transformDown {
+ val cteIdToNewId = mutable.Map.empty[Long, Long]
+ applyInternal(plan, curId, cteIdToNewId)
+ }
+ private def applyInternal(
+ plan: LogicalPlan,
+ curId: AtomicLong,
+ cteIdToNewId: mutable.Map[Long, Long]): LogicalPlan = {
+ plan transformDownWithSubqueries {
case ctas @ CacheTableAsSelect(_, plan, _, _, _, _, _) =>
- ctas.copy(plan = apply(plan))
+ ctas.copy(plan = applyInternal(plan, curId, cteIdToNewId))
case withCTE @ WithCTE(plan, cteDefs) =>
- val defIdToNewId = withCTE.cteDefs.map(_.id).map((_,
curId.getAndIncrement())).toMap
- val normalizedPlan = canonicalizeCTE(plan, defIdToNewId)
val newCteDefs = cteDefs.map { cteDef =>
- val normalizedCteDef = canonicalizeCTE(cteDef.child, defIdToNewId)
- cteDef.copy(child = normalizedCteDef, id = defIdToNewId(cteDef.id))
+ if (!cteIdToNewId.contains(cteDef.id)) {
Review Comment:
Done
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
