Github user viirya commented on a diff in the pull request:
https://github.com/apache/spark/pull/15704#discussion_r86075964
--- Diff:
sql/core/src/main/scala/org/apache/spark/sql/execution/command/ddl.scala ---
@@ -418,27 +419,53 @@ case class AlterTableRenamePartitionCommand(
*/
case class AlterTableDropPartitionCommand(
tableName: TableIdentifier,
- specs: Seq[TablePartitionSpec],
+ specs: Seq[Expression],
ifExists: Boolean,
purge: Boolean)
- extends RunnableCommand {
+ extends RunnableCommand with PredicateHelper {
+
+ private def hasComplexExpr(expr: Expression): Boolean = {
+ expr.find(e => e.isInstanceOf[BinaryComparison] &&
!e.isInstanceOf[EqualTo]).isDefined
+ }
override def run(sparkSession: SparkSession): Seq[Row] = {
val catalog = sparkSession.sessionState.catalog
val table = catalog.getTableMetadata(tableName)
+ val resolver = sparkSession.sessionState.conf.resolver
DDLUtils.verifyAlterTableType(catalog, table, isView = false)
DDLUtils.verifyPartitionProviderIsHive(sparkSession, table, "ALTER
TABLE DROP PARTITION")
- val normalizedSpecs = specs.map { spec =>
- PartitioningUtils.normalizePartitionSpec(
- spec,
- table.partitionColumnNames,
- table.identifier.quotedString,
- sparkSession.sessionState.conf.resolver)
+ specs.flatMap(splitConjunctivePredicates).map {
+ case BinaryComparison(AttributeReference(key, _, _, _), _) =>
+ table.partitionColumnNames.find(resolver(_, key)).getOrElse {
+ throw new AnalysisException(
+ s"$key is not a valid partition column in table
${table.identifier.quotedString}.")
+ }
}
- catalog.dropPartitions(
- table.identifier, normalizedSpecs, ignoreIfNotExists = ifExists,
purge = purge)
+ if (specs.exists(hasComplexExpr)) {
+ val partitions = catalog.listPartitionsByFilter(table.identifier,
specs)
+ if (partitions.nonEmpty) {
+ catalog.dropPartitions(
+ table.identifier, partitions.map(_.spec), ignoreIfNotExists =
ifExists, purge = purge)
+ } else if (!ifExists) {
+ throw new AnalysisException(specs.toString)
--- End diff --
This might be not clear enough. Add a short error message?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
