From 6a05eb24d043aa93390f353850d56efa6124e063 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Wed, 5 Oct 2016 10:52:43 -0700
Subject: [SPARK-17328][SQL] Fix NPE with EXPLAIN DESCRIBE TABLE

## What changes were proposed in this pull request?

This PR fixes the following NPE scenario in two ways.

**Reported Error Scenario**
```scala
scala> sql("EXPLAIN DESCRIBE TABLE x").show(truncate = false)
INFO SparkSqlParser: Parsing command: EXPLAIN DESCRIBE TABLE x
java.lang.NullPointerException
```

- **DESCRIBE**: Extend `DESCRIBE` syntax to accept `TABLE`.
- **EXPLAIN**: Prevent NPE in case of the parsing failure of target statement, e.g., `EXPLAIN DESCRIBE TABLES x`.

## How was this patch tested?

Pass the Jenkins test with a new test case.

Author: Dongjoon Hyun <dongjoon@apache.org>

Closes #15357 from dongjoon-hyun/SPARK-17328.
---
 .../test/resources/sql-tests/inputs/describe.sql   |  4 ++
 .../resources/sql-tests/results/describe.sql.out   | 58 ++++++++++++++++------
 2 files changed, 48 insertions(+), 14 deletions(-)

(limited to 'sql/core/src/test/resources/sql-tests')

diff --git a/sql/core/src/test/resources/sql-tests/inputs/describe.sql b/sql/core/src/test/resources/sql-tests/inputs/describe.sql
index 3f0ae902e0..84503d0b12 100644
--- a/sql/core/src/test/resources/sql-tests/inputs/describe.sql
+++ b/sql/core/src/test/resources/sql-tests/inputs/describe.sql
@@ -2,8 +2,12 @@ CREATE TABLE t (a STRING, b INT) PARTITIONED BY (c STRING, d STRING);
 
 ALTER TABLE t ADD PARTITION (c='Us', d=1);
 
+DESCRIBE t;
+
 DESC t;
 
+DESC TABLE t;
+
 -- Ignore these because there exist timestamp results, e.g., `Create Table`.
 -- DESC EXTENDED t;
 -- DESC FORMATTED t;
diff --git a/sql/core/src/test/resources/sql-tests/results/describe.sql.out b/sql/core/src/test/resources/sql-tests/results/describe.sql.out
index 37bf303f1b..b448d60c76 100644
--- a/sql/core/src/test/resources/sql-tests/results/describe.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/describe.sql.out
@@ -1,5 +1,5 @@
 -- Automatically generated by SQLQueryTestSuite
--- Number of queries: 8
+-- Number of queries: 10
 
 
 -- !query 0
@@ -19,7 +19,7 @@ struct<>
 
 
 -- !query 2
-DESC t
+DESCRIBE t
 -- !query 2 schema
 struct<col_name:string,data_type:string,comment:string>
 -- !query 2 output
@@ -34,7 +34,7 @@ d                   	string
 
 
 -- !query 3
-DESC t PARTITION (c='Us', d=1)
+DESC t
 -- !query 3 schema
 struct<col_name:string,data_type:string,comment:string>
 -- !query 3 output
@@ -49,30 +49,60 @@ d                   	string
 
 
 -- !query 4
-DESC t PARTITION (c='Us', d=2)
+DESC TABLE t
 -- !query 4 schema
-struct<>
+struct<col_name:string,data_type:string,comment:string>
 -- !query 4 output
+# Partition Information	                    	                    
+# col_name          	data_type           	comment             
+a                   	string              	                    
+b                   	int                 	                    
+c                   	string              	                    
+c                   	string              	                    
+d                   	string              	                    
+d                   	string
+
+
+-- !query 5
+DESC t PARTITION (c='Us', d=1)
+-- !query 5 schema
+struct<col_name:string,data_type:string,comment:string>
+-- !query 5 output
+# Partition Information	                    	                    
+# col_name          	data_type           	comment             
+a                   	string              	                    
+b                   	int                 	                    
+c                   	string              	                    
+c                   	string              	                    
+d                   	string              	                    
+d                   	string
+
+
+-- !query 6
+DESC t PARTITION (c='Us', d=2)
+-- !query 6 schema
+struct<>
+-- !query 6 output
 org.apache.spark.sql.catalyst.analysis.NoSuchPartitionException
 Partition not found in table 't' database 'default':
 c -> Us
 d -> 2;
 
 
--- !query 5
+-- !query 7
 DESC t PARTITION (c='Us')
--- !query 5 schema
+-- !query 7 schema
 struct<>
--- !query 5 output
+-- !query 7 output
 org.apache.spark.sql.AnalysisException
 Partition spec is invalid. The spec (c) must match the partition spec (c, d) defined in table '`default`.`t`';
 
 
--- !query 6
+-- !query 8
 DESC t PARTITION (c='Us', d)
--- !query 6 schema
+-- !query 8 schema
 struct<>
--- !query 6 output
+-- !query 8 output
 org.apache.spark.sql.catalyst.parser.ParseException
 
 PARTITION specification is incomplete: `d`(line 1, pos 0)
@@ -82,9 +112,9 @@ DESC t PARTITION (c='Us', d)
 ^^^
 
 
--- !query 7
+-- !query 9
 DROP TABLE t
--- !query 7 schema
+-- !query 9 schema
 struct<>
--- !query 7 output
+-- !query 9 output
 
-- 
cgit v1.2.3