Skip to content

Use correct origin for attributes #325

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 13 commits into from
Closed

Use correct origin for attributes #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2316aa0
Use correct origin for attributes
Mar 2, 2018
80c0808
Update Analyzer.scala
Mar 2, 2018
1652933
Update Analyzer.scala
Mar 8, 2018
38be872
Revert "Update Analyzer.scala"
Mar 29, 2018
5dfcadd
fix
Mar 29, 2018
5e1f0e7
Merge remote-tracking branch 'upstream/jj/fix-attributes' into jj/fix…
Mar 29, 2018
52176fb
revert old changes
Mar 29, 2018
a1ac47b
revert old changes
Mar 29, 2018
15c5a8a
Update Analyzer.scala
Mar 29, 2018
c5c8f83
Update Analyzer.scala
Mar 30, 2018
eb26699
Update Analyzer.scala
Mar 30, 2018
efe09fe
keep origin for mapChildren and mapExpressions
Mar 30, 2018
fd86aee
Merge remote-tracking branch 'upstream/jj/fix-attributes' into jj/fix…
Mar 30, 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
1 change: 0 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,6 @@ class Analyzer(
result
case UnresolvedExtractValue(child, fieldExpr) if child.resolved =>
ExtractValue(child, fieldExpr, resolver)
case _ => e.mapChildren(resolve(_, q))
}

def apply(plan: LogicalPlan): LogicalPlan = plan.transformUp {
Expand Down
4 changes: 3 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,9 @@ abstract class TreeNode[BaseType <: TreeNode[BaseType]] extends Product {
val arr = Array.ofDim[B](productArity)
var i = 0
while (i < arr.length) {
arr(i) = f(productElement(i))
CurrentOrigin.withOrigin(origin) {
Copy link

@robert3005 robert3005 Mar 30, 2018

Choose a reason for hiding this comment

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

I don't think this is the origin you want - the one you want is productElement(i) since this is the element being mapped over. Fixing it here is hard because of types - as f takes Any. I spent some time looking at this yesterday and I think easiest thing to do is #344

arr(i) = f(productElement(i))
}
i += 1
}
arr
Expand Down