Skip to content

[SPARK-26339][SQL][FOLLOW-UP] Issue warning instead of throwing an exception for underscore files #23481

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

[SPARK-26339][SQL][FOLLOW-UP] Issue warning instead of throwing an exception for underscore files #23481

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
6 changes: 3 additions & 3 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DataSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,11 +567,11 @@ case class DataSource(
}
if (filteredOut.nonEmpty) {
if (filteredIn.isEmpty) {
throw new AnalysisException(
s"All paths were ignored:\n${filteredOut.mkString("\n ")}")
logWarning(
s"All paths were ignored:\n ${filteredOut.mkString("\n ")}")
} else {
logDebug(
s"Some paths were ignored:\n${filteredOut.mkString("\n ")}")
s"Some paths were ignored:\n ${filteredOut.mkString("\n ")}")
}
}
}
Expand Down
7 changes: 0 additions & 7 deletions sql/core/src/test/resources/test-data/_cars.csv
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/csv/CSVSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ class CSVSuite extends QueryTest with SharedSQLContext with SQLTestUtils with Te
private val carsEmptyValueFile = "test-data/cars-empty-value.csv"
private val carsBlankColName = "test-data/cars-blank-column-name.csv"
private val carsCrlf = "test-data/cars-crlf.csv"
private val carsFilteredOutFile = "test-data/_cars.csv"
private val emptyFile = "test-data/empty.csv"
private val commentsFile = "test-data/comments.csv"
private val disableCommentsFile = "test-data/disable_comments.csv"
Expand Down Expand Up @@ -347,25 +346,6 @@ class CSVSuite extends QueryTest with SharedSQLContext with SQLTestUtils with Te
assert(result.schema.fieldNames.size === 1)
}

test("SPARK-26339 Not throw an exception if some of specified paths are filtered in") {
val cars = spark
.read
.option("header", "false")
.csv(testFile(carsFile), testFile(carsFilteredOutFile))

verifyCars(cars, withHeader = false, checkTypes = false)
}

test("SPARK-26339 Throw an exception only if all of the specified paths are filtered out") {
val e = intercept[AnalysisException] {
val cars = spark
.read
.option("header", "false")
.csv(testFile(carsFilteredOutFile))
}.getMessage
assert(e.contains("All paths were ignored:"))
}

test("DDL test with empty file") {
withView("carsTable") {
spark.sql(
Expand Down