Skip to content

Commit e707881

Browse files
committed
Addresses PR comments
1 parent d8ca6d7 commit e707881

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,9 @@ class Analyzer(
562562

563563
resolveExpression(unbound, LocalRelation(attributes), throws = true) transform {
564564
case n: NewInstance
565+
// If this is an inner class of another class, register the outer object in `OuterScopes`.
566+
// Note that static inner classes (e.g., inner classes within Scala objects) don't need
567+
// outer pointer registration.
565568
if n.outerPointer.isEmpty &&
566569
n.cls.isMemberClass &&
567570
!Modifier.isStatic(n.cls.getModifiers) =>

sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -622,8 +622,7 @@ class DatasetSuite extends QueryTest with SharedSQLContext {
622622
Some(1), Some(2), Some(3))
623623
}
624624

625-
test("SPARK-13540 add Scala object to OuterScopes") {
626-
OuterScopes.addOuterScope(OuterObject)
625+
test("SPARK-13540 Dataset of nested class defined in Scala object") {
627626
checkAnswer(
628627
Seq(OuterObject.InnerClass("foo")).toDS(),
629628
OuterObject.InnerClass("foo"))

0 commit comments

Comments
 (0)