@@ -39,6 +39,7 @@ struct CaptureDeleteProvider {
3939 schema : SchemaRef ,
4040 received_filters : Arc < Mutex < Option < Vec < Expr > > > > ,
4141 filter_pushdown : TableProviderFilterPushDown ,
42+ per_filter_pushdown : Option < Vec < TableProviderFilterPushDown > > ,
4243}
4344
4445impl CaptureDeleteProvider {
@@ -47,6 +48,7 @@ impl CaptureDeleteProvider {
4748 schema,
4849 received_filters : Arc :: new ( Mutex :: new ( None ) ) ,
4950 filter_pushdown : TableProviderFilterPushDown :: Unsupported ,
51+ per_filter_pushdown : None ,
5052 }
5153 }
5254
@@ -58,6 +60,19 @@ impl CaptureDeleteProvider {
5860 schema,
5961 received_filters : Arc :: new ( Mutex :: new ( None ) ) ,
6062 filter_pushdown,
63+ per_filter_pushdown : None ,
64+ }
65+ }
66+
67+ fn new_with_per_filter_pushdown (
68+ schema : SchemaRef ,
69+ per_filter_pushdown : Vec < TableProviderFilterPushDown > ,
70+ ) -> Self {
71+ Self {
72+ schema,
73+ received_filters : Arc :: new ( Mutex :: new ( None ) ) ,
74+ filter_pushdown : TableProviderFilterPushDown :: Unsupported ,
75+ per_filter_pushdown : Some ( per_filter_pushdown) ,
6176 }
6277 }
6378
@@ -113,6 +128,12 @@ impl TableProvider for CaptureDeleteProvider {
113128 & self ,
114129 filters : & [ & Expr ] ,
115130 ) -> Result < Vec < TableProviderFilterPushDown > > {
131+ if let Some ( per_filter) = & self . per_filter_pushdown {
132+ if per_filter. len ( ) == filters. len ( ) {
133+ return Ok ( per_filter. clone ( ) ) ;
134+ }
135+ }
136+
116137 Ok ( vec ! [ self . filter_pushdown. clone( ) ; filters. len( ) ] )
117138 }
118139}
@@ -124,6 +145,7 @@ struct CaptureUpdateProvider {
124145 received_filters : Arc < Mutex < Option < Vec < Expr > > > > ,
125146 received_assignments : Arc < Mutex < Option < Vec < ( String , Expr ) > > > > ,
126147 filter_pushdown : TableProviderFilterPushDown ,
148+ per_filter_pushdown : Option < Vec < TableProviderFilterPushDown > > ,
127149}
128150
129151impl CaptureUpdateProvider {
@@ -133,6 +155,7 @@ impl CaptureUpdateProvider {
133155 received_filters : Arc :: new ( Mutex :: new ( None ) ) ,
134156 received_assignments : Arc :: new ( Mutex :: new ( None ) ) ,
135157 filter_pushdown : TableProviderFilterPushDown :: Unsupported ,
158+ per_filter_pushdown : None ,
136159 }
137160 }
138161
@@ -145,6 +168,20 @@ impl CaptureUpdateProvider {
145168 received_filters : Arc :: new ( Mutex :: new ( None ) ) ,
146169 received_assignments : Arc :: new ( Mutex :: new ( None ) ) ,
147170 filter_pushdown,
171+ per_filter_pushdown : None ,
172+ }
173+ }
174+
175+ fn new_with_per_filter_pushdown (
176+ schema : SchemaRef ,
177+ per_filter_pushdown : Vec < TableProviderFilterPushDown > ,
178+ ) -> Self {
179+ Self {
180+ schema,
181+ received_filters : Arc :: new ( Mutex :: new ( None ) ) ,
182+ received_assignments : Arc :: new ( Mutex :: new ( None ) ) ,
183+ filter_pushdown : TableProviderFilterPushDown :: Unsupported ,
184+ per_filter_pushdown : Some ( per_filter_pushdown) ,
148185 }
149186 }
150187
@@ -206,6 +243,12 @@ impl TableProvider for CaptureUpdateProvider {
206243 & self ,
207244 filters : & [ & Expr ] ,
208245 ) -> Result < Vec < TableProviderFilterPushDown > > {
246+ if let Some ( per_filter) = & self . per_filter_pushdown {
247+ if per_filter. len ( ) == filters. len ( ) {
248+ return Ok ( per_filter. clone ( ) ) ;
249+ }
250+ }
251+
209252 Ok ( vec ! [ self . filter_pushdown. clone( ) ; filters. len( ) ] )
210253 }
211254}
@@ -414,6 +457,58 @@ async fn test_delete_mixed_filter_locations() -> Result<()> {
414457 Ok ( ( ) )
415458}
416459
460+ #[ tokio:: test]
461+ async fn test_delete_per_filter_pushdown_mixed_locations ( ) -> Result < ( ) > {
462+ // Force per-filter pushdown decisions to exercise mixed locations in one query.
463+ // First predicate is pushed down (Exact), second stays as residual (Unsupported).
464+ let provider = Arc :: new ( CaptureDeleteProvider :: new_with_per_filter_pushdown (
465+ test_schema ( ) ,
466+ vec ! [
467+ TableProviderFilterPushDown :: Exact ,
468+ TableProviderFilterPushDown :: Unsupported ,
469+ ] ,
470+ ) ) ;
471+
472+ let ctx = SessionContext :: new ( ) ;
473+ ctx. register_table ( "t" , Arc :: clone ( & provider) as Arc < dyn TableProvider > ) ?;
474+
475+ let df = ctx
476+ . sql ( "DELETE FROM t WHERE id = 1 AND status = 'active'" )
477+ . await ?;
478+ let optimized_plan = df. clone ( ) . into_optimized_plan ( ) ?;
479+
480+ // Only the first predicate should be pushed to TableScan.filters.
481+ let mut scan_filters = Vec :: new ( ) ;
482+ optimized_plan. apply ( |node| {
483+ if let LogicalPlan :: TableScan ( TableScan { filters, .. } ) = node {
484+ scan_filters. extend ( filters. clone ( ) ) ;
485+ }
486+ Ok ( TreeNodeRecursion :: Continue )
487+ } ) ?;
488+ assert_eq ! ( scan_filters. len( ) , 1 ) ;
489+ assert ! ( scan_filters[ 0 ] . to_string( ) . contains( "id" ) ) ;
490+
491+ // Both predicates should still reach the provider (union + dedup behavior).
492+ df. collect ( ) . await ?;
493+
494+ let filters = provider
495+ . captured_filters ( )
496+ . expect ( "filters should be captured" ) ;
497+ assert_eq ! ( filters. len( ) , 2 ) ;
498+
499+ let filter_strs: Vec < String > = filters. iter ( ) . map ( |f| f. to_string ( ) ) . collect ( ) ;
500+ assert ! (
501+ filter_strs. iter( ) . any( |s| s. contains( "id" ) ) ,
502+ "should contain pushed-down id filter"
503+ ) ;
504+ assert ! (
505+ filter_strs. iter( ) . any( |s| s. contains( "status" ) ) ,
506+ "should contain residual status filter"
507+ ) ;
508+
509+ Ok ( ( ) )
510+ }
511+
417512#[ tokio:: test]
418513async fn test_update_assignments ( ) -> Result < ( ) > {
419514 let provider = Arc :: new ( CaptureUpdateProvider :: new ( test_schema ( ) ) ) ;
0 commit comments