Skip to content

[SPARK-34552][SQL] ExternalCatalog listPartitions and listPartitionsByFilter calls should also restore metadata #31661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yeshengm wants to merge 1 commit into from
Closed

[SPARK-34552][SQL] ExternalCatalog listPartitions and listPartitionsByFilter calls should also restore metadata #31661

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveExternalCatalog.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1232,13 +1232,14 @@ private[spark] class HiveExternalCatalog(conf: SparkConf, hadoopConf: Configurat
db: String,
table: String,
partialSpec: Option[TablePartitionSpec] = None): Seq[CatalogTablePartition] = withClient {
val partColNameMap = buildLowerCasePartColNameMap(getTable(db, table))
val catalogTable = getTable(db, table)
val partColNameMap = buildLowerCasePartColNameMap(catalogTable)
val metaStoreSpec = partialSpec.map(toMetaStorePartitionSpec)
val res = client.getPartitions(db, table, metaStoreSpec)
.map { part => part.copy(spec = restorePartitionSpec(part.spec, partColNameMap))
}
Copy link
Member

@MaxGekk MaxGekk Mar 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As you are here, could you move } up:

.map { part => part.copy(spec = restorePartitionSpec(part.spec, partColNameMap)) }


metaStoreSpec match {
val parts = metaStoreSpec match {
// This might be a bug of Hive: When the partition value inside the partial partition spec
// contains dot, and we ask Hive to list partitions w.r.t. the partial partition spec, Hive
// treats dot as matching any single character and may return more partitions than we
Expand All @@ -1247,6 +1248,7 @@ private[spark] class HiveExternalCatalog(conf: SparkConf, hadoopConf: Configurat
res.filter(p => isPartialPartitionSpec(spec, p.spec))
case _ => res
}
parts.map { part => restorePartitionMetadata(part, catalogTable) }
}

override def listPartitionsByFilter(
Expand All @@ -1266,6 +1268,7 @@ private[spark] class HiveExternalCatalog(conf: SparkConf, hadoopConf: Configurat
part.copy(spec = restorePartitionSpec(part.spec, partColNameMap))
}
prunePartitionsByFilter(catalogTable, clientPrunedPartitions, predicates, defaultTimeZoneId)
.map { part => restorePartitionMetadata(part, catalogTable) }
}

// --------------------------------------------------------------------------
Expand Down