grahamc/hydra2 - Change TNIHMBCRFZO4FPMVYCQGPVFHRRYMXF24FPIUX2Q6SSHPDZYOEJ5QC

Jobset.pm: Factor out build->eval mapping.

We now have a searchBuildsAndEvalsForJobset, which creates such a mapping for us, so we don't need to duplicate code in jobs_tab and channels_tab.

Also, we're going to use this for the overview of a particular channel as well, so it makes sense to put it in CatalystUtils instead of directly in Jobset.pm.

Instead of eval->jobs, it's now eval->builds, because it's really an aggregate over the builds schema, rather than the job schema.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

Created by aszlig on April 26, 2015

TNIHMBCRFZO4FPMVYCQGPVFHRRYMXF24FPIUX2Q6SSHPDZYOEJ5QC

Dependencies

In channels

main

Change contents

Deletion in src/lib/Hydra/Controller/Jobset.pm at line 110 [8.104]

∅:D[6.50] → [7.433:553]

B:BD[7.433] → [7.433:553]


    my @evals = $c->stash->{jobset}->jobsetevals->search({ hasnewbuilds => 1}, { order_by => "id desc", rows => 20 });

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 111 [8.104]

B:BD[7.554] → [7.554:610]

    my $evals = {};
    my %jobs;
    my $nrBuilds = 0;

[7.554]

[7.610]

    my ($evals, $builds) = searchBuildsAndEvalsForJobset(
        $c->stash->{jobset},
        { job => { ilike => $filter }, ischannel => 0 },
        10000
    );

Deletion in src/lib/Hydra/Controller/Jobset.pm at line 117 [8.104]

B:BD[7.611] → [7.611:687]

B:BD[7.687] → [5.0:61]

∅:D[5.61] → [7.756:826]

∅:D[6.96] → [7.756:826]

B:BD[7.756] → [7.756:826]

B:BD[7.826] → [9.198:281]

B:BD[9.281] → [3.0:119]

∅:D[3.119] → [9.328:524]

∅:D[10.192] → [9.328:524]

B:BD[9.328] → [9.328:524]

∅:D[9.524] → [11.1858:1864]

∅:D[7.1096] → [11.1858:1864]

∅:D[12.1915] → [11.1858:1864]

∅:D[13.2291] → [11.1858:1864]

B:BD[11.1858] → [11.1858:1864]

B:BD[11.1864] → [7.1097:1098]

    foreach my $eval (@evals) {
        my @builds = $eval->builds->search(
            { job => { ilike => $filter }, ischannel => 0 },
            { columns => ['id', 'job', 'finished', 'buildstatus'] });
        foreach my $b (@builds) {
            my $jobName = $b->get_column('job');
            $evals->{$eval->id}->{timestamp} = $eval->timestamp;
            $evals->{$eval->id}->{jobs}->{$jobName} =
                { id => $b->id, finished => $b->finished, buildstatus => $b->buildstatus };
            $jobs{$jobName} = 1;
            $nrBuilds++;
        }
        last if $nrBuilds >= 10000;
    }

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 120 [8.104]

B:BD[9.660] → [9.660:784]

            next if defined $jobs{$job->name};
            $c->stash->{inactiveJobs}->{$job->name} = $jobs{$job->name} = 1;

[9.660]

[9.784]

            next if defined $builds->{$job->name};
            $c->stash->{inactiveJobs}->{$job->name} = $builds->{$job->name} = 1;

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 126 [8.104]
B:BD[7.1131] → [14.0:34]
```
    my @jobs = sort (keys %jobs);
```
[7.1131]
[14.34]
```
    my @jobs = sort (keys %$builds);
```
Deletion in src/lib/Hydra/Controller/Jobset.pm at line 133 [8.104]
B:BD[15.4] → [15.4:59]
```
# XXX: Pretty much a rip-off of jobs-tab, make it DRY!
```

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 137 [8.104]

