Skip to content

[SPARK-29537][SQL] throw exception when user defined a wrong base path #26195

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
Ngone51 wants to merge 8 commits into from
Closed

[SPARK-29537][SQL] throw exception when user defined a wrong base path #26195

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
746a97e
throw exception when user defined a wrong base path
Ngone51 Oct 21, 2019
f7ecb15
use Uri.Path
Ngone51 Oct 21, 2019
358bc0e
use qualified path
Ngone51 Nov 27, 2019
617ab8f
improve test
Ngone51 Nov 27, 2019
261b9ad
add test in DataFrameReaderWriterSuite
Ngone51 Nov 28, 2019
66f0bd3
address comment
Ngone51 Nov 28, 2019
e270fea
address comments
Ngone51 Dec 2, 2019
e889cda
address comment
Ngone51 Dec 2, 2019
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
Prev Previous commit
address comment
  • Loading branch information
@Ngone51
Ngone51 committed Dec 2, 2019
commit e889cda5b1ef4eb28dbdc276926a2318be3df531
9 changes: 4 additions & 5 deletions ...rc/main/scala/org/apache/spark/sql/execution/datasources/PartitioningAwareFileIndex.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,16 +221,15 @@ abstract class PartitioningAwareFileIndex(
if (!fs.isDirectory(userDefinedBasePath)) {
throw new IllegalArgumentException(s"Option '$BASE_PATH_PARAM' must be a directory")
}
def qualifiedPath(path: Path): String = fs.makeQualified(path).toString

val qualifiedBasePath = qualifiedPath(userDefinedBasePath)
val qualifiedBasePath = fs.makeQualified(userDefinedBasePath)
val qualifiedBasePathStr = qualifiedBasePath.toString
rootPaths
.find(p => !qualifiedPath(p).startsWith(qualifiedBasePath))
.find(!fs.makeQualified(_).toString.startsWith(qualifiedBasePathStr))
Copy link
Member Author

@Ngone51 Ngone51 Dec 2, 2019

Choose a reason for hiding this comment

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

Review note: I've inlined the qualified() function into find() clause.

.foreach { rp =>
throw new IllegalArgumentException(
s"Wrong basePath $userDefinedBasePath for the root path: $rp")
}
Set(new Path(qualifiedBasePath))
Set(qualifiedBasePath)

case None =>
rootPaths.map { path =>
Expand Down