Skip to content

fix: [native_datafusion] Don't serialize subquery data filters #2676

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

fix: [native_datafusion] Don't serialize subquery data filters #2676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46a4c45
Don't serialize unfiltered data filters for native_datafusion.
mbutrovich Nov 1, 2025
bbf6091
Simplify comment.
mbutrovich Nov 1, 2025
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 spark/src/main/scala/org/apache/comet/serde/QueryPlanSerde.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -959,7 +959,7 @@ object QueryPlanSerde extends Logging with CometExprShim {
CometConf.COMET_RESPECT_PARQUET_FILTER_PUSHDOWN.get(conf)) {

val dataFilters = new ListBuffer[Expr]()
for (filter <- scan.dataFilters) {
for (filter <- scan.supportedDataFilters) {
exprToProto(filter, scan.output) match {
case Some(proto) => dataFilters += proto
case _ =>
Expand Down
17 changes: 11 additions & 6 deletions spark/src/main/scala/org/apache/spark/sql/comet/CometScanExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,16 +155,21 @@ case class CometScanExec(
}
}

@transient
private lazy val pushedDownFilters = {
val supportedFilters = if (scanImpl == CometConf.SCAN_NATIVE_DATAFUSION) {
// `native_datafusion` scan does not support subquery pushdown filters,
// see: https://github.com/apache/datafusion-comet/issues/2424
/**
* Returns the data filters that are supported for this scan implementation. For
* native_datafusion scans, this excludes dynamic pruning filters (subqueries)
*/
lazy val supportedDataFilters: Seq[Expression] = {
if (scanImpl == CometConf.SCAN_NATIVE_DATAFUSION) {
dataFilters.filterNot(isDynamicPruningFilter)
} else {
dataFilters
}
getPushedDownFilters(relation, supportedFilters)
}

@transient
private lazy val pushedDownFilters = {
getPushedDownFilters(relation, supportedDataFilters)
}

override lazy val metadata: Map[String, String] =
Expand Down
Loading