B:BD[15.216] → [15.216:350]

    my @evals = $c->stash->{jobset}->jobsetevals->search(
        { hasnewbuilds => 1},
        { order_by => "id desc", rows => 20 }

[15.216]

[15.350]

    my ($evals, $builds) = searchBuildsAndEvalsForJobset(
        $c->stash->{jobset},
        { ischannel => 1 }

Deletion in src/lib/Hydra/Controller/Jobset.pm at line 141 [8.104]
B:BD[15.357] → [15.357:396]
```
    my $evals = {};
    my %channels;
```

Deletion in src/lib/Hydra/Controller/Jobset.pm at line 142 [8.104]

B:BD[15.397] → [15.397:473]

B:BD[15.473] → [4.0:100]

∅:D[4.100] → [15.680:1089]

B:BD[15.680] → [15.680:1089]

    foreach my $eval (@evals) {
        my @builds = $eval->builds->search(
            { ischannel => 1 },
            { columns => ['id', 'job', 'finished', 'buildstatus'] }
        );
        foreach my $b (@builds) {
            my $jobName = $b->get_column('job');
            $evals->{$eval->id}->{timestamp} = $eval->timestamp;
            $evals->{$eval->id}->{channels}->{$jobName} = {
                id => $b->id,
                finished => $b->finished,
                buildstatus => $b->buildstatus
            };
            $channels{$jobName} = 1;
        }
    }

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 143 [8.104]
B:BD[15.1122] → [15.1122:1164]
```
    my @channels = sort (keys %channels);
```
[15.1122]
[15.1164]
```
    my @channels = sort (keys %$builds);
```
Insertion in src/lib/Hydra/Helper/CatalystUtils.pm at line 13 [17.3469]
[16.70]
[2.331]
```
    searchBuildsAndEvalsForJobset
```

Insertion in src/lib/Hydra/Helper/CatalystUtils.pm at line 87 [17.3469]

[18.1112]

[19.369]


sub searchBuildsAndEvalsForJobset {
    my ($jobset, $condition, $maxBuilds) = @_;
    my @evals = $jobset->jobsetevals->search(
        { hasnewbuilds => 1},
        { order_by => "id desc",
        rows => 20
    });
    my $evals = {};
    my %builds;
    my $nrBuilds = 0;

Insertion in src/lib/Hydra/Helper/CatalystUtils.pm at line 102 [17.3469]

[19.370]

[20.2562]

    foreach my $eval (@evals) {
        my @allBuilds = $eval->builds->search(
            $condition,
            { columns => ['id', 'job', 'finished', 'buildstatus'] }
        );

Insertion in src/lib/Hydra/Helper/CatalystUtils.pm at line 108 [17.3469]

[20.2563]

[17.3710]

        foreach my $b (@allBuilds) {
            my $jobName = $b->get_column('job');
            $evals->{$eval->id}->{timestamp} = $eval->timestamp;
            $evals->{$eval->id}->{builds}->{$jobName} = {
                id => $b->id,
                finished => $b->finished,
                buildstatus => $b->buildstatus
            };
            $builds{$jobName} = 1;
            $nrBuilds++;
        }
        last if $maxBuilds && $nrBuilds >= $maxBuilds;
    }
    return ($evals, \%builds);
}

Replacement in src/root/jobset-channels-tab.tt at line 27 [15.1207]

B:BD[15.2024] → [15.2024:2196]

            <td>[% r = evals.$eval.channels.$chan; IF r.id %]<a href="[% c.uri_for('/build' r.id) %]">[% INCLUDE renderBuildStatusIcon size=16 build=r %]</a>[% END %]</td>

[15.2024]

[15.2196]

            <td>[% r = evals.$eval.builds.$chan; IF r.id %]<a href="[% c.uri_for('/build' r.id) %]">[% INCLUDE renderBuildStatusIcon size=16 build=r %]</a>[% END %]</td>

Replacement in src/root/jobset-jobs-tab.tt at line 62 [12.2227]

B:BD[6.2526] → [3.725:890]

            <td>[% r = evals.$eval.jobs.$j; IF r.id %]<a href="[% c.uri_for('/build' r.id) %]">[% INCLUDE renderBuildStatusIcon size=16 build=r %]</a>[% END %]</td>

[6.2526]

[6.2686]

            <td>[% r = evals.$eval.builds.$j; IF r.id %]<a href="[% c.uri_for('/build' r.id) %]">[% INCLUDE renderBuildStatusIcon size=16 build=r %]</a>[% END %]</td>