@@ -288,6 +288,7 @@ async fn completed_filter_evaluates_only_the_shared_probe_key() {
288288 probe,
289289 predicate,
290290 ExecutionPlanMetricsSet :: new ( ) ,
291+ "dynamic_filter_join" ,
291292 ) ) ;
292293 let filtered = collect ( consumer, session. task_ctx ( ) ) . await . unwrap ( ) ;
293294 let selected = BooleanArray :: from (
@@ -353,9 +354,9 @@ async fn completed_build_filters_both_sides_and_session_inlist_settings() {
353354 4 ,
354355 "duplicates and late build keys must match"
355356 ) ;
356- assert_eq ! ( metric( & attached, "dynamic_filter_rows_evaluated " ) , 202 ) ;
357- assert ! ( metric( & attached, "dynamic_filter_rows_pruned " ) >= 199 ) ;
358- assert_eq ! ( metric( & attached, "dynamic_filter_rows_bypassed " ) , 0 ) ;
357+ assert_eq ! ( metric( & attached, "dynamic_filter_join_rows_evaluated " ) , 202 ) ;
358+ assert ! ( metric( & attached, "dynamic_filter_join_rows_pruned " ) >= 199 ) ;
359+ assert_eq ! ( metric( & attached, "dynamic_filter_join_rows_bypassed " ) , 0 ) ;
359360 } else {
360361 assert_eq ! ( row_count( & actual) , 0 ) ;
361362 }
@@ -559,7 +560,7 @@ async fn independent_attempts_do_not_share_build_domains() {
559560 } )
560561 . collect :: < Vec < _ > > ( ) ;
561562 assert_eq ! ( keys, vec![ build_key] ) ;
562- assert_eq ! ( metric( & attached, "dynamic_filter_rows_pruned " ) , 1 ) ;
563+ assert_eq ! ( metric( & attached, "dynamic_filter_join_rows_pruned " ) , 1 ) ;
563564 }
564565}
565566
@@ -840,7 +841,7 @@ async fn reader_filter_crosses_null_check_conjunction_and_retains_residual() {
840841 assert_eq ! (
841842 plan. metrics( )
842843 . unwrap( )
843- . sum_by_name( "dynamic_filter_reader_filters_attached " )
844+ . sum_by_name( "dynamic_filter_join_filters_attached " )
844845 . unwrap( )
845846 . as_usize( ) ,
846847 1
@@ -887,7 +888,7 @@ async fn reader_filter_does_not_cross_fetch_limits() {
887888 . unwrap ( ) ;
888889 outputs. push ( row_count ( & output) ) ;
889890 if enabled {
890- assert_eq ! ( metric( & plan, "dynamic_filter_reader_filters_skipped " ) , 1 ) ;
891+ assert_eq ! ( metric( & plan, "dynamic_filter_join_filters_skipped " ) , 1 ) ;
891892 }
892893 }
893894 assert_eq ! ( outputs, vec![ 0 , 0 ] ) ;
@@ -969,10 +970,10 @@ async fn reader_filter_does_not_cross_seeded_rand_probe_filter() {
969970 . and_then ( |metrics| metrics. sum_by_name ( name) )
970971 . map_or ( 0 , |value| value. as_usize ( ) )
971972 } ;
972- assert_eq ! ( dynamic_metric( "dynamic_filter_reader_filters_attached " ) , 0 ) ;
973- assert_eq ! ( dynamic_metric( "dynamic_filter_reader_filters_skipped " ) , 1 ) ;
974- assert_eq ! ( dynamic_metric( "dynamic_filter_rows_evaluated " ) , 1 ) ;
975- assert_eq ! ( dynamic_metric( "dynamic_filter_rows_pruned " ) , 0 ) ;
973+ assert_eq ! ( dynamic_metric( "dynamic_filter_join_filters_attached " ) , 0 ) ;
974+ assert_eq ! ( dynamic_metric( "dynamic_filter_join_filters_skipped " ) , 1 ) ;
975+ assert_eq ! ( dynamic_metric( "dynamic_filter_join_rows_evaluated " ) , 1 ) ;
976+ assert_eq ! ( dynamic_metric( "dynamic_filter_join_rows_pruned " ) , 0 ) ;
976977 assert_eq ! ( pruning_metric( & scan, "row_groups_pruned_statistics" ) , 0 ) ;
977978 assert_eq ! ( filter. metrics( ) . unwrap( ) . output_rows( ) . unwrap( ) , 1 ) ;
978979 }
@@ -1037,7 +1038,7 @@ async fn run_parquet_join(values: Vec<i32>, enabled: bool) -> (usize, usize, usi
10371038 . unwrap ( ) ;
10381039 let attached = plan
10391040 . metrics ( )
1040- . and_then ( |metrics| metrics. sum_by_name ( "dynamic_filter_reader_filters_attached " ) )
1041+ . and_then ( |metrics| metrics. sum_by_name ( "dynamic_filter_join_filters_attached " ) )
10411042 . map_or ( 0 , |metric| metric. as_usize ( ) ) ;
10421043 (
10431044 row_count ( & output) ,
@@ -1207,7 +1208,7 @@ async fn runtime_domains_release_with_streams_while_plans_remain_alive() {
12071208 assert_eq ! ( metrics. output_rows( ) , Some ( 1 ) ) ;
12081209 assert_eq ! (
12091210 metrics
1210- . sum_by_name( "dynamic_filter_rows_pruned " )
1211+ . sum_by_name( "dynamic_filter_join_rows_pruned " )
12111212 . unwrap( )
12121213 . as_usize( ) ,
12131214 1
@@ -1278,7 +1279,7 @@ async fn duplicate_heavy_builds_do_not_materialize_unreserved_inlists() {
12781279 assert_eq ! (
12791280 plan. metrics( )
12801281 . unwrap( )
1281- . sum_by_name( "dynamic_filter_rows_pruned " )
1282+ . sum_by_name( "dynamic_filter_join_rows_pruned " )
12821283 . unwrap( )
12831284 . as_usize( ) ,
12841285 1
@@ -1392,14 +1393,14 @@ async fn child_replacement_rechecks_join_key_types() {
13921393 . unwrap ( ) ;
13931394 assert_eq ! ( row_count( & output) , 1 ) ;
13941395 if supported {
1395- assert_eq ! ( metric( & rewritten, "dynamic_filter_rows_pruned " ) , 1 ) ;
1396+ assert_eq ! ( metric( & rewritten, "dynamic_filter_join_rows_pruned " ) , 1 ) ;
13961397 let reset = rewritten. reset_state ( ) . unwrap ( ) ;
13971398 assert ! ( reset. is:: <DynamicFilterJoinExec >( ) ) ;
13981399 let reset_output = collect ( Arc :: clone ( & reset) , session. task_ctx ( ) )
13991400 . await
14001401 . unwrap ( ) ;
14011402 assert_eq ! ( row_count( & reset_output) , 1 ) ;
1402- assert_eq ! ( metric( & reset, "dynamic_filter_rows_pruned " ) , 1 ) ;
1403+ assert_eq ! ( metric( & reset, "dynamic_filter_join_rows_pruned " ) , 1 ) ;
14031404 }
14041405 }
14051406 }
0 commit comments