Skip to content

[SPARK-29768][SQL][FOLLOW-UP]Improve handling non-deterministic filter of ScanOperation #27073

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 4 commits into from
Closed

[SPARK-29768][SQL][FOLLOW-UP]Improve handling non-deterministic filter of ScanOperation #27073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c1417a
improve handle nondeterministic filter
Ngone51 Jan 2, 2020
7031420
address comment
Ngone51 Jan 2, 2020
0df1c9c
address comment
Ngone51 Jan 3, 2020
5fec158
address comment
Ngone51 Jan 3, 2020
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
20 changes: 11 additions & 9 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/planning/patterns.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

package org.apache.spark.sql.catalyst.planning

import scala.collection.mutable
Copy link
Member Author

@Ngone51 Ngone51 Jan 2, 2020

Choose a reason for hiding this comment

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

This is a unused import.


import org.apache.spark.internal.Logging
import org.apache.spark.sql.AnalysisException
import org.apache.spark.sql.catalyst.expressions._
Expand All @@ -35,7 +33,9 @@ trait OperationHelper {
})

protected def substitute(aliases: AttributeMap[Expression])(expr: Expression): Expression = {
expr.transform {
// use transformUp instead of transformDown to avoid dead loop
// in case of there's Alias whose exprId is the same as its child attribute.
expr.transformUp {
case a @ Alias(ref: AttributeReference, name) =>
aliases.get(ref)
.map(Alias(_, name)(a.exprId, a.qualifier))
Expand Down Expand Up @@ -142,12 +142,14 @@ object ScanOperation extends OperationHelper with PredicateHelper {
case Filter(condition, child) =>
collectProjectsAndFilters(child) match {
case Some((fields, filters, other, aliases)) =>
// Follow CombineFilters and only keep going if the collected Filters
// are all deterministic and this filter doesn't have common non-deterministic
// expressions with lower Project.
if (filters.forall(_.deterministic) &&
!hasCommonNonDeterministic(Seq(condition), aliases)) {
val substitutedCondition = substitute(aliases)(condition)
// Follow CombineFilters and only keep going if 1) the collected Filters
// and this filter are all deterministic or 2) if this filter is the first
// collected filter and doesn't have common non-deterministic expressions
// with lower Project.
val substitutedCondition = substitute(aliases)(condition)
val canCombineFilters = (filters.nonEmpty && filters.forall(_.deterministic) &&
substitutedCondition.deterministic) || filters.isEmpty
if (canCombineFilters && !hasCommonNonDeterministic(Seq(condition), aliases)) {
Some((fields, filters ++ splitConjunctivePredicates(substitutedCondition),
other, aliases))
} else {
Expand Down
3 changes: 2 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/FileSourceStrategy.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ object FileSourceStrategy extends Strategy with Logging {
// - filters that need to be evaluated again after the scan
val filterSet = ExpressionSet(filters)

val normalizedFilters = DataSourceStrategy.normalizeExprs(filters, l.output)
val normalizedFilters = DataSourceStrategy.normalizeExprs(
filters.filter(_.deterministic), l.output)

val partitionColumns =
l.resolve(
Expand Down
4 changes: 2 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/sources/PrunedScanSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ class PrunedScanSuite extends DataSourceTest with SharedSparkSession {
testPruning("SELECT a FROM oneToTenPruned", "a")
testPruning("SELECT b FROM oneToTenPruned", "b")
testPruning("SELECT a, rand() FROM oneToTenPruned WHERE a > 5", "a")
testPruning("SELECT a FROM oneToTenPruned WHERE rand() > 5", "a")
testPruning("SELECT a, rand() FROM oneToTenPruned WHERE rand() > 5", "a")
testPruning("SELECT a FROM oneToTenPruned WHERE rand() > 0.5", "a")
testPruning("SELECT a, rand() FROM oneToTenPruned WHERE rand() > 0.5", "a")
testPruning("SELECT a, rand() FROM oneToTenPruned WHERE b > 5", "a", "b")

def testPruning(sqlString: String, expectedColumns: String*): Unit = {
Expand Down