[SPARK-13540][SQL] Supports using nested classes within Scala objects as Dataset element type #11421
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
liancheng
changed the title
|
cc @cloud-fan |
|
Test build #52147 has finished for PR 11421 at commit
|
liancheng
changed the title
|
Test build #52148 has finished for PR 11421 at commit
|
| @@ -559,7 +561,10 @@ class Analyzer( | |||
| } | |||
|
|
|||
| resolveExpression(unbound, LocalRelation(attributes), throws = true) transform { | |||
| case n: NewInstance if n.outerPointer.isEmpty && n.cls.isMemberClass => | |||
| case n: NewInstance | |||
There was a problem hiding this comment.
would be great to add some inline documentation what about these conditions are checking
|
Thanks for the review! Comments addressed. |
| case n: NewInstance if n.outerPointer.isEmpty && n.cls.isMemberClass => | ||
| case n: NewInstance | ||
| // If this is an inner class of another class, register the outer object in `OuterScopes`. | ||
| // Note that static inner classes (e.g., inner classes within Scala objects. don't need |
There was a problem hiding this comment.
nit: (e.g. inner classes within Scala objects)
|
LGTM except some minor comments. |
liancheng
force-pushed
the
spark-13540-object-as-outer-scope
branch
from
28e1139 to
4ce71ce
Compare
|
Test build #52164 has finished for PR 11421 at commit
|
|
retest this please |
|
Test build #52171 has finished for PR 11421 at commit
|
liancheng
force-pushed
the
spark-13540-object-as-outer-scope
branch
from
4ce71ce to
e707881
Compare
|
Test build #52173 has finished for PR 11421 at commit
|
|
Test build #52178 has finished for PR 11421 at commit
|
|
retest this please. |
1 task
|
Test build #52185 has finished for PR 11421 at commit
|
|
I'm merging this to master as it blocks #11431. |
roygao94
pushed a commit
to roygao94/spark
that referenced
this pull request
Mar 22, 2016
… as Dataset element type ## What changes were proposed in this pull request? Nested classes defined within Scala objects are translated into Java static nested classes. Unlike inner classes, they don't need outer scopes. But the analyzer still thinks that an outer scope is required. This PR fixes this issue simply by checking whether a nested class is static before looking up its outer scope. ## How was this patch tested? A test case is added to `DatasetSuite`. It checks contents of a Dataset whose element type is a nested class declared in a Scala object. Author: Cheng Lian <[email protected]> Closes apache#11421 from liancheng/spark-13540-object-as-outer-scope.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
Nested classes defined within Scala objects are translated into Java static nested classes. Unlike inner classes, they don't need outer scopes. But the analyzer still thinks that an outer scope is required.
This PR fixes this issue simply by checking whether a nested class is static before looking up its outer scope.
How was this patch tested?
A test case is added to
DatasetSuite. It checks contents of a Dataset whose element type is a nested class declared in a Scala object.