Remove DDLParser.

Author: viirya

project/MimaExcludes.scala

@@ -151,6 +151,8 @@ object MimaExcludes {
         ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.streaming.flume.sink.Logging.org$apache$spark$streaming$flume$sink$Logging$$_log_="),
         ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.streaming.flume.sink.TransactionProcessor.org$apache$spark$streaming$flume$sink$Logging$$log_"),
         ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.streaming.flume.sink.TransactionProcessor.org$apache$spark$streaming$flume$sink$Logging$$log__=")
+      ) ++ Seq(
+        ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.sql.execution.datasources.DDLParser")
       )
     case v if v.startsWith("1.6") =>
       Seq(

sql/catalyst/src/main/antlr3/org/apache/spark/sql/catalyst/parser/ExpressionParser.g

@@ -493,6 +493,15 @@ descFuncNames
     | functionIdentifier
     ;
 
+looseIdentifier
+    :
+    Identifier
+    | looseNonReserved -> Identifier[$looseNonReserved.text]
+    // If it decides to support SQL11 reserved keywords, i.e., useSQL11ReservedKeywordsForIdentifier()=false,
+    // the sql11keywords in existing q tests will NOT be added back.
+    | {useSQL11ReservedKeywordsForIdentifier()}? sql11ReservedKeywordsUsedAsIdentifier -> Identifier[$sql11ReservedKeywordsUsedAsIdentifier.text]
+    ;
+
 identifier
     :
     Identifier
@@ -518,6 +527,10 @@ principalIdentifier
     | QuotedIdentifier
     ;
 
+looseNonReserved
+    : nonReserved | KW_FROM | KW_TO
+    ;
+
 //The new version of nonReserved + sql11ReservedKeywordsUsedAsIdentifier = old version of nonReserved
 //Non reserved keywords are basically the keywords that can be used as identifiers.
 //All the KW_* are automatically not only keywords, but also reserved keywords.

sql/catalyst/src/main/antlr3/org/apache/spark/sql/catalyst/parser/SparkSqlParser.g

@@ -935,6 +935,7 @@ createTableStatement
          columnNameTypeList?
          $p
          tableOpts?
+         selectStatementWithCTE?
          )
       ->
          ^(TOK_CREATETABLE $name $temp? $ext? ifNotExists?
@@ -1808,8 +1809,8 @@ optionKeyValue
 @init { pushMsg("table's option specification", state); }
 @after { popMsg(state); }
     :
-       Identifier StringLiteral
-    -> ^(TOK_TABLEOPTION Identifier StringLiteral)
+       looseIdentifier StringLiteral
+    -> ^(TOK_TABLEOPTION looseIdentifier StringLiteral)
     ;
 
 tableOpts

sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala

@@ -205,9 +205,6 @@ class SQLContext private[sql](
   @transient
   protected[sql] lazy val optimizer: Optimizer = new SparkOptimizer(this)
 
-  @transient
-  protected[sql] val ddlParser = new DDLParser(sqlParser)
-
   @transient
   protected[sql] val sqlParser = new SparkSQLParser(getSQLDialect())
 
@@ -231,7 +228,7 @@ class SQLContext private[sql](
     }
   }
 
-  protected[sql] def parseSql(sql: String): LogicalPlan = ddlParser.parse(sql, false)
+  protected[sql] def parseSql(sql: String): LogicalPlan = sqlParser.parsePlan(sql)
 
   protected[sql] def executeSql(sql: String):
     org.apache.spark.sql.execution.QueryExecution = executePlan(parseSql(sql))

sql/core/src/main/scala/org/apache/spark/sql/execution/SparkQl.scala

@@ -98,6 +98,11 @@ private[sql] class SparkQl(conf: ParserConf = SimpleParserConf()) extends Cataly
         }
 
         if (asClause.isDefined) {
+          if (columns.isDefined) {
+            throw new DDLException(
+              "a CREATE TABLE AS SELECT statement does not allow column definitions.")
+          }
+
           val mode = if (allowExisting.isDefined) {
             SaveMode.Ignore
           } else if (temp.isDefined) {

sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DDLParser.scala

@@ -105,7 +105,7 @@ class CreateTableAsSelectSuite extends DataSourceTest with SharedSQLContext with
       sql("SELECT a, b FROM jsonTable"),
       sql("SELECT a, b FROM jt").collect())
 
-    val message = intercept[DDLException]{
+    val message = intercept[AnalysisException]{
       sql(
         s"""
         |CREATE TEMPORARY TABLE IF NOT EXISTS jsonTable
@@ -156,7 +156,7 @@ class CreateTableAsSelectSuite extends DataSourceTest with SharedSQLContext with
   }
 
   test("CREATE TEMPORARY TABLE AS SELECT with IF NOT EXISTS is not allowed") {
-    val message = intercept[DDLException]{
+    val message = intercept[AnalysisException]{
       sql(
         s"""
         |CREATE TEMPORARY TABLE IF NOT EXISTS jsonTable
@@ -173,7 +173,7 @@ class CreateTableAsSelectSuite extends DataSourceTest with SharedSQLContext with
   }
 
   test("a CTAS statement with column definitions is not allowed") {
-    intercept[DDLException]{
+    intercept[AnalysisException]{
       sql(
         s"""
         |CREATE TEMPORARY TABLE jsonTable (a int, b string)