Merge pull request #3972 from perlpunk/group-overview-opt

Optimize group_overview: don't fetch bugdetails where not needed
os-autoinst · Jun 22, 2021 · 02699d6 · 02699d6
2 parents 2ce59c6 + 72af7d9
commit 02699d6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/lib/OpenQA/Schema/ResultSet/Comments.pm b/lib/OpenQA/Schema/ResultSet/Comments.pm
@@ -43,17 +43,23 @@ sub referenced_bugs {
 
 =over 4
 
-=item comment_data_for_jobs($jobs)
+=item comment_data_for_jobs($jobs, $args)
 
 Return a hashref with bugrefs, labels and the number of regular comments per job ID.
 
+You can pass an additional argument C<bugdetails> if necessary:
+
+    $self->comment_data_for_jobs($jobs, {bugdetails => 1});
+
+if you need the Bug objects themselves.
+
 =back
 
 =cut
 
-sub comment_data_for_jobs ($self, $jobs) {
+sub comment_data_for_jobs ($self, $jobs, $args = {}) {
     my @job_ids  = map { $_->id } ref $jobs eq 'ARRAY' ? @$jobs : $jobs->all;
-    my $comments = $self->search({job_id => {in => \@job_ids}}, {order_by => 'me.id'});
+    my $comments = $self->search({job_id => {in => \@job_ids}}, {order_by => 'me.id', select => [qw(text job_id)]});
     my $bugs     = $self->result_source->schema->resultset('Bugs');
 
     my (%res, %bugdetails);
@@ -62,7 +68,7 @@ sub comment_data_for_jobs ($self, $jobs) {
         if (@$bugrefs) {
             my $bugs_of_job = ($res->{bugs} //= {});
             for my $bug (@$bugrefs) {
-                $bugdetails{$bug} = $bugs->get_bug($bug) unless exists $bugdetails{$bug};
+                $bugdetails{$bug} ||= $bugs->get_bug($bug) if $args->{bugdetails};
                 $bugs_of_job->{$bug} = 1;
             }
             $res->{bugdetails} = \%bugdetails;

diff --git a/lib/OpenQA/WebAPI/Controller/Test.pm b/lib/OpenQA/WebAPI/Controller/Test.pm
@@ -470,7 +470,7 @@ sub job_next_previous_ajax {
                   && $each->t_finished ? $self->format_time_duration($each->t_finished - $each->t_started) : 0,
             });
     }
-    my $comment_data = $schema->resultset('Comments')->comment_data_for_jobs(\@jobs);
+    my $comment_data = $schema->resultset('Comments')->comment_data_for_jobs(\@jobs, {bugdetails => 1});
     for my $data (@data) {
         my $id           = $data->{id};
         my $comment_info = $comment_data->{$id};
@@ -547,7 +547,7 @@ sub prepare_job_results {
 
     # prefetch the number of available labels for those jobs
     my $schema       = $self->schema;
-    my $comment_data = $schema->resultset('Comments')->comment_data_for_jobs($jobs);
+    my $comment_data = $schema->resultset('Comments')->comment_data_for_jobs($jobs, {bugdetails => 1});
 
     # prefetch test suite names from job settings
     my $job_settings