Github user xwu0226 commented on a diff in the pull request: https://github.com/apache/spark/pull/13463#discussion_r65618083 --- Diff: sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/ListingFileCatalog.scala --- @@ -84,39 +84,12 @@ class ListingFileCatalog( val fs = path.getFileSystem(hadoopConf) logInfo(s"Listing $path on driver") - val statuses = { - val stats = Try(fs.listStatus(path)).getOrElse(Array.empty[FileStatus]) - if (pathFilter != null) stats.filter(f => pathFilter.accept(f.getPath)) else stats - } - - statuses.map { - case f: LocatedFileStatus => f - - // NOTE: - // - // - Although S3/S3A/S3N file system can be quite slow for remote file metadata - // operations, calling `getFileBlockLocations` does no harm here since these file system - // implementations don't actually issue RPC for this method. - // - // - Here we are calling `getFileBlockLocations` in a sequential manner, but it should a - // a big deal since we always use to `listLeafFilesInParallel` when the number of paths - // exceeds threshold. - case f => - HadoopFsRelation.createLocatedFileStatus(f, fs.getFileBlockLocations(f, 0, f.getLen)) - } - }.filterNot { status => - val name = status.getPath.getName - HadoopFsRelation.shouldFilterOut(name) - } - - val (dirs, files) = statuses.partition(_.isDirectory) - - // It uses [[LinkedHashSet]] since the order of files can affect the results. (SPARK-11500) - if (dirs.isEmpty) { - mutable.LinkedHashSet(files: _*) - } else { - mutable.LinkedHashSet(files: _*) ++ listLeafFiles(dirs.map(_.getPath)) + // HadoopFsRelation.listLeafFiles digs out all the leaf files and creates + // the list of [[LocatedFileStatus]] + Try(HadoopFsRelation.listLeafFiles(fs, fs.getFileStatus(path), pathFilter)). + getOrElse(Array.empty) --- End diff -- @liancheng Thank! Yes. I will put back the Note here. As for the `Try`, I see [fileSourceInterfaces.listleafFilesInParallel](https://github.com/apache/spark/blob/dcac8e6f49918a809fb3f2b8bf666582c479a6eb/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/fileSourceInterfaces.scala#L425) is doing it. So for similarity, I do the same in case I introduce any surprise.
--- 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