Skip to content

[SPARK-31590][SQL] Metadata-only queries should not include subquery in partition filters #28383

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

[SPARK-31590][SQL] Metadata-only queries should not include subquery in partition filters #28383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c34f030
The filter used by Metadata-only queries should not have Unevaluable
cxzl25 Apr 28, 2020
86f28d5
use filterNot(SubqueryExpression.hasSubquery)
cxzl25 May 1, 2020
c848508
change ut
cxzl25 May 1, 2020
4abf2f5
reuse testMetadataOnly
cxzl25 May 1, 2020
7046db8
nit
cxzl25 May 2, 2020
a7638d6
ut use existing partition value
cxzl25 May 2, 2020
d601af4
change ut name
cxzl25 May 4, 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
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/OptimizeMetadataOnlyQuery.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ case class OptimizeMetadataOnlyQuery(catalog: SessionCatalog) extends Rule[Logic
case a: AttributeReference =>
a.withName(relation.output.find(_.semanticEquals(a)).get.name)
}
}
Copy link
Member

@maropu maropu May 5, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Could you filter out this unsupported case outside replaceTableScanWithPartitionMetadata(I think this filtering is not related to normalization)? e.g., in https://github.com/apache/spark/blob/master/sql/core/src/main/scala/org/apache/spark/sql/execution/OptimizeMetadataOnlyQuery.scala#L53-L55

}.filterNot(SubqueryExpression.hasSubquery)

child transform {
case plan if plan eq relation =>
Expand Down
14 changes: 14 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/OptimizeMetadataOnlyQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,20 @@ class OptimizeMetadataOnlyQuerySuite extends QueryTest with SharedSparkSession {
"select partcol2, min(partcol1) from srcpart where partcol1 = 0 group by partcol2",
"select max(c1) from (select partcol1 + 1 as c1 from srcpart where partcol1 = 0) t")

testMetadataOnly(
"SPARK-31590 Metadata-only queries should not include subquery in partition filters",
"""
|SELECT partcol1, MAX(partcol2) AS partcol2
|FROM srcpart
|WHERE partcol1 = (
| SELECT MAX(partcol1)
| FROM srcpart
|)
|AND partcol2 = 'even'
|GROUP BY partcol1
|""".stripMargin
)

testNotMetadataOnly(
"Don't optimize metadata only query for non-partition columns",
"select col1 from srcpart group by col1",
Expand Down