ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

qualify order by column

Browse Source
This commit is contained in:
Rob Vermaas 2011-04-18 08:10:10 +00:00
parent fca3019c7b
commit d4c96a47c9
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/lib/Hydra/Helper/Nix.pm
View File

@ -12,7 +12,7 @@ our @EXPORT = qw(
isValidPath isValidPath
getHydraPath getHydraDBPath openHydraDB getHydraConf txn_do getHydraPath getHydraDBPath openHydraDB getHydraConf txn_do
registerRoot getGCRootsDir gcRootFor registerRoot getGCRootsDir gcRootFor
getPrimaryBuildsForView getPrimaryBuildsForView
getPrimaryBuildTotal getPrimaryBuildTotal
getViewResult getLatestSuccessfulViewResult jobsetOverview); getViewResult getLatestSuccessfulViewResult jobsetOverview);
@ -74,7 +74,7 @@ sub txn_do {
sub getGCRootsDir { sub getGCRootsDir {
die unless defined $ENV{LOGNAME}; die unless defined $ENV{LOGNAME};
my $dir = ($ENV{NIX_STATE_DIR} || "/nix/var/nix" ) . "/gcroots/per-user/$ENV{LOGNAME}/hydra-roots"; my $dir = ($ENV{NIX_STATE_DIR} || "/nix/var/nix" ) . "/gcroots/per-user/$ENV{LOGNAME}/hydra-roots";
mkpath $dir if !-e $dir; mkpath $dir if !-e $dir;
return $dir; return $dir;
} }
@ -88,9 +88,9 @@ sub gcRootFor {
sub registerRoot { sub registerRoot {
my ($path) = @_; my ($path) = @_;
my $link = gcRootFor $path; my $link = gcRootFor $path;
if (!-l $link) { if (!-l $link) {
symlink($path, $link) symlink($path, $link)
or die "cannot create GC root `$link' to `$path'"; or die "cannot create GC root `$link' to `$path'";
@ -127,7 +127,7 @@ sub allPrimaryBuilds {
, '+as' => ["releasename", "buildstatus"] , '+as' => ["releasename", "buildstatus"]
, where => \ attrsToSQL($primaryJob->attrs, "me.id") , where => \ attrsToSQL($primaryJob->attrs, "me.id")
}); });
return $allPrimaryBuilds; return $allPrimaryBuilds;
} }
@ -167,7 +167,7 @@ sub findLastJobForBuilds {
$thisBuild = $ev->builds->find( $thisBuild = $ev->builds->find(
{ job => $job->get_column('job'), finished => 1 }, { job => $job->get_column('job'), finished => 1 },
{ join => 'resultInfo', rows => 1 { join => 'resultInfo', rows => 1
, order_by => ["id"] , order_by => ["me.id"]
, where => \ attrsToSQL($job->attrs, "build.id") , where => \ attrsToSQL($job->attrs, "build.id")
, '+select' => ["resultInfo.buildstatus"], '+as' => ["buildstatus"] , '+select' => ["resultInfo.buildstatus"], '+as' => ["buildstatus"]
}); });
@ -179,7 +179,7 @@ sub findLastJobForBuilds {
# hacky # hacky
$thisBuild = $depBuilds->find( $thisBuild = $depBuilds->find(
{ project => $project, jobset => $jobset { project => $project, jobset => $jobset
, job => $job->get_column('job'), finished => 1 , job => $job->get_column('job'), finished => 1
}, },
{ join => 'resultInfo', rows => 1 { join => 'resultInfo', rows => 1
, order_by => ["buildstatus", "timestamp"] , order_by => ["buildstatus", "timestamp"]
@ -187,27 +187,27 @@ sub findLastJobForBuilds {
, '+select' => ["resultInfo.buildstatus"], '+as' => ["buildstatus"] , '+select' => ["resultInfo.buildstatus"], '+as' => ["buildstatus"]
}) })
unless defined $thisBuild; unless defined $thisBuild;
return $thisBuild; return $thisBuild;
} }
sub jobsetOverview { sub jobsetOverview {
my ($c, $project) = @_; my ($c, $project) = @_;
return $project->jobsets->search( isProjectOwner($c, $project) ? {} : { hidden => 0 }, return $project->jobsets->search( isProjectOwner($c, $project) ? {} : { hidden => 0 },
{ order_by => "name" { order_by => "name"
, "+select" => [ , "+select" => [
"(SELECT COUNT(*) FROM Builds AS a NATURAL JOIN BuildSchedulingInfo WHERE me.project = a.project AND me.name = a.jobset AND a.isCurrent = 1 )" "(SELECT COUNT(*) FROM Builds AS a NATURAL JOIN BuildSchedulingInfo WHERE me.project = a.project AND me.name = a.jobset AND a.isCurrent = 1 )"
, "(SELECT COUNT(*) FROM Builds AS a NATURAL JOIN BuildResultInfo WHERE me.project = a.project AND me.name = a.jobset AND buildstatus <> 0 AND a.isCurrent = 1 )" , "(SELECT COUNT(*) FROM Builds AS a NATURAL JOIN BuildResultInfo WHERE me.project = a.project AND me.name = a.jobset AND buildstatus <> 0 AND a.isCurrent = 1 )"
, "(SELECT COUNT(*) FROM Builds AS a NATURAL JOIN BuildResultInfo WHERE me.project = a.project AND me.name = a.jobset AND buildstatus = 0 AND a.isCurrent = 1 )" , "(SELECT COUNT(*) FROM Builds AS a NATURAL JOIN BuildResultInfo WHERE me.project = a.project AND me.name = a.jobset AND buildstatus = 0 AND a.isCurrent = 1 )"
, "(SELECT COUNT(*) FROM Builds AS a WHERE me.project = a.project AND me.name = a.jobset AND a.isCurrent = 1 )" , "(SELECT COUNT(*) FROM Builds AS a WHERE me.project = a.project AND me.name = a.jobset AND a.isCurrent = 1 )"
] ]
, "+as" => ["nrscheduled", "nrfailed", "nrsucceeded", "nrtotal"] , "+as" => ["nrscheduled", "nrfailed", "nrsucceeded", "nrtotal"]
}); });
} }
sub getViewResult { sub getViewResult {
my ($primaryBuild, $jobs) = @_; my ($primaryBuild, $jobs) = @_;
my @jobs = (); my @jobs = ();
my $status = 0; # = okay my $status = 0; # = okay
@ -218,11 +218,11 @@ sub getViewResult {
# might not be a evaluation record, so $ev may be undefined.) # might not be a evaluation record, so $ev may be undefined.)
my $ev = $primaryBuild->jobsetevalmembers->find({}, { rows => 1, order_by => "eval" }); my $ev = $primaryBuild->jobsetevalmembers->find({}, { rows => 1, order_by => "eval" });
$ev = $ev->eval if defined $ev; $ev = $ev->eval if defined $ev;
# The timestamp of the view result is the highest timestamp of all # The timestamp of the view result is the highest timestamp of all
# constitutent builds. # constitutent builds.
my $timestamp = 0; my $timestamp = 0;
foreach my $job (@{$jobs}) { foreach my $job (@{$jobs}) {
my $thisBuild = $job->isprimary my $thisBuild = $job->isprimary
? $primaryBuild ? $primaryBuild
@ -259,5 +259,5 @@ sub getLatestSuccessfulViewResult {
return undef; return undef;
} }
1; 1;