Skip to content

[SPARK-29855][SQL] typed literals with negative sign with proper result or exception #26479

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
yaooqinn wants to merge 2 commits into from
Closed

[SPARK-29855][SQL] typed literals with negative sign with proper result or exception #26479

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
1d04cb3
[SPARK-29855][SQL] typed literals with negative sign with proper resu…
yaooqinn Nov 12, 2019
8f524c3
simplify negative check
yaooqinn Nov 12, 2019
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
17 changes: 11 additions & 6 deletions 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 @@ -1860,16 +1860,19 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging
override def visitTypeConstructor(ctx: TypeConstructorContext): Literal = withOrigin(ctx) {
val value = string(ctx.STRING)
val valueType = ctx.identifier.getText.toUpperCase(Locale.ROOT)
val negativeSign = Option(ctx.negativeSign).map(_.getText).getOrElse("")
val isNegative = if (negativeSign == "-") true else false
Copy link
Contributor

@cloud-fan cloud-fan Nov 12, 2019

Choose a reason for hiding this comment

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

is it simply val isNegative = ctx.negativeSign != null?

Copy link
Member

@MaxGekk MaxGekk Nov 12, 2019

Choose a reason for hiding this comment

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

Suggested change
val isNegative = if (negativeSign == "-") true else false
val isNegative = ctx.negativeSign != null && ctx.negativeSign.getText == "-"

Copy link
Member

@MaxGekk MaxGekk Nov 12, 2019

Choose a reason for hiding this comment

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

and remove val negativeSign

Copy link
Contributor

@cloud-fan cloud-fan Nov 12, 2019

Choose a reason for hiding this comment

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

do we really need to check ctx.negativeSign.getText? the parser rule is MINUS? ...

Copy link
Member Author

@yaooqinn yaooqinn Nov 12, 2019

Choose a reason for hiding this comment

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

negativeSign is used in error message, but I think @cloud-fan 's point is right, we need not to check ctx.negativeSign.getText. I'd do some tests to verify this.


def toLiteral[T](f: UTF8String => Option[T], t: DataType): Literal = {
f(UTF8String.fromString(value)).map(Literal(_, t)).getOrElse {
throw new ParseException(s"Cannot parse the $valueType value: $value", ctx)
}
}
try {
valueType match {
case "DATE" =>
case "DATE" if !isNegative =>
toLiteral(stringToDate(_, getZoneId(SQLConf.get.sessionLocalTimeZone)), DateType)
case "TIMESTAMP" =>
case "TIMESTAMP" if !isNegative =>
val zoneId = getZoneId(SQLConf.get.sessionLocalTimeZone)
toLiteral(stringToTimestamp(_, zoneId), TimestampType)
case "INTERVAL" =>
Expand All @@ -1881,8 +1884,9 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging
ex.setStackTrace(e.getStackTrace)
throw ex
}
Literal(applyNegativeSign(ctx.negativeSign, interval), CalendarIntervalType)
case "X" =>
val signedInterval = if (isNegative) IntervalUtils.negate(interval) else interval
Literal(signedInterval, CalendarIntervalType)
case "X" if !isNegative =>
val padding = if (value.length % 2 != 0) "0" else ""
Literal(DatatypeConverter.parseHexBinary(padding + value))
case "INTEGER" =>
Expand All @@ -1894,9 +1898,10 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging
ex.setStackTrace(e.getStackTrace)
throw ex
}
Literal(i, IntegerType)
Literal(if (isNegative) -i else i, IntegerType)
case other =>
throw new ParseException(s"Literals of type '$other' are currently not supported.", ctx)
throw new ParseException(s"Literals of type '$negativeSign$other' are currently not" +
" supported.", ctx)
}
} catch {
case e: IllegalArgumentException =>
Expand Down
7 changes: 7 additions & 0 deletions sql/core/src/test/resources/sql-tests/inputs/literals.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,3 +153,10 @@ select interval '1' year to second;
select '1' year to second;
select interval 1 year '2-1' year to month;
select 1 year '2-1' year to month;
SET spark.sql.ansi.enabled=false;
Copy link
Contributor

@cloud-fan cloud-fan Nov 12, 2019

Choose a reason for hiding this comment

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

not related to this PR, but it's really annoying to duplicate the test cases with ansi mode on and off.

I'm wondering if we can introduce a -- import abc.sql directive so that we can easily import test cases in ansi/interval.sql, with several ansi specific test cases. cc @maropu

Copy link
Member

@maropu maropu Nov 13, 2019

Choose a reason for hiding this comment

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

Ah, I see. That's certainly annoying. I'll try to make a pr later for that approach.


-- awareness for the negative sign before type
select -integer '7';
select -date '1999-01-01';
select -timestamp '1999-01-01';
select -x'2379ACFe';
60 changes: 59 additions & 1 deletion sql/core/src/test/resources/sql-tests/results/literals.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-- Automatically generated by SQLQueryTestSuite
-- Number of queries: 82
-- Number of queries: 87


-- !query 0
Expand Down Expand Up @@ -846,3 +846,61 @@ Can only have a single from-to unit in the interval literal syntax(line 1, pos 1
== SQL ==
select 1 year '2-1' year to month
--------------^^^


-- !query 82
SET spark.sql.ansi.enabled=false
-- !query 82 schema
struct<key:string,value:string>
-- !query 82 output
spark.sql.ansi.enabled false


-- !query 83
select -integer '7'
-- !query 83 schema
struct<-7:int>
-- !query 83 output
-7


-- !query 84
select -date '1999-01-01'
-- !query 84 schema
struct<>
-- !query 84 output
org.apache.spark.sql.catalyst.parser.ParseException

Literals of type '-DATE' are currently not supported.(line 1, pos 7)

== SQL ==
select -date '1999-01-01'
-------^^^


-- !query 85
select -timestamp '1999-01-01'
-- !query 85 schema
struct<>
-- !query 85 output
org.apache.spark.sql.catalyst.parser.ParseException

Literals of type '-TIMESTAMP' are currently not supported.(line 1, pos 7)

== SQL ==
select -timestamp '1999-01-01'
-------^^^


-- !query 86
select -x'2379ACFe'
-- !query 86 schema
struct<>
-- !query 86 output
org.apache.spark.sql.catalyst.parser.ParseException

Literals of type '-X' are currently not supported.(line 1, pos 7)

== SQL ==
select -x'2379ACFe'
-------^^^
Expand Down