You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2016/08/20 02:54:29 UTC
spark git commit: [SPARK-17158][SQL] Change error message for out of
range numeric literals
Repository: spark
Updated Branches:
refs/heads/master a117afa7c -> ba1737c21
[SPARK-17158][SQL] Change error message for out of range numeric literals
## What changes were proposed in this pull request?
Modifies error message for numeric literals to
Numeric literal <literal> does not fit in range [min, max] for type <T>
## How was this patch tested?
Fixed up the error messages for literals.sql in SqlQueryTestSuite and re-ran via sbt. Also fixed up error messages in ExpressionParserSuite
Author: Srinath Shankar <sr...@databricks.com>
Closes #14721 from srinathshankar/sc4296.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ba1737c2
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ba1737c2
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ba1737c2
Branch: refs/heads/master
Commit: ba1737c21aab91ff3f1a1737aa2d6b07575e36a3
Parents: a117afa
Author: Srinath Shankar <sr...@databricks.com>
Authored: Fri Aug 19 19:54:26 2016 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Fri Aug 19 19:54:26 2016 -0700
----------------------------------------------------------------------
.../spark/sql/catalyst/parser/AstBuilder.scala | 29 ++++++++++++--------
.../catalyst/parser/ExpressionParserSuite.scala | 9 ++++--
.../sql-tests/results/literals.sql.out | 6 ++--
3 files changed, 27 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/ba1737c2/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
index 283e4d4..8b98efc 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
@@ -1278,10 +1278,17 @@ class AstBuilder extends SqlBaseBaseVisitor[AnyRef] with Logging {
}
/** Create a numeric literal expression. */
- private def numericLiteral(ctx: NumberContext)(f: String => Any): Literal = withOrigin(ctx) {
- val raw = ctx.getText
+ private def numericLiteral
+ (ctx: NumberContext, minValue: BigDecimal, maxValue: BigDecimal, typeName: String)
+ (converter: String => Any): Literal = withOrigin(ctx) {
+ val rawStrippedQualifier = ctx.getText.substring(0, ctx.getText.length - 1)
try {
- Literal(f(raw.substring(0, raw.length - 1)))
+ val rawBigDecimal = BigDecimal(rawStrippedQualifier)
+ if (rawBigDecimal < minValue || rawBigDecimal > maxValue) {
+ throw new ParseException(s"Numeric literal ${rawStrippedQualifier} does not " +
+ s"fit in range [${minValue}, ${maxValue}] for type ${typeName}", ctx)
+ }
+ Literal(converter(rawStrippedQualifier))
} catch {
case e: NumberFormatException =>
throw new ParseException(e.getMessage, ctx)
@@ -1291,29 +1298,29 @@ class AstBuilder extends SqlBaseBaseVisitor[AnyRef] with Logging {
/**
* Create a Byte Literal expression.
*/
- override def visitTinyIntLiteral(ctx: TinyIntLiteralContext): Literal = numericLiteral(ctx) {
- _.toByte
+ override def visitTinyIntLiteral(ctx: TinyIntLiteralContext): Literal = {
+ numericLiteral(ctx, Byte.MinValue, Byte.MaxValue, ByteType.simpleString)(_.toByte)
}
/**
* Create a Short Literal expression.
*/
- override def visitSmallIntLiteral(ctx: SmallIntLiteralContext): Literal = numericLiteral(ctx) {
- _.toShort
+ override def visitSmallIntLiteral(ctx: SmallIntLiteralContext): Literal = {
+ numericLiteral(ctx, Short.MinValue, Short.MaxValue, ShortType.simpleString)(_.toShort)
}
/**
* Create a Long Literal expression.
*/
- override def visitBigIntLiteral(ctx: BigIntLiteralContext): Literal = numericLiteral(ctx) {
- _.toLong
+ override def visitBigIntLiteral(ctx: BigIntLiteralContext): Literal = {
+ numericLiteral(ctx, Long.MinValue, Long.MaxValue, LongType.simpleString)(_.toLong)
}
/**
* Create a Double Literal expression.
*/
- override def visitDoubleLiteral(ctx: DoubleLiteralContext): Literal = numericLiteral(ctx) {
- _.toDouble
+ override def visitDoubleLiteral(ctx: DoubleLiteralContext): Literal = {
+ numericLiteral(ctx, Double.MinValue, Double.MaxValue, DoubleType.simpleString)(_.toDouble)
}
/**
http://git-wip-us.apache.org/repos/asf/spark/blob/ba1737c2/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/ExpressionParserSuite.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/ExpressionParserSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/ExpressionParserSuite.scala
index 849d962..401d9cd 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/ExpressionParserSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/ExpressionParserSuite.scala
@@ -375,18 +375,21 @@ class ExpressionParserSuite extends PlanTest {
// Tiny Int Literal
assertEqual("10Y", Literal(10.toByte))
- intercept("-1000Y")
+ intercept("-1000Y", s"does not fit in range [${Byte.MinValue}, ${Byte.MaxValue}]")
// Small Int Literal
assertEqual("10S", Literal(10.toShort))
- intercept("40000S")
+ intercept("40000S", s"does not fit in range [${Short.MinValue}, ${Short.MaxValue}]")
// Long Int Literal
assertEqual("10L", Literal(10L))
- intercept("78732472347982492793712334L")
+ intercept("78732472347982492793712334L",
+ s"does not fit in range [${Long.MinValue}, ${Long.MaxValue}]")
// Double Literal
assertEqual("10.0D", Literal(10.0D))
+ intercept("-1.8E308D", s"does not fit in range")
+ intercept("1.8E308D", s"does not fit in range")
// TODO we need to figure out if we should throw an exception here!
assertEqual("1E309", Literal(Double.PositiveInfinity))
}
http://git-wip-us.apache.org/repos/asf/spark/blob/ba1737c2/sql/core/src/test/resources/sql-tests/results/literals.sql.out
----------------------------------------------------------------------
diff --git a/sql/core/src/test/resources/sql-tests/results/literals.sql.out b/sql/core/src/test/resources/sql-tests/results/literals.sql.out
index b964a6f..67e6d78 100644
--- a/sql/core/src/test/resources/sql-tests/results/literals.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/literals.sql.out
@@ -41,7 +41,7 @@ struct<>
-- !query 4 output
org.apache.spark.sql.catalyst.parser.ParseException
-Value out of range. Value:"128" Radix:10(line 1, pos 7)
+Numeric literal 128 does not fit in range [-128, 127] for type tinyint(line 1, pos 7)
== SQL ==
select 128Y
@@ -71,7 +71,7 @@ struct<>
-- !query 7 output
org.apache.spark.sql.catalyst.parser.ParseException
-Value out of range. Value:"32768" Radix:10(line 1, pos 7)
+Numeric literal 32768 does not fit in range [-32768, 32767] for type smallint(line 1, pos 7)
== SQL ==
select 32768S
@@ -101,7 +101,7 @@ struct<>
-- !query 10 output
org.apache.spark.sql.catalyst.parser.ParseException
-For input string: "9223372036854775808"(line 1, pos 7)
+Numeric literal 9223372036854775808 does not fit in range [-9223372036854775808, 9223372036854775807] for type bigint(line 1, pos 7)
== SQL ==
select 9223372036854775808L
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org