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

Show file tree
Hide file tree
Changes from 7 commits
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
11 changes: 10 additions & 1 deletion ...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,7 +221,16 @@ abstract class PartitioningAwareFileIndex(
if (!fs.isDirectory(userDefinedBasePath)) {
throw new IllegalArgumentException(s"Option '$BASE_PATH_PARAM' must be a directory")
}
Set(fs.makeQualified(userDefinedBasePath))
def qualifiedPath(path: Path): String = fs.makeQualified(path).toString

val qualifiedBasePath = qualifiedPath(userDefinedBasePath)
Copy link
Contributor

@cloud-fan cloud-fan Dec 2, 2019

Choose a reason for hiding this comment

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

let's call toString here, to avoid calling toString later many times

Copy link
Contributor

@HeartSaVioR HeartSaVioR Dec 2, 2019

Choose a reason for hiding this comment

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

We can even call toString in qualifiedPath and remove the needs to call .toString altogether.

rootPaths
.find(p => !qualifiedPath(p).startsWith(qualifiedBasePath))
.foreach { rp =>
throw new IllegalArgumentException(
s"Wrong basePath $userDefinedBasePath for the root path: $rp")
}
Set(new Path(qualifiedBasePath))
Copy link
Contributor

@cloud-fan cloud-fan Dec 2, 2019

Choose a reason for hiding this comment

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

we should reduce overhead as possible as we can

val qualifiedBasePath = fs.makeQualified(userDefinedBasePath)
val qualifiedBasePathStr = qualifiedBasePath.toString
rootPaths.find...
Set(qualifiedBasePath)

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.

Ok, I see.


case None =>
rootPaths.map { path =>
Expand Down
20 changes: 20 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/FileIndexSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,26 @@ class FileIndexSuite extends SharedSparkSession {
"driver side must not be negative"))
}

test ("SPARK-29537: throw exception when user defined a wrong base path") {
Copy link
Contributor

@cloud-fan cloud-fan Nov 27, 2019

Choose a reason for hiding this comment

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

let's also add an end-to-end test with DataFrameReader

Copy link
Member Author

@Ngone51 Ngone51 Nov 28, 2019

Choose a reason for hiding this comment

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

Added 261b9ad

withTempDir { dir =>
val partitionDirectory = new File(dir, "a=foo")
partitionDirectory.mkdir()
val file = new File(partitionDirectory, "text.txt")
stringToFile(file, "text")
val path = new Path(dir.getCanonicalPath)
val wrongBasePath = new File(dir, "unknown")
// basePath must be a directory
wrongBasePath.mkdir()
val parameters = Map("basePath" -> wrongBasePath.getCanonicalPath)
val fileIndex = new InMemoryFileIndex(spark, Seq(path), parameters, None)
val msg = intercept[IllegalArgumentException] {
// trigger inferPartitioning()
fileIndex.partitionSpec()
}.getMessage
assert(msg === s"Wrong basePath ${wrongBasePath.getCanonicalPath} for the root path: $path")
}
}

test("refresh for InMemoryFileIndex with FileStatusCache") {
withTempDir { dir =>
val fileStatusCache = FileStatusCache.getOrCreate(spark)
Expand Down
15 changes: 15 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/test/DataFrameReaderWriterSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,21 @@ class DataFrameReaderWriterSuite extends QueryTest with SharedSparkSession with
assert(DataSourceUtils.decodePartitioningColumns(partColumns) === Seq("col1", "col2"))
}

test ("SPARK-29537: throw exception when user defined a wrong base path") {
withTempPath { p =>
val path = new Path(p.toURI).toString
Seq((1, 1), (2, 2)).toDF("c1", "c2")
.write.partitionBy("c1").mode(SaveMode.Overwrite).parquet(path)
val wrongBasePath = new File(p, "unknown")
// basePath must be a directory
wrongBasePath.mkdir()
val msg = intercept[IllegalArgumentException] {
spark.read.option("basePath", wrongBasePath.getCanonicalPath).parquet(path)
}.getMessage
assert(msg === s"Wrong basePath ${wrongBasePath.getCanonicalPath} for the root path: $path")
}
}

test("save mode") {
spark.range(10).write
.format("org.apache.spark.sql.test")
Expand Down