From 04642b35eccc1aee123724eff60d3e934bbb597e Mon Sep 17 00:00:00 2001
From: Takeshi Yamamuro <yamamuro@apache.org>
Date: Wed, 22 Apr 2020 21:07:20 +0900
Subject: [PATCH 1/2] Fix

---
 .../resources/sql-tests/inputs/extract.sql    |  20 ++-
 .../sql-tests/results/extract.sql.out         | 134 +++++++++++++++++-
 2 files changed, 152 insertions(+), 2 deletions(-)

diff --git a/sql/core/src/test/resources/sql-tests/inputs/extract.sql b/sql/core/src/test/resources/sql-tests/inputs/extract.sql
index cba7fc22779c..a53a18c593b5 100644
--- a/sql/core/src/test/resources/sql-tests/inputs/extract.sql
+++ b/sql/core/src/test/resources/sql-tests/inputs/extract.sql
@@ -108,4 +108,22 @@ select date_part(c, c) from t;
 select date_part(null, c) from t;
 
 select date_part(i, i) from t;
-select date_part(null, i) from t;
\ No newline at end of file
+select date_part(null, i) from t;
+
+-- In SPARK-31476, we've supported extract('field', source), too
+select extract('millennium', c) from t;
+select extract('century', c) from t;
+select extract('decade', c) from t;
+select extract('year', c) from t;
+select extract('quarter', c) from t;
+select extract('month', c) from t;
+select extract('week', c) from t;
+select extract('day', c) from t;
+select extract('days', c) from t;
+select extract('dayofweek', c) from t;
+select extract('dow', c) from t;
+select extract('isodow', c) from t;
+select extract('doy', c) from t;
+select extract('hour', c) from t;
+select extract('minute', c) from t;
+select extract('second', c) from t;
diff --git a/sql/core/src/test/resources/sql-tests/results/extract.sql.out b/sql/core/src/test/resources/sql-tests/results/extract.sql.out
index 220acfb0bce9..f5bb9fdf3eb2 100644
--- a/sql/core/src/test/resources/sql-tests/results/extract.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/extract.sql.out
@@ -1,5 +1,5 @@
 -- Automatically generated by SQLQueryTestSuite
--- Number of queries: 84
+-- Number of queries: 100
 
 
 -- !query
@@ -677,3 +677,135 @@ select date_part(null, i) from t
 struct<date_part(NULL, t.`i`):double>
 -- !query output
 NULL
+
+
+-- !query
+select extract('millennium', c) from t
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.AnalysisException
+Literals of type 'millennium' are currently not supported for the string type.;; line 1 pos 7
+
+
+-- !query
+select extract('century', c) from t
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.AnalysisException
+Literals of type 'century' are currently not supported for the string type.;; line 1 pos 7
+
+
+-- !query
+select extract('decade', c) from t
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.AnalysisException
+Literals of type 'decade' are currently not supported for the string type.;; line 1 pos 7
+
+
+-- !query
+select extract('year', c) from t
+-- !query schema
+struct<extract('year' FROM t.`c`):int>
+-- !query output
+2011
+
+
+-- !query
+select extract('quarter', c) from t
+-- !query schema
+struct<extract('quarter' FROM t.`c`):int>
+-- !query output
+2
+
+
+-- !query
+select extract('month', c) from t
+-- !query schema
+struct<extract('month' FROM t.`c`):int>
+-- !query output
+5
+
+
+-- !query
+select extract('week', c) from t
+-- !query schema
+struct<extract('week' FROM t.`c`):int>
+-- !query output
+18
+
+
+-- !query
+select extract('day', c) from t
+-- !query schema
+struct<extract('day' FROM t.`c`):int>
+-- !query output
+6
+
+
+-- !query
+select extract('days', c) from t
+-- !query schema
+struct<extract('days' FROM t.`c`):int>
+-- !query output
+6
+
+
+-- !query
+select extract('dayofweek', c) from t
+-- !query schema
+struct<extract('dayofweek' FROM t.`c`):int>
+-- !query output
+6
+
+
+-- !query
+select extract('dow', c) from t
+-- !query schema
+struct<extract('dow' FROM t.`c`):int>
+-- !query output
+6
+
+
+-- !query
+select extract('isodow', c) from t
+-- !query schema
+struct<>
+-- !query output
+org.apache.spark.sql.AnalysisException
+Literals of type 'isodow' are currently not supported for the string type.;; line 1 pos 7
+
+
+-- !query
+select extract('doy', c) from t
+-- !query schema
+struct<extract('doy' FROM t.`c`):int>
+-- !query output
+126
+
+
+-- !query
+select extract('hour', c) from t
+-- !query schema
+struct<extract('hour' FROM t.`c`):int>
+-- !query output
+7
+
+
+-- !query
+select extract('minute', c) from t
+-- !query schema
+struct<extract('minute' FROM t.`c`):int>
+-- !query output
+8
+
+
+-- !query
+select extract('second', c) from t
+-- !query schema
+struct<extract('second' FROM t.`c`):decimal(8,6)>
+-- !query output
+9.123456

