Skip to content

[SPARK-20164][SQL] AnalysisException not tolerant of null query plan. #17486

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
kunalkhamar wants to merge 4 commits into from
Closed

[SPARK-20164][SQL] AnalysisException not tolerant of null query plan. #17486

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3c1970
Add null check to AnalysisException.
kunalkhamar Mar 30, 2017
14fd95d
Add a unit test.
kunalkhamar Mar 30, 2017
1606320
Change from review.
kunalkhamar Mar 30, 2017
c8aebe7
Flatten nested option.
kunalkhamar Mar 31, 2017
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
2 changes: 1 addition & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/AnalysisException.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class AnalysisException protected[sql] (
}

override def getMessage: String = {
val planAnnotation = plan.map(p => s";\n$p").getOrElse("")
val planAnnotation = Option(plan).map(p => s";\n$p").getOrElse("")

@gatorsmile gatorsmile Mar 31, 2017

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.

Sorry, my fault. We need another flatten.

    val planAnnotation = Option(plan).flatten.map(p => s";\n$p").getOrElse("")

@kunalkhamar kunalkhamar Mar 31, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Right, updated.

getSimpleMessage + planAnnotation
}

Expand Down
8 changes: 8 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2598,4 +2598,12 @@ class SQLQuerySuite extends QueryTest with SharedSQLContext {
}
assert(!jobStarted.get(), "Command should not trigger a Spark job.")
}

test("SPARK-20164: AnalysisException should be tolerant to null query plan") {
try {
throw new AnalysisException("", None, None, plan = null)
} catch {
case ae: AnalysisException => assert(ae.plan == null && ae.getMessage == ae.getSimpleMessage)
}
}
}