[SPARK-32788][SQL] non-partitioned table scan should not have partition filter #29637
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cloud-fan
commented
Sep 3, 2020
| @@ -439,6 +435,9 @@ case class FileSourceScanExec( | |||
| driverMetrics("staticFilesNum") = filesNum | |||
| driverMetrics("staticFilesSize") = filesSize | |||
| } | |||
| if (relation.partitionSchemaOption.isDefined) { | |||
There was a problem hiding this comment.
This change is not needed, but I keep it here for: 1. avoid duplicated code. 2. make it super safe that we only update the numPartitions if table is partitioned.
maropu
reviewed
Sep 3, 2020
| test("SPARK-32788: non-partitioned table scan should not have partition filter") { | ||
| withTable("t") { | ||
| spark.range(1).write.saveAsTable("t") | ||
| checkAnswer(sql("SELECT id FROM t WHERE (SELECT true)"), Row(0L)) |
There was a problem hiding this comment.
a bit surprised that this query failed... nice catch.
maropu
reviewed
Sep 3, 2020
| ExpressionSet(normalizedFilters | ||
| .filter(_.references.subsetOf(partitionSet))) | ||
| } | ||
|
|
||
| logInfo(s"Pruning directories with: ${partitionKeyFilters.mkString(",")}") |
There was a problem hiding this comment.
nit: Is this logging still meaningful for the non-partition case? I mean, could we move it inside the else block in the line 159-162?
maropu
approved these changes
Sep 3, 2020
|
LGTM |
wangyum
approved these changes
Sep 3, 2020
|
Test build #128253 has finished for PR 29637 at commit
|
wangyum
pushed a commit
that referenced
this pull request
Sep 3, 2020
…on filter ### What changes were proposed in this pull request? This PR fixes a bug `FileSourceStrategy`, which generates partition filters even if the table is not partitioned. This can confuse `FileSourceScanExec`, which mistakenly think the table is partitioned and tries to update the `numPartitions` metrics, and cause a failure. We should not generate partition filters for non-partitioned table. ### Why are the changes needed? The bug was exposed by #29436. ### Does this PR introduce _any_ user-facing change? Yes, fix a bug. ### How was this patch tested? new test Closes #29637 from cloud-fan/refactor. Authored-by: Wenchen Fan <wenchen@databricks.com> Signed-off-by: Yuming Wang <yumwang@ebay.com> (cherry picked from commit 76330e0) Signed-off-by: Yuming Wang <yumwang@ebay.com>
|
Merged to master and branch-3.0. |
|
Test build #128259 has finished for PR 29637 at commit
|
holdenk
pushed a commit
to holdenk/spark
that referenced
this pull request
Oct 27, 2020
…on filter ### What changes were proposed in this pull request? This PR fixes a bug `FileSourceStrategy`, which generates partition filters even if the table is not partitioned. This can confuse `FileSourceScanExec`, which mistakenly think the table is partitioned and tries to update the `numPartitions` metrics, and cause a failure. We should not generate partition filters for non-partitioned table. ### Why are the changes needed? The bug was exposed by apache#29436. ### Does this PR introduce _any_ user-facing change? Yes, fix a bug. ### How was this patch tested? new test Closes apache#29637 from cloud-fan/refactor. Authored-by: Wenchen Fan <wenchen@databricks.com> Signed-off-by: Yuming Wang <yumwang@ebay.com> (cherry picked from commit 76330e0) Signed-off-by: Yuming Wang <yumwang@ebay.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
This PR fixes a bug
FileSourceStrategy, which generates partition filters even if the table is not partitioned. This can confuseFileSourceScanExec, which mistakenly think the table is partitioned and tries to update thenumPartitionsmetrics, and cause a failure. We should not generate partition filters for non-partitioned table.Why are the changes needed?
The bug was exposed by #29436.
Does this PR introduce any user-facing change?
Yes, fix a bug.
How was this patch tested?
new test