From ef24b5cfb9ea071824e531eb1616c5b83938b75b Mon Sep 17 00:00:00 2001 From: Patrick Woody Date: Mon, 2 Apr 2018 12:59:51 -0400 Subject: [PATCH] Revert "transformexpression with origin" --- .../scala/org/apache/spark/sql/catalyst/plans/QueryPlan.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index 5fd26e18f9f28..ddf2cbf2ab911 100644 --- 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.{CurrentOrigin, TreeNode} +import org.apache.spark.sql.catalyst.trees.TreeNode import org.apache.spark.sql.internal.SQLConf import org.apache.spark.sql.types.{DataType, StructType} @@ -103,7 +103,7 @@ abstract class QueryPlan[PlanType <: QueryPlan[PlanType]] extends TreeNode[PlanT var changed = false @inline def transformExpression(e: Expression): Expression = { - val newE = CurrentOrigin.withOrigin(e.origin) { f(e) } + val newE = f(e) if (newE.fastEquals(e)) { e } else {