Skip to content

[SPARK-38570][SQL][3.2] Incorrect DynamicPartitionPruning caused by Literal #35967

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-38570][SQL][3.2] Incorrect DynamicPartitionPruning caused by Literal #35967

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
1 change: 1 addition & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ trait PredicateHelper extends AliasHelper with Logging {
def findExpressionAndTrackLineageDown(
exp: Expression,
plan: LogicalPlan): Option[(Expression, LogicalPlan)] = {
if (exp.references.isEmpty) return None

plan match {
case p: Project =>
Expand Down
28 changes: 28 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/DynamicPartitionPruningSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,6 +1473,34 @@ abstract class DynamicPartitionPruningSuiteBase
checkAnswer(df, Row(1150, 1) :: Row(1130, 4) :: Row(1140, 4) :: Nil)
}
}

test("SPARK-38570: Fix incorrect DynamicPartitionPruning caused by Literal") {
withSQLConf(SQLConf.DYNAMIC_PARTITION_PRUNING_ENABLED.key -> "true") {
val df = sql(
"""
|SELECT f.store_id,
| f.date_id,
| s.state_province
|FROM (SELECT 4 AS store_id,
| date_id,
| product_id
| FROM fact_sk
| WHERE date_id >= 1300
| UNION ALL
| SELECT 5 AS store_id,
| date_id,
| product_id
| FROM fact_stats
| WHERE date_id <= 1000) f
|JOIN dim_store s
|ON f.store_id = s.store_id
|WHERE s.country = 'US'
|""".stripMargin)

checkPartitionPruningPredicate(df, withSubquery = false, withBroadcast = false)
checkAnswer(df, Row(4, 1300, "California") :: Row(5, 1000, "Texas") :: Nil)
}
}
}

abstract class DynamicPartitionPruningV1Suite extends DynamicPartitionPruningSuiteBase {
Expand Down