Skip to content

[SPARK-41481][CORE][SQL] Reuse INVALID_TYPED_LITERAL instead of _LEGACY_ERROR_TEMP_0020 #39025

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
LuciferYang wants to merge 8 commits into from
Closed

[SPARK-41481][CORE][SQL] Reuse INVALID_TYPED_LITERAL instead of _LEGACY_ERROR_TEMP_0020 #39025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
670e51f
reuse
LuciferYang Dec 12, 2022
07337a6
remove _LEGACY_ERROR_TEMP_1020
LuciferYang Dec 12, 2022
9858777
revert_LEGACY_ERROR_TEMP_1020
LuciferYang Dec 12, 2022
c8e8973
remove _LEGACY_ERROR_TEMP_0020
LuciferYang Dec 12, 2022
0ba0760
update golden files
LuciferYang Dec 12, 2022
0e47220
Merge branch 'SPARK-41481' of github.com:LuciferYang/spark into SPARK…
LuciferYang Dec 12, 2022
b16bae5
Merge branch 'SPARK-41481' of github.com:LuciferYang/spark into SPARK…
LuciferYang Dec 12, 2022
3364214
fix test suites
LuciferYang Dec 12, 2022
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
5 changes: 0 additions & 5 deletions core/src/main/resources/error/error-classes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1610,11 +1610,6 @@
"Function trim doesn't support with type <trimOption>. Please use BOTH, LEADING or TRAILING as trim type."
]
},
"_LEGACY_ERROR_TEMP_0020" : {
"message" : [
"Cannot parse the INTERVAL value: <value>."
]
},
"_LEGACY_ERROR_TEMP_0022" : {
"message" : [
"<msg>."
Expand Down
2 changes: 1 addition & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2417,7 +2417,7 @@ class AstBuilder extends SqlBaseParserBaseVisitor[AnyRef] with SQLConfHelper wit
IntervalUtils.stringToInterval(UTF8String.fromString(value))
} catch {
case e: IllegalArgumentException =>
val ex = QueryParsingErrors.cannotParseIntervalValueError(value, ctx)
val ex = QueryParsingErrors.cannotParseValueTypeError(valueType, value, ctx)
Copy link
Contributor Author

@LuciferYang LuciferYang Dec 12, 2022

Choose a reason for hiding this comment

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

@MaxGekk do you think the valueType use INTERVAL is OK?

Copy link
Member

@MaxGekk MaxGekk Dec 12, 2022

Choose a reason for hiding this comment

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

I think, it is ok.

ex.setStackTrace(e.getStackTrace)
throw ex
}
Expand Down
7 changes: 0 additions & 7 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryParsingErrors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,13 +219,6 @@ private[sql] object QueryParsingErrors extends QueryErrorsBase {
ctx)
}

def cannotParseIntervalValueError(value: String, ctx: TypeConstructorContext): Throwable = {
new ParseException(
errorClass = "_LEGACY_ERROR_TEMP_0020",
messageParameters = Map("value" -> value),
ctx)
}

