Skip to content

Commit 80f9e7d

Browse files
committed
Revert "List file in parallel on top level only"
This reverts commit 59a376d.
1 parent 59a376d commit 80f9e7d

File tree

1 file changed

+4
-7
lines changed
  • sql/core/src/main/scala/org/apache/spark/sql/execution/command

1 file changed

+4
-7
lines changed

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ case class AlterTableRecoverPartitionsCommand(
624624
try {
625625
implicit val ec = ExecutionContext.fromExecutor(evalPool)
626626
scanPartitions(spark, fs, pathFilter, root, Map(), table.partitionColumnNames, threshold,
627-
spark.sessionState.conf.resolver, listFilesInParallel = true)
627+
spark.sessionState.conf.resolver)
628628
} finally {
629629
evalPool.shutdown()
630630
}
@@ -656,10 +656,7 @@ case class AlterTableRecoverPartitionsCommand(
656656
spec: TablePartitionSpec,
657657
partitionNames: Seq[String],
658658
threshold: Int,
659-
resolver: Resolver,
660-
listFilesInParallel: Boolean)(implicit ec: ExecutionContext)
661-
: Seq[(TablePartitionSpec, Path)] = {
662-
659+
resolver: Resolver)(implicit ec: ExecutionContext): Seq[(TablePartitionSpec, Path)] = {
663660
if (partitionNames.isEmpty) {
664661
return Seq(spec -> path)
665662
}
@@ -674,7 +671,7 @@ case class AlterTableRecoverPartitionsCommand(
674671
val value = ExternalCatalogUtils.unescapePathName(ps(1))
675672
if (resolver(columnName, partitionNames.head)) {
676673
scanPartitions(spark, fs, filter, st.getPath, spec ++ Map(partitionNames.head -> value),
677-
partitionNames.drop(1), threshold, resolver, listFilesInParallel = false)
674+
partitionNames.drop(1), threshold, resolver)
678675
} else {
679676
logWarning(
680677
s"expected partition column ${partitionNames.head}, but got ${ps(0)}, ignoring it")
@@ -685,7 +682,7 @@ case class AlterTableRecoverPartitionsCommand(
685682
Seq.empty
686683
}
687684
}
688-
val result = if (listFilesInParallel && partitionNames.length > 1 &&
685+
val result = if (partitionNames.length > 1 &&
689686
statuses.length > threshold || partitionNames.length > 2) {
690687
parmap(statuses)(handleStatus _)
691688
} else {

0 commit comments

Comments
 (0)