Skip to content

[SPARK-38182][SQL] Fix NoSuchElementException if pushed filter does not contain any references #35487

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
ulysses-you wants to merge 3 commits into from
Closed

[SPARK-38182][SQL] Fix NoSuchElementException if pushed filter does not contain any references #35487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4cc5d07
Fix NoSuchElementException if pushed filter does not contain any refe…
ulysses-you Feb 11, 2022
569679e
address comment
ulysses-you Feb 11, 2022
7607033
FileIndexSuite
ulysses-you Feb 17, 2022
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: 6 additions & 4 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 @@ -74,10 +74,12 @@ abstract class PartitioningAwareFileIndex(
}

// retrieve the file metadata filters and reduce to a final filter expression
val fileMetadataFilterOpt = dataFilters.filter(_.references.forall {
case FileSourceMetadataAttribute(_) => true
case _ => false
}).reduceOption(expressions.And)
val fileMetadataFilterOpt = dataFilters.filter { f =>
f.references.nonEmpty && f.references.forall {
case FileSourceMetadataAttribute(_) => true
case _ => false
}
}.reduceOption(expressions.And)

// - create a bound references for filters: put the metadata struct at 0 position for each file
// - retrieve the final metadata struct (could be pruned) from filters
Expand Down
12 changes: 12 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 @@ -520,6 +520,18 @@ class FileIndexSuite extends SharedSparkSession {
SQLConf.get.setConf(StaticSQLConf.METADATA_CACHE_TTL_SECONDS, previousValue)
}
}

test("SPARK-38182: Fix NoSuchElementException if pushed filter does not contain any " +
"references") {
withTable("t") {
withSQLConf(SQLConf.OPTIMIZER_EXCLUDED_RULES.key ->
"org.apache.spark.sql.catalyst.optimizer.BooleanSimplification") {

sql("CREATE TABLE t (c1 int) USING PARQUET")
assert(sql("SELECT * FROM t WHERE c1 = 1 AND 2 > 1").count() == 0)
}
}
}
}

object DeletionRaceFileSystem {
Expand Down