def literalValueTypeUnsupportedError(
unsupportedType: String,
supportedTypes: Seq[String],
Expand Down
21 changes: 15 additions & 6 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/ExpressionParserSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,8 +602,11 @@ class ExpressionParserSuite extends AnalysisTest {
assertEqual("INTERVAL '1 year 2 month'", ymIntervalLiteral)
checkError(
exception = parseException("Interval 'interval 1 yearsss 2 monthsss'"),
errorClass = "_LEGACY_ERROR_TEMP_0020",
parameters = Map("value" -> "interval 1 yearsss 2 monthsss"),
errorClass = "INVALID_TYPED_LITERAL",
parameters = Map(
"valueType" -> "\"INTERVAL\"",
"value" -> "'interval 1 yearsss 2 monthsss'"
),
context = ExpectedContext(
fragment = "Interval 'interval 1 yearsss 2 monthsss'",
start = 0,
Expand All @@ -616,8 +619,11 @@ class ExpressionParserSuite extends AnalysisTest {
assertEqual("INTERVAL '1 day 2 hour 3 minute 4.005006 second'", dtIntervalLiteral)
checkError(
exception = parseException("Interval 'interval 1 daysss 2 hoursss'"),
errorClass = "_LEGACY_ERROR_TEMP_0020",
parameters = Map("value" -> "interval 1 daysss 2 hoursss"),
errorClass = "INVALID_TYPED_LITERAL",
parameters = Map(
"valueType" -> "\"INTERVAL\"",
"value" -> "'interval 1 daysss 2 hoursss'"
),
context = ExpectedContext(
fragment = "Interval 'interval 1 daysss 2 hoursss'",
start = 0,
Expand All @@ -639,8 +645,11 @@ class ExpressionParserSuite extends AnalysisTest {
assertEqual("INTERVAL '3 month 1 hour'", intervalLiteral)
checkError(
exception = parseException("Interval 'interval 3 monthsss 1 hoursss'"),
errorClass = "_LEGACY_ERROR_TEMP_0020",
parameters = Map("value" -> "interval 3 monthsss 1 hoursss"),
errorClass = "INVALID_TYPED_LITERAL",
parameters = Map(
"valueType" -> "\"INTERVAL\"",
"value" -> "'interval 3 monthsss 1 hoursss'"
),
context = ExpectedContext(
fragment = "Interval 'interval 3 monthsss 1 hoursss'",
start = 0,
Expand Down
60 changes: 40 additions & 20 deletions sql/core/src/test/resources/sql-tests/results/ansi/interval.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2398,9 +2398,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "中文 interval 1 day"
"value" : "'中文 interval 1 day'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand All @@ -2419,9 +2421,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "interval中文 1 day"
"value" : "'interval中文 1 day'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand All @@ -2440,9 +2444,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "interval 1中文day"
"value" : "'interval 1中文day'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand Down Expand Up @@ -2579,9 +2585,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "+"
"value" : "'+'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand All @@ -2600,9 +2608,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "+."
"value" : "'+.'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand All @@ -2621,9 +2631,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "1"
"value" : "'1'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand All @@ -2642,9 +2654,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "1.2"
"value" : "'1.2'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand All @@ -2663,9 +2677,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "- 2"
"value" : "'- 2'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand All @@ -2684,9 +2700,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "1 day -"
"value" : "'1 day -'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand All @@ -2705,9 +2723,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "1 day 1"
"value" : "'1 day 1'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand Down
60 changes: 40 additions & 20 deletions sql/core/src/test/resources/sql-tests/results/interval.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2211,9 +2211,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "中文 interval 1 day"
"value" : "'中文 interval 1 day'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand All @@ -2232,9 +2234,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "interval中文 1 day"
"value" : "'interval中文 1 day'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand All @@ -2253,9 +2257,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "interval 1中文day"
"value" : "'interval 1中文day'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand Down Expand Up @@ -2392,9 +2398,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "+"
"value" : "'+'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand All @@ -2413,9 +2421,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "+."
"value" : "'+.'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand All @@ -2434,9 +2444,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "1"
"value" : "'1'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand All @@ -2455,9 +2467,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "1.2"
"value" : "'1.2'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand All @@ -2476,9 +2490,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "- 2"
"value" : "'- 2'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand All @@ -2497,9 +2513,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "1 day -"
"value" : "'1 day -'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand All @@ -2518,9 +2536,11 @@ struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException
{
"errorClass" : "_LEGACY_ERROR_TEMP_0020",
"errorClass" : "INVALID_TYPED_LITERAL",
"sqlState" : "42000",
"messageParameters" : {
"value" : "1 day 1"
"value" : "'1 day 1'",
"valueType" : "\"INTERVAL\""
},
"queryContext" : [ {
"objectType" : "",
Expand Down