More

apache · Jul 7, 2024 · dd44bfe · dd44bfe
1 parent ce9879f
commit dd44bfe
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/spark/src/main/scala/org/apache/spark/sql/comet/operators.scala b/spark/src/main/scala/org/apache/spark/sql/comet/operators.scala
@@ -381,11 +381,13 @@ abstract class CometNativeExec extends CometExec {
    */
   protected def canonicalizePlans(): CometNativeExec = {
     def transform(arg: Any): AnyRef = arg match {
-      case sparkPlan: SparkPlan if !sparkPlan.isInstanceOf[CometNativeExec] =>
+      case sparkPlan: SparkPlan
+          if !sparkPlan.isInstanceOf[CometNativeExec] &&
+            children.forall(_ != sparkPlan) =>
         // Different to Spark, Comet native query node might have a Spark plan as Product element.
         // We need to canonicalize the Spark plan. But it cannot be another Comet native query node,
         // otherwise it will cause recursive canonicalization.
-        sparkPlan.canonicalized
+        null
       case other: AnyRef => other
       case null => null
     }