review comment

tejasapatil · tejasapatil · commit bf306da2ea7d · 2017-05-14T08:56:54.000-07:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/ExternalCatalog.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/ExternalCatalog.scala
@@ -17,7 +17,6 @@
 
 package org.apache.spark.sql.catalyst.catalog
 
-import org.apache.spark.sql.AnalysisException
 import org.apache.spark.sql.catalyst.analysis.{FunctionAlreadyExistsException, NoSuchDatabaseException, NoSuchFunctionException, NoSuchTableException}
 import org.apache.spark.sql.catalyst.expressions.Expression
 import org.apache.spark.sql.types.StructType
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/InMemoryCatalog.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/InMemoryCatalog.scala
@@ -309,7 +309,6 @@ class InMemoryCatalog(
       schema: StructType): Unit = synchronized {
     requireTableExists(db, table)
     val origTable = catalog(db).tables(table).table
-
     catalog(db).tables(table).table = origTable.copy(schema = schema)
   }
 
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala
@@ -344,6 +344,7 @@ class SessionCatalog(
            |not present in the new schema. We don't support dropping columns yet.
          """.stripMargin)
     }
+
     // assuming the newSchema has all partition columns at the end as required
     externalCatalog.alterTableSchema(db, table, newSchema)
   }
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveExternalCatalog.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveExternalCatalog.scala
@@ -632,11 +632,9 @@ private[spark] class HiveExternalCatalog(conf: SparkConf, hadoopConf: Configurat
     val rawTable = getRawTable(db, table)
     val withNewSchema = rawTable.copy(schema = schema)
     verifyColumnNames(withNewSchema)
-
     // Add table metadata such as table schema, partition columns, etc. to table properties.
     val updatedTable = withNewSchema.copy(
       properties = withNewSchema.properties ++ tableMetaToTableProps(withNewSchema))
-
     try {
       client.alterTable(updatedTable)
     } catch {
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/HiveClientImpl.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/HiveClientImpl.scala
@@ -425,6 +425,8 @@ private[hive] class HiveClientImpl(
         },
         schema = schema,
         partitionColumnNames = partCols.map(_.name),
+        // For data source tables, we will always overwrite the bucket spec in
+        // HiveExternalCatalog with the bucketing information in table properties.
         bucketSpec = bucketSpec,
         owner = h.getOwner,
         createTime = h.getTTable.getCreateTime.toLong * 1000,

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,6 @@ class InMemoryCatalog(`
`309`	`309`	`schema: StructType): Unit = synchronized {`
`310`	`310`	`requireTableExists(db, table)`
`311`	`311`	`val origTable = catalog(db).tables(table).table`
`312`		`-`
`313`	`312`	`catalog(db).tables(table).table = origTable.copy(schema = schema)`
`314`	`313`	`}`
`315`	`314`
Original file line number	Diff line number	Diff line change
`@@ -344,6 +344,7 @@ class SessionCatalog(`
`344`	`344`	`\|not present in the new schema. We don't support dropping columns yet.`
`345`	`345`	`""".stripMargin)`
`346`	`346`	`}`
	`347`	`+`
`347`	`348`	`// assuming the newSchema has all partition columns at the end as required`
`348`	`349`	`externalCatalog.alterTableSchema(db, table, newSchema)`
`349`	`350`	`}`