raito/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Cleanup

Browse source
This commit is contained in:
Eelco Dolstra 2012-04-15 21:49:54 +00:00
parent 5793baa3cd
commit 573a333bc9
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/lib/Hydra/Controller/Jobset.pm
View file

@ -343,23 +343,15 @@ sub getEvals {
}); });
my @res = (); my @res = ();
my $curInputs; my $prevInputs = [];
for (my $n = 0; $n < $rows && $n < scalar @evals; $n++) { for (my $n = scalar @evals - 1; $n >= 0; $n--) {
my $cur = $evals[$n]; my $cur = $evals[$n];
my $prev = $evals[$n + 1]; my $prev = $evals[$n + 1];
# Compute what inputs changed between each eval. # Compute what inputs changed between each eval.
my $diff = 0; my $curInputs = [ $cur->jobsetevalinputs->search(
my $prevInputs = [];
$curInputs = [ $cur->jobsetevalinputs->search(
{ uri => { '!=' => undef }, revision => { '!=' => undef }, altNr => 0 },
{ order_by => "name" }) ] unless defined $curInputs;
if (defined $prev) {
$diff = $cur->get_column("nrSucceeded") - $prev->get_column("nrSucceeded");
$prevInputs = [ $prev->jobsetevalinputs->search(
{ uri => { '!=' => undef }, revision => { '!=' => undef }, altNr => 0 }, { uri => { '!=' => undef }, revision => { '!=' => undef }, altNr => 0 },
{ order_by => "name" }) ]; { order_by => "name" }) ];
}
my @changedInputs; my @changedInputs;
my %prevInputsHash; my %prevInputsHash;
$prevInputsHash{$_->name} = $_ foreach @{$prevInputs}; $prevInputsHash{$_->name} = $_ foreach @{$prevInputs};
@ -368,12 +360,16 @@ sub getEvals {
push @changedInputs, $input push @changedInputs, $input
if !defined $p || $input->revision ne $p->revision || $input->type ne $p->type || $input->uri ne $p->uri; if !defined $p || $input->revision ne $p->revision || $input->type ne $p->type || $input->uri ne $p->uri;
} }
$curInputs = $prevInputs; $prevInputs = $curInputs;
push @res, { eval => $cur, diff => $diff, changedInputs => [ @changedInputs ] }; push @res,
{ eval => $cur
, diff => defined $prev ? $cur->get_column("nrSucceeded") - $prev->get_column("nrSucceeded") : 0
, changedInputs => [ @changedInputs ]
};
} }
return [@res]; return [(reverse @res)[0..$rows - 1]];
} }