change InsertInto to InsertIntoTable

Author: janewangfb

sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4

@@ -237,7 +237,7 @@ query
     : ctes? queryNoWith
     ;
 
-insertInto
+insertIntoTable
     : INSERT OVERWRITE TABLE tableIdentifier (partitionSpec (IF NOT EXISTS)?)?
     | INSERT INTO TABLE? tableIdentifier partitionSpec?
     | INSERT OVERWRITE LOCAL? DIRECTORY path=STRING rowFormat? createFileFormat?
@@ -326,7 +326,7 @@ resource
     ;
 
 queryNoWith
-    : insertInto? queryTerm queryOrganization                                              #singleInsertQuery
+    : insertIntoTable? queryTerm queryOrganization                                         #singleInsertQuery
     | fromClause multiInsertQueryBody+                                                     #multiInsertQuery
     ;
 
@@ -340,7 +340,7 @@ queryOrganization
     ;
 
 multiInsertQueryBody
-    : insertInto?
+    : insertIntoTable?
       querySpecification
       queryOrganization
     ;

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala

@@ -151,7 +151,7 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging
           // Add organization statements.
           optionalMap(body.queryOrganization)(withQueryResultClauses).
           // Add insert.
-          optionalMap(body.insertInto())(withInsertInto)
+          optionalMap(body.insertIntoTable())(withInsertIntoTable)
     }
 
     // If there are multiple INSERTS just UNION them together into one query.
@@ -170,14 +170,14 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging
       // Add organization statements.
       optionalMap(ctx.queryOrganization)(withQueryResultClauses).
       // Add insert.
-      optionalMap(ctx.insertInto())(withInsertInto)
+      optionalMap(ctx.insertIntoTable())(withInsertIntoTable)
   }
 
   /**
    * Add an INSERT INTO [TABLE]/INSERT OVERWRITE TABLE operation to the logical plan.
    */
-  protected def withInsertInto(
-      ctx: InsertIntoContext,
+  protected def withInsertIntoTable(
+      ctx: InsertIntoTableContext,
       query: LogicalPlan): LogicalPlan = withOrigin(ctx) {
     val tableIdent = visitTableIdentifier(ctx.tableIdentifier)
     val partitionKeys = Option(ctx.partitionSpec).map(visitPartitionSpec).getOrElse(Map.empty)

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

@@ -1366,7 +1366,7 @@ class SparkSqlAstBuilder(conf: SQLConf) extends AstBuilder(conf) {
     } else {
       // CREATE VIEW ... AS INSERT INTO is not allowed.
       ctx.query.queryNoWith match {
-        case s: SingleInsertQueryContext if s.insertInto != null =>
+        case s: SingleInsertQueryContext if s.insertIntoTable != null =>
           operationNotAllowed("CREATE VIEW ... AS INSERT INTO", ctx)
         case _: MultiInsertQueryContext =>
           operationNotAllowed("CREATE VIEW ... AS FROM ... [INSERT INTO ...]+", ctx)
@@ -1505,8 +1505,8 @@ class SparkSqlAstBuilder(conf: SQLConf) extends AstBuilder(conf) {
    * Add an INSERT INTO [TABLE]/INSERT OVERWRITE TABLE or INSERT INTO [LOCAL] DIRECOTRY
    * operation to the logical plan.
    */
-  protected override def withInsertInto(ctx: InsertIntoContext,
-                                        query: LogicalPlan): LogicalPlan = withOrigin(ctx) {
+  protected override def withInsertIntoTable(ctx: InsertIntoTableContext,
+                                             query: LogicalPlan): LogicalPlan = withOrigin(ctx) {
     val tableIdent = Option(ctx.tableIdentifier).map(visitTableIdentifier)
     val partitionKeys = Option(ctx.partitionSpec).map(visitPartitionSpec).getOrElse(Map.empty)