You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "cloud-fan (via GitHub)" <gi...@apache.org> on 2023/08/03 09:25:28 UTC
[GitHub] [spark] cloud-fan opened a new pull request, #42318: [SPARK-44655][SQL] Make the code cleaner about static and dynamic data/partition filters
cloud-fan opened a new pull request, #42318:
URL: https://github.com/apache/spark/pull/42318
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'core/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #42318: [SPARK-44655][SQL] Make the code cleaner about static and dynamic data/partition filters
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #42318:
URL: https://github.com/apache/spark/pull/42318#discussion_r1283307790
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/DataSourceScanExec.scala:
##########
@@ -371,49 +373,47 @@ trait FileSourceScanLike extends DataSourceScanExec {
}
}
- private def translatePushedDownFilters(dataFilters: Seq[Expression]): Seq[Filter] = {
+ private def translateToV1Filters(
+ dataFilters: Seq[Expression],
+ scalarSubqueryToLiteral: execution.ScalarSubquery => Literal): Seq[Filter] = {
+ val scalarSubqueryReplaced = dataFilters.map(_.transform {
+ // Replace scalar subquery to literal so that `DataSourceStrategy.translateFilter` can
+ // support translating it.
+ case scalarSubquery: execution.ScalarSubquery => scalarSubqueryToLiteral(scalarSubquery)
+ })
+
val supportNestedPredicatePushdown = DataSourceUtils.supportNestedPredicatePushdown(relation)
// `dataFilters` should not include any constant metadata col filters
// because the metadata struct has been flatted in FileSourceStrategy
// and thus metadata col filters are invalid to be pushed down. Metadata that is generated
// during the scan can be used for filters.
- dataFilters.filterNot(_.references.exists {
+ scalarSubqueryReplaced.filterNot(_.references.exists {
case FileSourceConstantMetadataAttribute(_) => true
case _ => false
}).flatMap(DataSourceStrategy.translateFilter(_, supportNestedPredicatePushdown))
}
+ // This field may execute subquery expressions and should not be accessed during planning.
@transient
- protected lazy val pushedDownFilters: Seq[Filter] = translatePushedDownFilters(dataFilters)
-
- @transient
- protected lazy val dynamicallyPushedDownFilters: Seq[Filter] = {
- if (dataFilters.exists(_.exists(_.isInstanceOf[execution.ScalarSubquery]))) {
- // Replace scalar subquery to literal so that `DataSourceStrategy.translateFilter` can
- // support translate it. The subquery must has been materialized since SparkPlan always
- // execute subquery first.
- val normalized = dataFilters.map(_.transform {
- case scalarSubquery: execution.ScalarSubquery => scalarSubquery.toLiteral
- })
- translatePushedDownFilters(normalized)
- } else {
- pushedDownFilters
- }
- }
+ protected lazy val pushedDownFilters: Seq[Filter] = translateToV1Filters(dataFilters, _.toLiteral)
override lazy val metadata: Map[String, String] = {
def seqToString(seq: Seq[Any]) = seq.mkString("[", ", ", "]")
val location = relation.location
val locationDesc =
location.getClass.getSimpleName +
Utils.buildLocationMetadata(location.rootPaths, maxMetadataValueLength)
+ // `metadata` is accessed during planning and the scalar subquery is not executed yet. Here
+ // we get the pretty string of the scalar subquery, for display purpose only.
+ val pushedFiltersForDisplay = translateToV1Filters(
+ dataFilters, s => Literal("ScalarSubquery#" + s.exprId.id))
val metadata =
Map(
"Format" -> relation.fileFormat.toString,
"ReadSchema" -> requiredSchema.catalogString,
"Batched" -> supportsColumnar.toString,
"PartitionFilters" -> seqToString(partitionFilters),
- "PushedFilters" -> seqToString(pushedDownFilters),
+ "PushedFilters" -> seqToString(pushedFiltersForDisplay),
Review Comment:
Now people can see the actual pushed filter in the EXPLAIN result. An example
```
+- FileScan parquet spark_catalog.default.t1[id#7L] Batched: true, DataFilters: [(((id#7L = 0) OR (id#7L = 1)) OR (id#7L = Subquery subquery#6, [id=#48]))], Format: Parquet, Location: InMemoryFileIndex(1 paths)[file:/Users/wenchen/dev/spark/assembly/spark-warehouse/t1], PartitionFilters: [], PushedFilters: [Or(Or(EqualTo(id,0),EqualTo(id,1)),EqualTo(id,ScalarSubquery#6))], ReadSchema: struct<id:bigint>
```
To highlight: `PushedFilters: [Or(Or(EqualTo(id,0),EqualTo(id,1)),EqualTo(id,ScalarSubquery#6))]`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #42318: [SPARK-44655][SQL] Make the code cleaner about static and dynamic data/partition filters
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #42318:
URL: https://github.com/apache/spark/pull/42318#discussion_r1283281732
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/DataSourceScanExec.scala:
##########
@@ -278,7 +285,11 @@ trait FileSourceScanLike extends DataSourceScanExec {
val index = partitionColumns.indexWhere(a.name == _.name)
BoundReference(index, partitionColumns(index).dataType, nullable = true)
}, Nil)
- val ret = selectedPartitions.filter(p => boundPredicate.eval(p.values))
+ var ret = selectedPartitions.filter(p => boundPredicate.eval(p.values))
+ if (dynamicDataFilters.nonEmpty) {
Review Comment:
to avoid any perf regression caused by the change of `selectedPartitions` (dynamic data filters are excluded), here I prune the files again using the dynamic data filters.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya commented on a diff in pull request #42318: [SPARK-44655][SQL] Make the code cleaner about static and dynamic data/partition filters
Posted by "viirya (via GitHub)" <gi...@apache.org>.
viirya commented on code in PR #42318:
URL: https://github.com/apache/spark/pull/42318#discussion_r1283406170
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/FileIndex.scala:
##########
@@ -43,6 +46,54 @@ case class FileStatusWithMetadata(fileStatus: FileStatus, metadata: Map[String,
*/
case class PartitionDirectory(values: InternalRow, files: Seq[FileStatusWithMetadata])
+class FilePruningRunner(filters: Seq[Expression]) {
Review Comment:
Can we have a short comment/doc on `FilePruningRunner`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn commented on pull request #42318: [SPARK-44655][SQL] Make the code cleaner about static and dynamic data/partition filters
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on PR #42318:
URL: https://github.com/apache/spark/pull/42318#issuecomment-1665454613
thanks, merged to master
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] ulysses-you commented on a diff in pull request #42318: [SPARK-44655][SQL] Make the code cleaner about static and dynamic data/partition filters
Posted by "ulysses-you (via GitHub)" <gi...@apache.org>.
ulysses-you commented on code in PR #42318:
URL: https://github.com/apache/spark/pull/42318#discussion_r1283886691
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/DataSourceScanExec.scala:
##########
@@ -371,49 +373,47 @@ trait FileSourceScanLike extends DataSourceScanExec {
}
}
- private def translatePushedDownFilters(dataFilters: Seq[Expression]): Seq[Filter] = {
+ private def translateToV1Filters(
+ dataFilters: Seq[Expression],
+ scalarSubqueryToLiteral: execution.ScalarSubquery => Literal): Seq[Filter] = {
+ val scalarSubqueryReplaced = dataFilters.map(_.transform {
+ // Replace scalar subquery to literal so that `DataSourceStrategy.translateFilter` can
+ // support translating it.
+ case scalarSubquery: execution.ScalarSubquery => scalarSubqueryToLiteral(scalarSubquery)
+ })
+
val supportNestedPredicatePushdown = DataSourceUtils.supportNestedPredicatePushdown(relation)
// `dataFilters` should not include any constant metadata col filters
// because the metadata struct has been flatted in FileSourceStrategy
// and thus metadata col filters are invalid to be pushed down. Metadata that is generated
// during the scan can be used for filters.
- dataFilters.filterNot(_.references.exists {
+ scalarSubqueryReplaced.filterNot(_.references.exists {
case FileSourceConstantMetadataAttribute(_) => true
case _ => false
}).flatMap(DataSourceStrategy.translateFilter(_, supportNestedPredicatePushdown))
}
+ // This field may execute subquery expressions and should not be accessed during planning.
@transient
- protected lazy val pushedDownFilters: Seq[Filter] = translatePushedDownFilters(dataFilters)
-
- @transient
- protected lazy val dynamicallyPushedDownFilters: Seq[Filter] = {
- if (dataFilters.exists(_.exists(_.isInstanceOf[execution.ScalarSubquery]))) {
- // Replace scalar subquery to literal so that `DataSourceStrategy.translateFilter` can
- // support translate it. The subquery must has been materialized since SparkPlan always
- // execute subquery first.
- val normalized = dataFilters.map(_.transform {
- case scalarSubquery: execution.ScalarSubquery => scalarSubquery.toLiteral
- })
- translatePushedDownFilters(normalized)
- } else {
- pushedDownFilters
- }
- }
+ protected lazy val pushedDownFilters: Seq[Filter] = translateToV1Filters(dataFilters, _.toLiteral)
override lazy val metadata: Map[String, String] = {
def seqToString(seq: Seq[Any]) = seq.mkString("[", ", ", "]")
val location = relation.location
val locationDesc =
location.getClass.getSimpleName +
Utils.buildLocationMetadata(location.rootPaths, maxMetadataValueLength)
+ // `metadata` is accessed during planning and the scalar subquery is not executed yet. Here
+ // we get the pretty string of the scalar subquery, for display purpose only.
+ val pushedFiltersForDisplay = translateToV1Filters(
+ dataFilters, s => Literal("ScalarSubquery#" + s.exprId.id))
val metadata =
Map(
"Format" -> relation.fileFormat.toString,
"ReadSchema" -> requiredSchema.catalogString,
"Batched" -> supportsColumnar.toString,
"PartitionFilters" -> seqToString(partitionFilters),
- "PushedFilters" -> seqToString(pushedDownFilters),
+ "PushedFilters" -> seqToString(pushedFiltersForDisplay),
Review Comment:
thank you for the improvement!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #42318: [SPARK-44655][SQL] Make the code cleaner about static and dynamic data/partition filters
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #42318:
URL: https://github.com/apache/spark/pull/42318#discussion_r1283309058
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/FileIndex.scala:
##########
@@ -43,6 +46,54 @@ case class FileStatusWithMetadata(fileStatus: FileStatus, metadata: Map[String,
*/
case class PartitionDirectory(values: InternalRow, files: Seq[FileStatusWithMetadata])
+class FilePruningRunner(filters: Seq[Expression]) {
Review Comment:
the code is moved from `PartitioningAwareFileIndex`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #42318: [SPARK-44655][SQL] Make the code cleaner about static and dynamic data/partition filters
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #42318:
URL: https://github.com/apache/spark/pull/42318#discussion_r1283307790
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/DataSourceScanExec.scala:
##########
@@ -371,49 +373,47 @@ trait FileSourceScanLike extends DataSourceScanExec {
}
}
- private def translatePushedDownFilters(dataFilters: Seq[Expression]): Seq[Filter] = {
+ private def translateToV1Filters(
+ dataFilters: Seq[Expression],
+ scalarSubqueryToLiteral: execution.ScalarSubquery => Literal): Seq[Filter] = {
+ val scalarSubqueryReplaced = dataFilters.map(_.transform {
+ // Replace scalar subquery to literal so that `DataSourceStrategy.translateFilter` can
+ // support translating it.
+ case scalarSubquery: execution.ScalarSubquery => scalarSubqueryToLiteral(scalarSubquery)
+ })
+
val supportNestedPredicatePushdown = DataSourceUtils.supportNestedPredicatePushdown(relation)
// `dataFilters` should not include any constant metadata col filters
// because the metadata struct has been flatted in FileSourceStrategy
// and thus metadata col filters are invalid to be pushed down. Metadata that is generated
// during the scan can be used for filters.
- dataFilters.filterNot(_.references.exists {
+ scalarSubqueryReplaced.filterNot(_.references.exists {
case FileSourceConstantMetadataAttribute(_) => true
case _ => false
}).flatMap(DataSourceStrategy.translateFilter(_, supportNestedPredicatePushdown))
}
+ // This field may execute subquery expressions and should not be accessed during planning.
@transient
- protected lazy val pushedDownFilters: Seq[Filter] = translatePushedDownFilters(dataFilters)
-
- @transient
- protected lazy val dynamicallyPushedDownFilters: Seq[Filter] = {
- if (dataFilters.exists(_.exists(_.isInstanceOf[execution.ScalarSubquery]))) {
- // Replace scalar subquery to literal so that `DataSourceStrategy.translateFilter` can
- // support translate it. The subquery must has been materialized since SparkPlan always
- // execute subquery first.
- val normalized = dataFilters.map(_.transform {
- case scalarSubquery: execution.ScalarSubquery => scalarSubquery.toLiteral
- })
- translatePushedDownFilters(normalized)
- } else {
- pushedDownFilters
- }
- }
+ protected lazy val pushedDownFilters: Seq[Filter] = translateToV1Filters(dataFilters, _.toLiteral)
override lazy val metadata: Map[String, String] = {
def seqToString(seq: Seq[Any]) = seq.mkString("[", ", ", "]")
val location = relation.location
val locationDesc =
location.getClass.getSimpleName +
Utils.buildLocationMetadata(location.rootPaths, maxMetadataValueLength)
+ // `metadata` is accessed during planning and the scalar subquery is not executed yet. Here
+ // we get the pretty string of the scalar subquery, for display purpose only.
+ val pushedFiltersForDisplay = translateToV1Filters(
+ dataFilters, s => Literal("ScalarSubquery#" + s.exprId.id))
val metadata =
Map(
"Format" -> relation.fileFormat.toString,
"ReadSchema" -> requiredSchema.catalogString,
"Batched" -> supportsColumnar.toString,
"PartitionFilters" -> seqToString(partitionFilters),
- "PushedFilters" -> seqToString(pushedDownFilters),
+ "PushedFilters" -> seqToString(pushedFiltersForDisplay),
Review Comment:
Now people can see the actual pushed filter in the EXPLAIN result. An example
```
+- FileScan parquet spark_catalog.default.t1[id#7L] Batched: true, DataFilters: [(((id#7L = 0) OR (id#7L = 1)) OR (id#7L = Subquery subquery#6, [id=#48]))], Format: Parquet, Location: InMemoryFileIndex(1 paths)[file:/Users/wenchen/dev/spark/assembly/spark-warehouse/t1], PartitionFilters: [], PushedFilters: [Or(Or(EqualTo(id,0),EqualTo(id,1)),EqualTo(id,ScalarSubquery#6))], ReadSchema: struct<id:bigint>
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on pull request #42318: [SPARK-44655][SQL] Make the code cleaner about static and dynamic data/partition filters
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #42318:
URL: https://github.com/apache/spark/pull/42318#issuecomment-1664119614
cc @viirya @ulysses-you
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] viirya commented on a diff in pull request #42318: [SPARK-44655][SQL] Make the code cleaner about static and dynamic data/partition filters
Posted by "viirya (via GitHub)" <gi...@apache.org>.
viirya commented on code in PR #42318:
URL: https://github.com/apache/spark/pull/42318#discussion_r1283400087
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/DataSourceScanExec.scala:
##########
@@ -371,49 +373,47 @@ trait FileSourceScanLike extends DataSourceScanExec {
}
}
- private def translatePushedDownFilters(dataFilters: Seq[Expression]): Seq[Filter] = {
+ private def translateToV1Filters(
+ dataFilters: Seq[Expression],
+ scalarSubqueryToLiteral: execution.ScalarSubquery => Literal): Seq[Filter] = {
+ val scalarSubqueryReplaced = dataFilters.map(_.transform {
+ // Replace scalar subquery to literal so that `DataSourceStrategy.translateFilter` can
+ // support translating it.
+ case scalarSubquery: execution.ScalarSubquery => scalarSubqueryToLiteral(scalarSubquery)
+ })
+
val supportNestedPredicatePushdown = DataSourceUtils.supportNestedPredicatePushdown(relation)
// `dataFilters` should not include any constant metadata col filters
// because the metadata struct has been flatted in FileSourceStrategy
// and thus metadata col filters are invalid to be pushed down. Metadata that is generated
// during the scan can be used for filters.
- dataFilters.filterNot(_.references.exists {
+ scalarSubqueryReplaced.filterNot(_.references.exists {
case FileSourceConstantMetadataAttribute(_) => true
case _ => false
}).flatMap(DataSourceStrategy.translateFilter(_, supportNestedPredicatePushdown))
}
+ // This field may execute subquery expressions and should not be accessed during planning.
@transient
- protected lazy val pushedDownFilters: Seq[Filter] = translatePushedDownFilters(dataFilters)
-
- @transient
- protected lazy val dynamicallyPushedDownFilters: Seq[Filter] = {
- if (dataFilters.exists(_.exists(_.isInstanceOf[execution.ScalarSubquery]))) {
- // Replace scalar subquery to literal so that `DataSourceStrategy.translateFilter` can
- // support translate it. The subquery must has been materialized since SparkPlan always
- // execute subquery first.
- val normalized = dataFilters.map(_.transform {
- case scalarSubquery: execution.ScalarSubquery => scalarSubquery.toLiteral
- })
- translatePushedDownFilters(normalized)
- } else {
- pushedDownFilters
- }
- }
+ protected lazy val pushedDownFilters: Seq[Filter] = translateToV1Filters(dataFilters, _.toLiteral)
override lazy val metadata: Map[String, String] = {
def seqToString(seq: Seq[Any]) = seq.mkString("[", ", ", "]")
val location = relation.location
val locationDesc =
location.getClass.getSimpleName +
Utils.buildLocationMetadata(location.rootPaths, maxMetadataValueLength)
+ // `metadata` is accessed during planning and the scalar subquery is not executed yet. Here
+ // we get the pretty string of the scalar subquery, for display purpose only.
+ val pushedFiltersForDisplay = translateToV1Filters(
+ dataFilters, s => Literal("ScalarSubquery#" + s.exprId.id))
val metadata =
Map(
"Format" -> relation.fileFormat.toString,
"ReadSchema" -> requiredSchema.catalogString,
"Batched" -> supportsColumnar.toString,
"PartitionFilters" -> seqToString(partitionFilters),
- "PushedFilters" -> seqToString(pushedDownFilters),
+ "PushedFilters" -> seqToString(pushedFiltersForDisplay),
Review Comment:
Oh, this is nice.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #42318: [SPARK-44655][SQL] Make the code cleaner about static and dynamic data/partition filters
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #42318:
URL: https://github.com/apache/spark/pull/42318#discussion_r1283276807
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/DataSourceScanExec.scala:
##########
@@ -249,12 +249,18 @@ trait FileSourceScanLike extends DataSourceScanExec {
private def isDynamicPruningFilter(e: Expression): Boolean =
e.exists(_.isInstanceOf[PlanExpression[_]])
+
+ // This field will be accessed during planning (e.g., `outputPartitioning` relies on it), and can
+ // only use static filters.
@transient lazy val selectedPartitions: Array[PartitionDirectory] = {
Review Comment:
This is a public field of `FileSourceScanLike`. Some external Spark extensions may access it during planning. So I make it safe to be executed during planning, instead of ensuring it to be only executed after planning.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #42318: [SPARK-44655][SQL] Make the code cleaner about static and dynamic data/partition filters
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #42318:
URL: https://github.com/apache/spark/pull/42318#discussion_r1283281732
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/DataSourceScanExec.scala:
##########
@@ -278,7 +285,11 @@ trait FileSourceScanLike extends DataSourceScanExec {
val index = partitionColumns.indexWhere(a.name == _.name)
BoundReference(index, partitionColumns(index).dataType, nullable = true)
}, Nil)
- val ret = selectedPartitions.filter(p => boundPredicate.eval(p.values))
+ var ret = selectedPartitions.filter(p => boundPredicate.eval(p.values))
+ if (dynamicDataFilters.nonEmpty) {
Review Comment:
to avoid any perf regression caused by the change of `selectedPartitions`, here I prune the files again using the dynamic data filters.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #42318: [SPARK-44655][SQL] Make the code cleaner about static and dynamic data/partition filters
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #42318:
URL: https://github.com/apache/spark/pull/42318#discussion_r1283283625
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/DataSourceScanExec.scala:
##########
@@ -288,14 +299,6 @@ trait FileSourceScanLike extends DataSourceScanExec {
}
}
- /**
- * [[partitionFilters]] can contain subqueries whose results are available only at runtime so
- * accessing [[selectedPartitions]] should be guarded by this method during planning
- */
- private def hasPartitionsAvailableAtRunTime: Boolean = {
Review Comment:
this is not needed anymore because `selectedPartitions` will not evaluate dynamic filters.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn closed pull request #42318: [SPARK-44655][SQL] Make the code cleaner about static and dynamic data/partition filters
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn closed pull request #42318: [SPARK-44655][SQL] Make the code cleaner about static and dynamic data/partition filters
URL: https://github.com/apache/spark/pull/42318
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org