cloud-fan commented on a change in pull request #15568: [SPARK-18028][SQL]
simplify TableFileCatalog
URL: https://github.com/apache/spark/pull/15568#discussion_r251703953
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/TableFileCatalog.scala
##########
@@ -66,24 +60,32 @@ class TableFileCatalog(
* @param filters partition-pruning filters
*/
def filterPartitions(filters: Seq[Expression]): ListingFileCatalog = {
- val parameters = baseLocation
- .map(loc => Map(PartitioningAwareFileCatalog.BASE_PATH_PARAM -> loc))
- .getOrElse(Map.empty)
- partitionSchema match {
- case Some(schema) =>
- val selectedPartitions = externalCatalog.listPartitionsByFilter(db,
table, filters)
- val partitions = selectedPartitions.map { p =>
- PartitionPath(p.toRow(schema), p.storage.locationUri.get)
- }
- val partitionSpec = PartitionSpec(schema, partitions)
- new PrunedTableFileCatalog(
- sparkSession, new Path(baseLocation.get), fileStatusCache,
partitionSpec)
- case None =>
- new ListingFileCatalog(sparkSession, rootPaths, parameters, None,
fileStatusCache)
+ if (table.partitionColumnNames.nonEmpty) {
+ val selectedPartitions =
sparkSession.sessionState.catalog.listPartitionsByFilter(
+ table.identifier, filters)
+ val partitionSchema = table.partitionSchema
+ val partitions = selectedPartitions.map { p =>
+ PartitionPath(p.toRow(partitionSchema), p.storage.locationUri.get)
+ }
+ val partitionSpec = PartitionSpec(partitionSchema, partitions)
+ new PrunedTableFileCatalog(
+ sparkSession, new Path(baseLocation.get), fileStatusCache,
partitionSpec)
+ } else {
+ new ListingFileCatalog(sparkSession, rootPaths,
table.storage.properties, None)
Review comment:
seems it was a mistake. Can you send a PR to add it? thanks!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
