mapexpressions preserving origin

Robert Kruszewski · Robert Kruszewski · commit a7383de811ea · 2018-03-30T03:30:51.000+01:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/QueryPlan.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/QueryPlan.scala
@@ -18,7 +18,7 @@
 package org.apache.spark.sql.catalyst.plans
 
 import org.apache.spark.sql.catalyst.expressions._
-import org.apache.spark.sql.catalyst.trees.TreeNode
+import org.apache.spark.sql.catalyst.trees.{CurrentOrigin, TreeNode}
 import org.apache.spark.sql.internal.SQLConf
 import org.apache.spark.sql.types.{DataType, StructType}
 
@@ -122,7 +122,7 @@ abstract class QueryPlan[PlanType <: QueryPlan[PlanType]] extends TreeNode[PlanT
       case null => null
     }
 
-    val newArgs = mapProductIterator(recursiveTransform)
+    val newArgs = CurrentOrigin.withOrigin(origin) { mapProductIterator(recursiveTransform) }
 
     if (changed) makeCopy(newArgs).asInstanceOf[this.type] else this
   }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`package org.apache.spark.sql.catalyst.plans`
`19`	`19`
`20`	`20`	`import org.apache.spark.sql.catalyst.expressions._`
`21`		`-import org.apache.spark.sql.catalyst.trees.TreeNode`
	`21`	`+import org.apache.spark.sql.catalyst.trees.{CurrentOrigin, TreeNode}`
`22`	`22`	`import org.apache.spark.sql.internal.SQLConf`
`23`	`23`	`import org.apache.spark.sql.types.{DataType, StructType}`
`24`	`24`
`@@ -122,7 +122,7 @@ abstract class QueryPlan[PlanType <: QueryPlan[PlanType]] extends TreeNode[PlanT`
`122`	`122`	`case null => null`
`123`	`123`	`}`
`124`	`124`
`125`		`- val newArgs = mapProductIterator(recursiveTransform)`
	`125`	`+ val newArgs = CurrentOrigin.withOrigin(origin) { mapProductIterator(recursiveTransform) }`
`126`	`126`
`127`	`127`	`if (changed) makeCopy(newArgs).asInstanceOf[this.type] else this`
`128`	`128`	`}`