Skip to content

[SPARK-23823][SQL] Keep origin in transformExpression #20961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jiahuijiang wants to merge 4 commits into from
Closed

[SPARK-23823][SQL] Keep origin in transformExpression #20961

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e83805
[SPARK-23823][SQL] Keep origin in transformExpression
Apr 2, 2018
8396dbb
Update QueryPlan.scala
Apr 4, 2018
52e8875
Add a test for QueryPlan mapExpressions
Apr 4, 2018
a1c029c
Update QueryPlanSuite.scala
Apr 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/QueryPlan.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down Expand Up @@ -103,7 +103,7 @@ abstract class QueryPlan[PlanType <: QueryPlan[PlanType]] extends TreeNode[PlanT
var changed = false

@inline def transformExpression(e: Expression): Expression = {
val newE = f(e)
val newE = CurrentOrigin.withOrigin(e.origin) { f(e) }

@gatorsmile gatorsmile Apr 4, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: style issue:

      val newE = CurrentOrigin.withOrigin(e.origin) {
        f(e)
      }

if (newE.fastEquals(e)) {
e
} else {
Expand Down