@@ -392,6 +392,7 @@ fn local_remote_read_split(
392392 }
393393}
394394
395+ #[ allow( clippy:: too_many_arguments) ]
395396fn send_fetch_partitions (
396397 partition_locations : Vec < PartitionLocation > ,
397398 max_request_num : usize ,
@@ -433,21 +434,21 @@ fn send_fetch_partitions(
433434 . await ;
434435
435436 // Record local read metrics if callback is set and read succeeded
436- if r. is_ok ( ) {
437- if let Some ( ref callback) = metrics_callback_c {
438- let duration_ms = start_time . elapsed ( ) . as_millis ( ) as u64 ;
439- let bytes = p . partition_stats . num_bytes ( ) . unwrap_or ( 0 ) ;
440- let rows = p. partition_stats . num_rows ( ) . unwrap_or ( 0 ) ;
441- callback . record_local_read (
442- & p . partition_id . job_id ,
443- p. partition_id . stage_id ,
444- p. partition_id . partition_id ,
445- & p . executor_meta . id ,
446- bytes ,
447- rows ,
448- duration_ms ,
449- ) ;
450- }
437+ if r. is_ok ( )
438+ && let Some ( ref callback) = metrics_callback_c
439+ {
440+ let duration_ms = start_time . elapsed ( ) . as_millis ( ) as u64 ;
441+ let bytes = p. partition_stats . num_bytes ( ) . unwrap_or ( 0 ) ;
442+ let rows = p . partition_stats . num_rows ( ) . unwrap_or ( 0 ) ;
443+ callback . record_local_read (
444+ & p. partition_id . job_id ,
445+ p. partition_id . stage_id ,
446+ p . partition_id . partition_id ,
447+ & p . executor_meta . id ,
448+ bytes ,
449+ rows ,
450+ duration_ms ,
451+ ) ;
451452 }
452453
453454 if let Err ( e) = response_sender_c. send ( r) . await {
@@ -476,21 +477,21 @@ fn send_fetch_partitions(
476477 . await ;
477478
478479 // Record remote read metrics if callback is set and read succeeded
479- if r. is_ok ( ) {
480- if let Some ( ref callback) = metrics_callback_c {
481- let duration_ms = start_time . elapsed ( ) . as_millis ( ) as u64 ;
482- let bytes = p . partition_stats . num_bytes ( ) . unwrap_or ( 0 ) ;
483- let rows = p. partition_stats . num_rows ( ) . unwrap_or ( 0 ) ;
484- callback . record_remote_read (
485- & p . partition_id . job_id ,
486- p. partition_id . stage_id ,
487- p. partition_id . partition_id ,
488- & p . executor_meta . id ,
489- bytes ,
490- rows ,
491- duration_ms ,
492- ) ;
493- }
480+ if r. is_ok ( )
481+ && let Some ( ref callback) = metrics_callback_c
482+ {
483+ let duration_ms = start_time . elapsed ( ) . as_millis ( ) as u64 ;
484+ let bytes = p. partition_stats . num_bytes ( ) . unwrap_or ( 0 ) ;
485+ let rows = p . partition_stats . num_rows ( ) . unwrap_or ( 0 ) ;
486+ callback . record_remote_read (
487+ & p. partition_id . job_id ,
488+ p. partition_id . stage_id ,
489+ p . partition_id . partition_id ,
490+ & p . executor_meta . id ,
491+ bytes ,
492+ rows ,
493+ duration_ms ,
494+ ) ;
494495 }
495496
496497 // Block if the channel buffer is full.
0 commit comments