Skip to content

[SPARK-49906][SQL] Introduce and use CONFLICTING_DIRECTORY_STRUCTURES error for PartitioningUtils #48383

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
wants to merge 1 commit into from
Closed

[SPARK-49906][SQL] Introduce and use CONFLICTING_DIRECTORY_STRUCTURES error for PartitioningUtils #48383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions common/utils/src/main/resources/error/error-conditions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,16 @@
],
"sqlState" : "40000"
},
"CONFLICTING_DIRECTORY_STRUCTURES" : {
"message" : [
"Conflicting directory structures detected.",
"Suspicious paths:",
"<discoveredBasePaths>",
"If provided paths are partition directories, please set \"basePath\" in the options of the data source to specify the root directory of the table.",
"If there are multiple root directories, please load them separately and then union them."
],
"sqlState" : "KD009"
},
"CONFLICTING_PARTITION_COLUMN_NAMES" : {
"message" : [
"Conflicting partition column names detected:",
Expand Down
10 changes: 10 additions & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2845,6 +2845,16 @@ private[sql] object QueryExecutionErrors extends QueryErrorsBase with ExecutionE
)
}

def conflictingDirectoryStructuresError(
discoveredBasePaths: Seq[String]): SparkRuntimeException = {
new SparkRuntimeException(
errorClass = "CONFLICTING_DIRECTORY_STRUCTURES",
messageParameters = Map(
"discoveredBasePaths" -> discoveredBasePaths.distinct.mkString("\n\t", "\n\t", "\n")
)
)
}

def conflictingPartitionColumnNamesError(
distinctPartColLists: Seq[String],
suspiciousPaths: Seq[Path]): SparkRuntimeException = {
Expand Down
11 changes: 3 additions & 8 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/PartitioningUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,14 +173,9 @@ object PartitioningUtils extends SQLConfHelper {
// "hdfs://host:9000/path"
// TODO: Selective case sensitivity.
val discoveredBasePaths = optDiscoveredBasePaths.flatten.map(_.toString.toLowerCase())
assert(
ignoreInvalidPartitionPaths || discoveredBasePaths.distinct.size == 1,
"Conflicting directory structures detected. Suspicious paths:\b" +
discoveredBasePaths.distinct.mkString("\n\t", "\n\t", "\n\n") +
"If provided paths are partition directories, please set " +
"\"basePath\" in the options of the data source to specify the " +
"root directory of the table. If there are multiple root directories, " +
"please load them separately and then union them.")
if (!ignoreInvalidPartitionPaths && discoveredBasePaths.distinct.size != 1) {
throw QueryExecutionErrors.conflictingDirectoryStructuresError(discoveredBasePaths)
}

val resolvedPartitionValues = resolvePartitions(pathsWithPartitionValues, caseSensitive)

Expand Down
4 changes: 2 additions & 2 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 @@ -566,7 +566,7 @@ class FileIndexSuite extends SharedSparkSession {
new File(directoryPath, "part_col=1").renameTo(new File(directoryPath, "undefined"))

// By default, we expect the invalid path assertion to trigger.
val ex = intercept[AssertionError] {
val ex = intercept[SparkRuntimeException] {
spark.read
.format("parquet")
.load(directoryPath.getCanonicalPath)
Expand All @@ -585,7 +585,7 @@ class FileIndexSuite extends SharedSparkSession {

// Data source option override takes precedence.
withSQLConf(SQLConf.IGNORE_INVALID_PARTITION_PATHS.key -> "true") {
val ex = intercept[AssertionError] {
val ex = intercept[SparkRuntimeException] {
spark.read
.format("parquet")
.option(FileIndexOptions.IGNORE_INVALID_PARTITION_PATHS, "false")
Expand Down
8 changes: 4 additions & 4 deletions ...a/org/apache/spark/sql/execution/datasources/parquet/ParquetPartitionDiscoverySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ abstract class ParquetPartitionDiscoverySuite
"hdfs://host:9000/path/a=10/b=20",
"hdfs://host:9000/path/a=10.5/b=hello")

var exception = intercept[AssertionError] {
var exception = intercept[SparkRuntimeException] {
parsePartitions(
paths.map(new Path(_)), true, Set.empty[Path], None, true, true, timeZoneId, false)
}
Expand Down Expand Up @@ -173,7 +173,7 @@ abstract class ParquetPartitionDiscoverySuite
"hdfs://host:9000/path/a=10/b=20",
"hdfs://host:9000/path/path1")

exception = intercept[AssertionError] {
exception = intercept[SparkRuntimeException] {
parsePartitions(
paths.map(new Path(_)),
true,
Expand All @@ -197,7 +197,7 @@ abstract class ParquetPartitionDiscoverySuite
"hdfs://host:9000/tmp/tables/nonPartitionedTable1",
"hdfs://host:9000/tmp/tables/nonPartitionedTable2")

exception = intercept[AssertionError] {
exception = intercept[SparkRuntimeException] {
parsePartitions(
paths.map(new Path(_)),
true,
Expand Down Expand Up @@ -878,7 +878,7 @@ abstract class ParquetPartitionDiscoverySuite

checkAnswer(twoPartitionsDF, df.filter("b != 3"))

intercept[AssertionError] {
intercept[SparkRuntimeException] {
spark
.read
.parquet(
Expand Down