remove checks and operation

imback82 · imback82 · commit 4e0cf806b72b · 2021-07-07T14:38:13.000-07:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
@@ -939,23 +939,17 @@ trait CheckAnalysis extends PredicateHelper with LookupCatalog {
    * Validates the options used for alter table commands after table and columns are resolved.
    */
   private def checkAlterTableCommand(alter: AlterTableCommand): Unit = {
-    def checkColumnNotExists(fieldNames: Seq[String], struct: StructType): Unit = {
+    def checkColumnNotExists(op: String, fieldNames: Seq[String], struct: StructType): Unit = {
       if (struct.findNestedField(fieldNames, includeCollections = true).isDefined) {
-        alter.failAnalysis(s"Cannot ${alter.operation} column, because ${fieldNames.quoted} " +
+        alter.failAnalysis(s"Cannot $op column, because ${fieldNames.quoted} " +
           s"already exists in ${struct.treeString}")
       }
     }
 
     alter match {
       case AlterTableAddColumns(table: ResolvedTable, colsToAdd) =>
         colsToAdd.foreach { colToAdd =>
-          colToAdd.fieldName match {
-            case UnresolvedFieldName(name) =>
-              alter.failAnalysis(s"Cannot ${alter.operation} missing field ${name.quoted} in " +
-                s"${table.name} schema: ${table.schema.treeString}")
-            case _ =>
-          }
-          checkColumnNotExists(colToAdd.name, table.schema)
+          checkColumnNotExists("add", colToAdd.name, table.schema)
         }
 
       case AlterTableReplaceColumns(table: ResolvedTable, colsToAdd) =>
@@ -968,12 +962,12 @@ trait CheckAnalysis extends PredicateHelper with LookupCatalog {
         // if column already exists.
         colsToAdd.foreach { colToAdd =>
           if (!colsToDelete.contains(colToAdd.name)) {
-            checkColumnNotExists(colToAdd.name, table.schema)
+            checkColumnNotExists("add", colToAdd.name, table.schema)
           }
         }
 
       case AlterTableRenameColumn(table: ResolvedTable, col: ResolvedFieldName, newName) =>
-        checkColumnNotExists(col.path :+ newName, table.schema)
+        checkColumnNotExists("rename", col.path :+ newName, table.schema)
 
       case a @ AlterTableAlterColumn(table: ResolvedTable, col: ResolvedFieldName, _, _, _, _) =>
         val fieldName = col.name.quoted
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/v2Commands.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/v2Commands.scala
@@ -1068,7 +1068,6 @@ case class UnsetTableProperties(
 
 trait AlterTableCommand extends UnaryCommand {
   def table: LogicalPlan
-  def operation: String
   def changes: Seq[TableChange]
   override def child: LogicalPlan = table
 }
@@ -1085,11 +1084,10 @@ case class AlterTableAddColumns(
     TypeUtils.failWithIntervalType(c.dataType)
   }
 
-  override def operation: String = "add"
-
   override def changes: Seq[TableChange] = {
     columnsToAdd.map { col =>
       require(col.fieldName.resolved)
+      require(col.position.isEmpty || col.position.get.resolved)
       TableChange.addColumn(
         col.name.toArray,
         col.dataType,
@@ -1115,8 +1113,6 @@ case class AlterTableReplaceColumns(
     TypeUtils.failWithIntervalType(c.dataType)
   }
 
-  override def operation: String = "replace"
-
   override def changes: Seq[TableChange] = {
     // REPLACE COLUMNS deletes all the existing columns and adds new columns specified.
     require(table.resolved)
@@ -1146,8 +1142,6 @@ case class AlterTableReplaceColumns(
 case class AlterTableDropColumns(
     table: LogicalPlan,
     columnsToDrop: Seq[FieldName]) extends AlterTableCommand {
-  override def operation: String = "delete"
-
   override def changes: Seq[TableChange] = {
     columnsToDrop.map { col =>
       require(col.resolved, "FieldName should be resolved before it's converted to TableChange.")
@@ -1166,8 +1160,6 @@ case class AlterTableRenameColumn(
     table: LogicalPlan,
     column: FieldName,
     newName: String) extends AlterTableCommand {
-  override def operation: String = "rename"
-
   override def changes: Seq[TableChange] = {
     require(column.resolved, "FieldName should be resolved before it's converted to TableChange.")
     Seq(TableChange.renameColumn(column.name.toArray, newName))
@@ -1190,8 +1182,6 @@ case class AlterTableAlterColumn(
   import org.apache.spark.sql.connector.catalog.CatalogV2Util._
   dataType.foreach(failNullType)
 
-  override def operation: String = "update"
-
   override def changes: Seq[TableChange] = {
     require(column.resolved, "FieldName should be resolved before it's converted to TableChange.")
     val colName = column.name.toArray
