ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[SPARK-14128][SQL] Alter table DDL followup

Browse source 
## What changes were proposed in this pull request?

This is just a followup to #12121, which implemented the alter table DDLs using the `SessionCatalog`. Specially, this corrects the behavior of setting the location of a datasource table. For datasource tables, we need to set the `locationUri` in addition to the `path` entry in the serde properties. Additionally, changing the location of a datasource table partition is not allowed.

## How was this patch tested?

`DDLSuite`

Author: Andrew Or <andrew@databricks.com>

Closes #12186 from andrewor14/alter-table-ddl-followup.
This commit is contained in:
Andrew Or 2016-04-05 21:23:20 -07:00 committed by Yin Huai
parent f6456fa80b
commit adbfdb878d
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sql/core/src/main/scala/org/apache/spark/sql/execution/command/ddl.scala
View file

@ -383,8 +383,9 @@ case class AlterTableSetLocation(
val part = catalog.getPartition(tableName, spec)
val newPart =
if (DDLUtils.isDatasourceTable(table)) {
part.copy(storage = part.storage.copy(
serdeProperties = part.storage.serdeProperties ++ Map("path" -> location)))
throw new AnalysisException(
"alter table set location for partition is not allowed for tables defined " +
"using the datasource API")
} else {
part.copy(storage = part.storage.copy(locationUri = Some(location)))
}
@ -394,6 +395,7 @@ case class AlterTableSetLocation(
val newTable =
if (DDLUtils.isDatasourceTable(table)) {
table.withNewStorage(
locationUri = Some(location),
serdeProperties = table.storage.serdeProperties ++ Map("path" -> location))
} else {
table.withNewStorage(locationUri = Some(location))

20
sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLSuite.scala
View file

@ -417,23 +417,37 @@ class DDLSuite extends QueryTest with SharedSQLContext with BeforeAndAfterEach {
.map { s => catalog.getPartition(tableIdent, s).storage }
.getOrElse { catalog.getTable(tableIdent).storage }
if (isDatasourceTable) {
assert(storageFormat.serdeProperties.get("path") === Some(expected))
if (spec.isDefined) {
assert(storageFormat.serdeProperties.isEmpty)
assert(storageFormat.locationUri.isEmpty)
} else {
assert(storageFormat.serdeProperties.get("path") === Some(expected))
assert(storageFormat.locationUri === Some(expected))
}
} else {
assert(storageFormat.locationUri === Some(expected))
}
}
// Optionally expect AnalysisException
def maybeWrapException[T](expectException: Boolean)(body: => T): Unit = {
if (expectException) intercept[AnalysisException] { body } else body
}
// set table location
sql("ALTER TABLE dbx.tab1 SET LOCATION '/path/to/your/lovely/heart'")
verifyLocation("/path/to/your/lovely/heart")
// set table partition location
sql("ALTER TABLE dbx.tab1 PARTITION (a='1') SET LOCATION '/path/to/part/ways'")
maybeWrapException(isDatasourceTable) {
sql("ALTER TABLE dbx.tab1 PARTITION (a='1') SET LOCATION '/path/to/part/ways'")
}
verifyLocation("/path/to/part/ways", Some(partSpec))
// set table location without explicitly specifying database
catalog.setCurrentDatabase("dbx")
sql("ALTER TABLE tab1 SET LOCATION '/swanky/steak/place'")
verifyLocation("/swanky/steak/place")
// set table partition location without explicitly specifying database
sql("ALTER TABLE tab1 PARTITION (a='1') SET LOCATION 'vienna'")
maybeWrapException(isDatasourceTable) {
sql("ALTER TABLE tab1 PARTITION (a='1') SET LOCATION 'vienna'")
}
verifyLocation("vienna", Some(partSpec))
// table to alter does not exist
intercept[AnalysisException] {