Skip to content
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

Jump to bottom

[SPARK-39234][SQL][3.3] Code clean up in SparkThrowableHelper.getMessage #36669

Closed
wants to merge 2 commits into from
Closed

[SPARK-39234][SQL][3.3] Code clean up in SparkThrowableHelper.getMessage #36669

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9016339
[SPARK-39234][SQL] Code clean up in SparkThrowableHelper.getMessage
gengliangwang May 19, 2022
2cabb58
fix
gengliangwang May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/ErrorInfo.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private[spark] object SparkThrowableHelper {
val errorInfo = errorClassToInfoMap.getOrElse(errorClass,
throw new IllegalArgumentException(s"Cannot find error class '$errorClass'"))
String.format(errorInfo.messageFormat.replaceAll("<[a-zA-Z0-9_-]+>", "%s"),
messageParameters: _*) + queryContext
messageParameters: _*) + s"\n$queryContext"
}

def getSqlState(errorClass: String): String = {
Expand Down
2 changes: 1 addition & 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 @@ -89,7 +89,7 @@ case class Origin(
""
}
val builder = new StringBuilder
builder ++= s"\n== SQL$objectContext$positionContext ==\n"
builder ++= s"== SQL$objectContext$positionContext ==\n"

val text = sqlText.get
val start = math.max(startIndex.get, 0)
Expand Down
3 changes: 1 addition & 2 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/trees/TreeNodeSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,8 +876,7 @@ class TreeNodeSuite extends SparkFunSuite with SQLHelper {
objectType = Some("VIEW"),
objectName = Some("some_view"))
val expected =
"""
|== SQL of VIEW some_view(line 3, position 38) ==
"""== SQL of VIEW some_view(line 3, position 38) ==
|...7890 + 1234567890 + 1234567890, cast('a'
| ^^^^^^^^
|as /* comment */
Expand Down