summarize: Make incr-cache-loading and query-blocking contribute to self-time of query.

Author: michaelwoerister

summarize/src/analysis.rs

@@ -175,6 +175,7 @@ pub fn perform_analysis(data: ProfilingData) -> Results {
                                 data.self_time -= current_event_duration;
                             }
                             INCREMENTAL_LOAD_RESULT_EVENT_KIND => {
+                                data.self_time -= current_event_duration;
                                 data.incremental_load_time -= current_event_duration;
                             }
                             _ => {
@@ -200,12 +201,14 @@ pub fn perform_analysis(data: ProfilingData) -> Results {
 
                     QUERY_BLOCKED_EVENT_KIND => {
                         record_event_data(&current_event.label, &|data| {
+                            data.self_time += current_event_duration;
                             data.blocked_time += current_event_duration;
                         });
                     }
 
                     INCREMENTAL_LOAD_RESULT_EVENT_KIND => {
                         record_event_data(&current_event.label, &|data| {
+                            data.self_time += current_event_duration;
                             data.incremental_load_time += current_event_duration;
                         });
                     }