From 28758ae4876fc447bdaa5eb61152272bb710ec92 Mon Sep 17 00:00:00 2001
From: Takeshi Yamamuro <yamamuro@apache.org>
Date: Thu, 23 Apr 2020 00:19:05 +0900
Subject: [PATCH 2/2] Fix

---
 .../resources/sql-tests/inputs/extract.sql    |  4 --
 .../sql-tests/results/extract.sql.out         | 38 +------------------
 2 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/sql/core/src/test/resources/sql-tests/inputs/extract.sql b/sql/core/src/test/resources/sql-tests/inputs/extract.sql
index a53a18c593b5..abb9e82c9ef2 100644
--- a/sql/core/src/test/resources/sql-tests/inputs/extract.sql
+++ b/sql/core/src/test/resources/sql-tests/inputs/extract.sql
@@ -111,9 +111,6 @@ select date_part(i, i) from t;
 select date_part(null, i) from t;
 
 -- In SPARK-31476, we've supported extract('field', source), too
-select extract('millennium', c) from t;
-select extract('century', c) from t;
-select extract('decade', c) from t;
 select extract('year', c) from t;
 select extract('quarter', c) from t;
 select extract('month', c) from t;
@@ -122,7 +119,6 @@ select extract('day', c) from t;
 select extract('days', c) from t;
 select extract('dayofweek', c) from t;
 select extract('dow', c) from t;
-select extract('isodow', c) from t;
 select extract('doy', c) from t;
 select extract('hour', c) from t;
 select extract('minute', c) from t;
diff --git a/sql/core/src/test/resources/sql-tests/results/extract.sql.out b/sql/core/src/test/resources/sql-tests/results/extract.sql.out
index f5bb9fdf3eb2..aea09e4b90f4 100644
--- a/sql/core/src/test/resources/sql-tests/results/extract.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/extract.sql.out
@@ -1,5 +1,5 @@
 -- Automatically generated by SQLQueryTestSuite
--- Number of queries: 100
+-- Number of queries: 96
 
 
 -- !query
@@ -679,33 +679,6 @@ struct<date_part(NULL, t.`i`):double>
 NULL
 
 
--- !query
-select extract('millennium', c) from t
--- !query schema
-struct<>
--- !query output
-org.apache.spark.sql.AnalysisException
-Literals of type 'millennium' are currently not supported for the string type.;; line 1 pos 7
-
-
--- !query
-select extract('century', c) from t
--- !query schema
-struct<>
--- !query output
-org.apache.spark.sql.AnalysisException
-Literals of type 'century' are currently not supported for the string type.;; line 1 pos 7
-
-
--- !query
-select extract('decade', c) from t
--- !query schema
-struct<>
--- !query output
-org.apache.spark.sql.AnalysisException
-Literals of type 'decade' are currently not supported for the string type.;; line 1 pos 7
-
-
 -- !query
 select extract('year', c) from t
 -- !query schema
@@ -770,15 +743,6 @@ struct<extract('dow' FROM t.`c`):int>
 6
 
 
--- !query
-select extract('isodow', c) from t
--- !query schema
-struct<>
--- !query output
-org.apache.spark.sql.AnalysisException
-Literals of type 'isodow' are currently not supported for the string type.;; line 1 pos 7
-
-
 -- !query
 select extract('doy', c) from t
 -- !query schema