From 629fe6f998f8ea3eeb8ff37199743a6e505ae068 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Feb 2013 14:29:12 +0100 Subject: [PATCH] Jobset page: Load the jobs and status tabs on demand This makes the jobset page much smaller and faster. (E.g. for nixpkgs:trunk, this page was ~2.5 MB.) --- src/lib/Hydra/Controller/Jobset.pm | 107 +++++++++++++++-------------- src/root/jobset-jobs-tab.tt | 15 ++++ src/root/jobset-status-tab.tt | 24 +++++++ src/root/jobset.tt | 54 +-------------- 4 files changed, 97 insertions(+), 103 deletions(-) create mode 100644 src/root/jobset-jobs-tab.tt create mode 100644 src/root/jobset-status-tab.tt diff --git a/src/lib/Hydra/Controller/Jobset.pm b/src/lib/Hydra/Controller/Jobset.pm index 4923b47f..c4c179b2 100644 --- a/src/lib/Hydra/Controller/Jobset.pm +++ b/src/lib/Hydra/Controller/Jobset.pm @@ -21,37 +21,54 @@ sub jobset : Chained('/') PathPart('jobset') CaptureArgs(2) { } -sub jobsetIndex { - my ($self, $c, $forceStatus) = @_; +sub index : Chained('jobset') PathPart('') Args(0) { + my ($self, $c) = @_; $c->stash->{template} = 'jobset.tt'; my $projectName = $c->stash->{project}->name; my $jobsetName = $c->stash->{jobset}->name; - # Get the active / inactive jobs in this jobset. - my @jobs = $c->stash->{jobset}->jobs->search( - { }, - { select => [ - "name", - \ ("exists (select 1 from builds where project = '$projectName' and jobset = '$jobsetName' and job = me.name and isCurrent = 1) as active") - ] - , as => ["name", "active"] - , order_by => ["name"] }); - - $c->stash->{activeJobs} = []; - $c->stash->{inactiveJobs} = []; - foreach my $job (@jobs) { - if ($job->get_column('active')) { - push @{$c->stash->{activeJobs}}, $job->name; - } else { - push @{$c->stash->{inactiveJobs}}, $job->name; - } - } - $c->stash->{evals} = getEvals($self, $c, scalar $c->stash->{jobset}->jobsetevals, 0, 10); ($c->stash->{latestEval}) = $c->stash->{jobset}->jobsetevals->search({}, { limit => 1, order_by => ["id desc"] }); +} + + +sub jobs_tab : Chained('jobset') PathPart('jobs-tab') Args(0) { + my ($self, $c) = @_; + $c->stash->{template} = 'jobset-jobs-tab.tt'; + + $c->stash->{activeJobs} = []; + $c->stash->{inactiveJobs} = []; + + (my $latestEval) = $c->stash->{jobset}->jobsetevals->search( + { hasnewbuilds => 1}, { limit => 1, order_by => ["id desc"] }); + + my %activeJobs; + if (defined $latestEval) { + foreach my $build ($latestEval->builds->search({}, { order_by => ["job"], select => ["job"] })) { + my $job = $build->get_column("job"); + if (!defined $activeJobs{$job}) { + $activeJobs{$job} = 1; + push @{$c->stash->{activeJobs}}, $job; + } + } + } + + foreach my $job ($c->stash->{jobset}->jobs->search({}, { order_by => ["name"] })) { + if (!defined $activeJobs{$job->name}) { + push @{$c->stash->{inactiveJobs}}, $job->name; + } + } +} + + +sub status_tab : Chained('jobset') PathPart('status-tab') Args(0) { + my ($self, $c) = @_; + $c->stash->{template} = 'jobset-status-tab.tt'; + + # FIXME: use latest eval instead of iscurrent. $c->stash->{systems} = [ $c->stash->{jobset}->builds->search({ iscurrent => 1 }, { select => ["system"], distinct => 1, order_by => "system" }) ]; @@ -62,38 +79,24 @@ sub jobsetIndex { push(@systems, $system->system); } - if($forceStatus || scalar(@{$c->stash->{activeJobs}}) <= 100) { - my @select = (); - my @as = (); - push(@select, "job"); push(@as, "job"); - foreach my $system (@systems) { - push(@select, "(select buildstatus from Builds b where b.id = (select max(id) from Builds t where t.project = me.project and t.jobset = me.jobset and t.job = me.job and t.system = '$system' and t.iscurrent = 1 ))"); - push(@as, $system); - push(@select, "(select b.id from Builds b where b.id = (select max(id) from Builds t where t.project = me.project and t.jobset = me.jobset and t.job = me.job and t.system = '$system' and t.iscurrent = 1 ))"); - push(@as, "$system-build"); - } - $c->stash->{activeJobsStatus} = - [ $c->model('DB')->resultset('ActiveJobsForJobset')->search( - {}, - { bind => [$c->stash->{project}->name, $c->stash->{jobset}->name] - , select => \@select - , as => \@as - , order_by => ["job"] - })]; + my @select = (); + my @as = (); + push(@select, "job"); push(@as, "job"); + foreach my $system (@systems) { + push(@select, "(select buildstatus from Builds b where b.id = (select max(id) from Builds t where t.project = me.project and t.jobset = me.jobset and t.job = me.job and t.system = '$system' and t.iscurrent = 1 ))"); + push(@as, $system); + push(@select, "(select b.id from Builds b where b.id = (select max(id) from Builds t where t.project = me.project and t.jobset = me.jobset and t.job = me.job and t.system = '$system' and t.iscurrent = 1 ))"); + push(@as, "$system-build"); } -} - - -sub index : Chained('jobset') PathPart('') Args(0) { - my ($self, $c) = @_; - jobsetIndex($self, $c, 0); -} - - -sub indexWithStatus : Chained('jobset') PathPart('') Args(1) { - my ($self, $c, $forceStatus) = @_; - jobsetIndex($self, $c, 1); + $c->stash->{activeJobsStatus} = [ + $c->model('DB')->resultset('ActiveJobsForJobset')->search( + {}, + { bind => [$c->stash->{project}->name, $c->stash->{jobset}->name] + , select => \@select + , as => \@as + , order_by => ["job"] + }) ]; } diff --git a/src/root/jobset-jobs-tab.tt b/src/root/jobset-jobs-tab.tt new file mode 100644 index 00000000..51a810a3 --- /dev/null +++ b/src/root/jobset-jobs-tab.tt @@ -0,0 +1,15 @@ +[% PROCESS common.tt %] + +

This jobset currently contains the following [% activeJobs.size %] jobs: +

+ [% IF activeJobs.size == 0 %](none)[% END %] + [% FOREACH j IN activeJobs %][% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %]
[% END %] +
+

+ +

This jobset used to contain the following [% inactiveJobs.size %] jobs: +

+ [% IF inactiveJobs.size == 0 %](none)[% END %] + [% FOREACH j IN inactiveJobs %][% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %]
[% END %] +
+

diff --git a/src/root/jobset-status-tab.tt b/src/root/jobset-status-tab.tt new file mode 100644 index 00000000..5ae3b937 --- /dev/null +++ b/src/root/jobset-status-tab.tt @@ -0,0 +1,24 @@ +[% PROCESS common.tt %] + + + [% FOREACH s IN systems %][% END %] + + [% odd = 0 %] + [% FOREACH j IN activeJobsStatus %] + + + [% FOREACH s IN systems %] + [% system = s.system %] + [% systemStatus = j.get_column(system) %] + + [% END %] + + [% END %] + +
Job[% s.system %]
[% INCLUDE renderJobName project=project.name jobset = jobset.name job = j.get_column('job') %] + [% IF systemStatus != undef %] + + [% INCLUDE renderBuildStatusIcon buildstatus=systemStatus size=16 %] + + [% END %] +
diff --git a/src/root/jobset.tt b/src/root/jobset.tt index 3c1d23fc..ea125564 100644 --- a/src/root/jobset.tt +++ b/src/root/jobset.tt @@ -46,7 +46,7 @@
  • Evaluation errors
    • [% END %]
  • Job status
    • -
  • Jobs ([% activeJobs.size %])
    • +
  • Jobs
  • Configuration
    • @@ -86,39 +86,7 @@ -
    - - [% IF activeJobsStatus %] - - [% FOREACH s IN systems %][% END %] - - [% odd = 0 %] - [% FOREACH j IN activeJobsStatus %] - - - [% FOREACH s IN systems %] - [% system = s.system %] - [% systemStatus = j.get_column(system) %] - - [% END %] - - [% END %] - -
    Job[% s.system %]
    [% INCLUDE renderJobName project=project.name jobset = jobset.name job = j.get_column('job') %] - [% IF systemStatus != undef %] - - [% INCLUDE renderBuildStatusIcon buildstatus=systemStatus size=16 %] - - [% END %] -
    - [% ELSE %] -

    Status

    -

    - [ Show status overview ] -

    - [% END %] - -
    + [% INCLUDE makeLazyTab tabName="tabs-status" uri=c.uri_for('/jobset' project.name jobset.name "status-tab") %] [% IF jobset.errormsg %]
    @@ -164,23 +132,7 @@ [% INCLUDE renderInputs %]
    -
    - -

    This jobset currently contains the following [% activeJobs.size %] jobs: -

    - [% IF activeJobs.size == 0 %](none)[% END %] - [% FOREACH j IN activeJobs %][% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %]
    [% END %] -
    -

    - -

    This jobset used to contain the following [% inactiveJobs.size %] jobs: -

    - [% IF inactiveJobs.size == 0 %](none)[% END %] - [% FOREACH j IN inactiveJobs %][% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %]
    [% END %] -
    -

    - -
    + [% INCLUDE makeLazyTab tabName="tabs-jobs" uri=c.uri_for('/jobset' project.name jobset.name "jobs-tab") %]