fix pushdown

adriangb · adriangb · commit e0240af34e10 · 2026-02-15T08:11:05.000-05:00
diff --git a/datafusion/physical-expr-common/src/physical_expr.rs b/datafusion/physical-expr-common/src/physical_expr.rs
@@ -797,7 +797,12 @@ impl PhysicalExpr for OptionalFilterPhysicalExpr {
     }
 
     fn snapshot(&self) -> Result<Option<Arc<dyn PhysicalExpr>>> {
-        self.inner.snapshot()
+        // Always unwrap the Optional wrapper for snapshot consumers (e.g. PruningPredicate).
+        // If inner has a snapshot, use it; otherwise return the inner directly.
+        Ok(Some(match self.inner.snapshot()? {
+            Some(snap) => snap,
+            None => Arc::clone(&self.inner),
+        }))
     }
 
     fn snapshot_generation(&self) -> u64 {

Original file line number	Diff line number	Diff line change
`@@ -797,7 +797,12 @@ impl PhysicalExpr for OptionalFilterPhysicalExpr {`
`797`	`797`	`}`
`798`	`798`
`799`	`799`	`fn snapshot(&self) -> Result<Option<Arc<dyn PhysicalExpr>>> {`
`800`		`- self.inner.snapshot()`
	`800`	`+ // Always unwrap the Optional wrapper for snapshot consumers (e.g. PruningPredicate).`
	`801`	`+ // If inner has a snapshot, use it; otherwise return the inner directly.`
	`802`	`+ Ok(Some(match self.inner.snapshot()? {`
	`803`	`+ Some(snap) => snap,`
	`804`	`+ None => Arc::clone(&self.inner),`
	`805`	`+ }))`
`801`	`806`	`}`
`802`	`807`
`803`	`808`	`fn snapshot_generation(&self) -> u64 {`