You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by gu...@apache.org on 2020/05/01 01:35:39 UTC
[spark] branch branch-3.0 updated: [SPARK-28424][TESTS][FOLLOW-UP]
Add test cases for all interval units
This is an automated email from the ASF dual-hosted git repository.
gurwls223 pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 7be1484 [SPARK-28424][TESTS][FOLLOW-UP] Add test cases for all interval units
7be1484 is described below
commit 7be1484272f8d4a17a990e57e6c30db4bef61fb6
Author: Yuanjian Li <xy...@gmail.com>
AuthorDate: Fri May 1 10:32:37 2020 +0900
[SPARK-28424][TESTS][FOLLOW-UP] Add test cases for all interval units
Add test cases covering all interval units: MICROSECOND MILLISECOND SECOND MINUTE HOUR DAY WEEK MONTH YEAR
For test coverage.
No.
Test only.
Closes #28418 from xuanyuanking/SPARK-28424.
Authored-by: Yuanjian Li <xy...@gmail.com>
Signed-off-by: HyukjinKwon <gu...@apache.org>
(cherry picked from commit aec8b694359a5a7fb42adfcbfe2f3cef2d307e28)
Signed-off-by: HyukjinKwon <gu...@apache.org>
---
.../spark/sql/catalyst/parser/ExpressionParserSuite.scala | 5 +++++
sql/core/src/test/resources/sql-tests/inputs/interval.sql | 1 +
.../src/test/resources/sql-tests/results/ansi/interval.sql.out | 10 +++++++++-
sql/core/src/test/resources/sql-tests/results/interval.sql.out | 10 +++++++++-
4 files changed, 24 insertions(+), 2 deletions(-)
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 522d49e..c74fab1 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
@@ -456,6 +456,11 @@ class ExpressionParserSuite extends AnalysisTest {
assertEqual(
"-interval '3 month 1 hour'",
UnaryMinus(Literal(IntervalUtils.stringToInterval("interval 3 month 1 hour"))))
+ val intervalStrWithAllUnits = "1 year 3 months 2 weeks 2 days 1 hour 3 minutes 2 seconds " +
+ "100 millisecond 200 microseconds"
+ assertEqual(
+ s"interval '$intervalStrWithAllUnits'",
+ Literal(IntervalUtils.stringToInterval(intervalStrWithAllUnits)))
// Binary.
assertEqual("X'A'", Literal(Array(0x0a).map(_.toByte)))
diff --git a/sql/core/src/test/resources/sql-tests/inputs/interval.sql b/sql/core/src/test/resources/sql-tests/inputs/interval.sql
index fec11b4..600df2c 100644
--- a/sql/core/src/test/resources/sql-tests/inputs/interval.sql
+++ b/sql/core/src/test/resources/sql-tests/inputs/interval.sql
@@ -71,6 +71,7 @@ select map(1, interval 1 day, 2, interval 3 week);
-- typed interval expression
select interval 'interval 3 year 1 hour';
select interval '3 year 1 hour';
+SELECT interval '1 year 3 months 2 weeks 2 days 1 hour 3 minutes 2 seconds 100 millisecond 200 microseconds';
-- malformed interval literal
select interval;
diff --git a/sql/core/src/test/resources/sql-tests/results/ansi/interval.sql.out b/sql/core/src/test/resources/sql-tests/results/ansi/interval.sql.out
index e8201d4..6a2b301 100644
--- a/sql/core/src/test/resources/sql-tests/results/ansi/interval.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/ansi/interval.sql.out
@@ -1,5 +1,5 @@
-- Automatically generated by SQLQueryTestSuite
--- Number of queries: 89
+-- Number of queries: 90
-- !query
@@ -472,6 +472,14 @@ struct<INTERVAL '3 years 1 hours':interval>
-- !query
+SELECT interval '1 year 3 months 2 weeks 2 days 1 hour 3 minutes 2 seconds 100 millisecond 200 microseconds'
+-- !query schema
+struct<INTERVAL '1 years 3 months 16 days 1 hours 3 minutes 2.1002 seconds':interval>
+-- !query output
+1 years 3 months 16 days 1 hours 3 minutes 2.1002 seconds
+
+
+-- !query
select interval
-- !query schema
struct<>
diff --git a/sql/core/src/test/resources/sql-tests/results/interval.sql.out b/sql/core/src/test/resources/sql-tests/results/interval.sql.out
index 84e3fb3..94562ca 100644
--- a/sql/core/src/test/resources/sql-tests/results/interval.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/interval.sql.out
@@ -1,5 +1,5 @@
-- Automatically generated by SQLQueryTestSuite
--- Number of queries: 89
+-- Number of queries: 90
-- !query
@@ -461,6 +461,14 @@ struct<INTERVAL '3 years 1 hours':interval>
-- !query
+SELECT interval '1 year 3 months 2 weeks 2 days 1 hour 3 minutes 2 seconds 100 millisecond 200 microseconds'
+-- !query schema
+struct<INTERVAL '1 years 3 months 16 days 1 hours 3 minutes 2.1002 seconds':interval>
+-- !query output
+1 years 3 months 16 days 1 hours 3 minutes 2.1002 seconds
+
+
+-- !query
select interval
-- !query schema
struct<>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org