grahamc/hydra - Change R6B5CAFF3BWJPW6I5YGKXOKKCW6S7D7AHO2HLZVFUW3NL77ZW44QC

Let Builds.timestamp refer to the time the build was added

Previously, for scheduled builds, "timestamp" contained the time the build was added to the queue, while for finished builds, it was the time the build finished. Now it's always the former.

Created by Eelco Dolstra on May 23, 2013

R6B5CAFF3BWJPW6I5YGKXOKKCW6S7D7AHO2HLZVFUW3NL77ZW44QC

Dependencies

In channels

upstream

main

Change contents

Replacement in src/lib/Hydra/Base/Controller/ListBuilds.pm at line 69 [11.1]
B:BD[9.141] → [10.312:351]
```
        { order_by => "timestamp DESC"
```
[9.141]
[12.0]
```
        { order_by => "stoptime DESC"
```

Replacement in src/lib/Hydra/Base/Controller/ListBuilds.pm at line 100 [11.1]

B:BD[10.403] → [13.0:96]

        {finished => 1, buildstatus => 0}, {order_by => ["isCurrent DESC", "timestamp DESC"]});

[10.403]

[14.282]

        {finished => 1, buildstatus => 0}, {order_by => ["id DESC"]});

Replacement in src/lib/Hydra/Base/Controller/ListBuilds.pm at line 115 [11.1]

B:BD[10.544] → [13.97:212]

        {finished => 1, buildstatus => 0, system => $system}, {order_by => ["isCurrent DESC", "timestamp DESC"]});

[10.544]

[14.918]

        {finished => 1, buildstatus => 0, system => $system}, {order_by => ["id DESC"]});

Replacement in src/lib/Hydra/Controller/API.pm at line 93 [16.24]

∅:D[15.1178] → [10.1144:1251]

B:BD[16.2216] → [10.1144:1251]

    my @latest = $c->model('DB::Builds')->search($filter, {rows => $nr, order_by => ["timestamp DESC"] });

[15.1178]

[15.1179]

    my @latest = $c->model('DB::Builds')->search($filter, {rows => $nr, order_by => ["id DESC"] });

Replacement in src/lib/Hydra/Controller/API.pm at line 145 [16.24]

B:BD[16.3740] → [17.0:139]

    my @builds = $c->model('DB::Builds')->search({finished => 0}, {rows => $nr, order_by => ["busy DESC", "priority DESC", "timestamp"]});

[16.3740]

[15.1356]

    my @builds = $c->model('DB::Builds')->search({finished => 0}, {rows => $nr, order_by => ["busy DESC", "priority DESC", "id"]});

Replacement in src/lib/Hydra/Controller/Admin.pm at line 37 [20.1]

B:BD[18.117] → [19.0:144]

    $c->model('DB::Builds')->search({finished => 0, iscurrent => 0, busy => 0})->update({ finished => 1, buildstatus => 4, timestamp => time});

[18.117]

[5.0]

    my $time = time();
    $c->model('DB::Builds')->search({finished => 0, iscurrent => 0, busy => 0})->update({ finished => 1, buildstatus => 4, starttime => $time, stoptime => $time });

Replacement in src/lib/Hydra/Controller/Build.pm at line 219 [21.1]

B:BD[21.3293] → [2.0:73]

    $c->response->headers->last_modified($c->stash->{build}->timestamp);

[21.3293]

[22.774]

    $c->response->headers->last_modified($c->stash->{build}->stoptime);

Insertion in src/lib/Hydra/Controller/Build.pm at line 426 [21.1]
[23.954]
[3.0]
```
        my $time = time();
```

Replacement in src/lib/Hydra/Controller/Build.pm at line 428 [21.1]

B:BD[3.24] → [3.24:82]

            { finished => 1, busy => 0, timestamp => time

[3.24]

[3.82]

            { finished => 1, busy => 0

Insertion in src/lib/Hydra/Controller/Build.pm at line 430 [21.1]

[3.147]

[23.1202]

            , starttime => $time
            , stoptime => $time

Replacement in src/lib/Hydra/Controller/Job.pm at line 28 [24.46]

∅:D[15.1889] → [13.1794:1887]

B:BD[13.1794] → [13.1794:1887]

            { order_by => 'timestamp DESC', rows => 10, columns => [@buildListColumns] }) ];

[15.1889]

[25.328]

            { order_by => 'id DESC', rows => 10, columns => [@buildListColumns] }) ];

Replacement in src/lib/Hydra/Controller/Job.pm at line 34 [24.46]

B:BD[13.1992] → [13.1992:2049]

            , order_by => ["priority DESC", "timestamp"]

[13.1992]

[17.1813]

            , order_by => ["priority DESC", "id"]

Replacement in src/lib/Hydra/Controller/Root.pm at line 46 [27.804]

B:BD[26.200] → [12.362:546]

        {finished => 0}, { join => ['project'], order_by => ["priority DESC", "timestamp"], columns => [@buildListColumns], '+select' => ['project.enabled'], '+as' => ['enabled'] })];

[26.200]

[6.197]

        {finished => 0}, { join => ['project'], order_by => ["priority DESC", "id"], columns => [@buildListColumns], '+select' => ['project.enabled'], '+as' => ['enabled'] })];

Deletion in src/lib/Hydra/Helper/AddBuilds.pm at line 1042 [28.2663]
B:BD[13.4744] → [13.4744:4776]
```
            , timestamp => time
```

Replacement in src/lib/Hydra/Helper/CatalystUtils.pm at line 31 [21.3469]

B:BD[12.634] → [12.634:800]

Readonly our @buildListColumns => ('id', 'finished', 'timestamp', 'project', 'jobset', 'job', 'nixname', 'system', 'priority', 'busy', 'buildstatus', 'releasename');

[12.634]

[21.3595]

Readonly our @buildListColumns => ('id', 'finished', 'timestamp', 'stoptime', 'project', 'jobset', 'job', 'nixname', 'system', 'priority', 'busy', 'buildstatus', 'releasename');

Replacement in src/lib/Hydra/Helper/Nix.pm at line 103 [30.436]
B:BD[29.660] → [10.5187:5226]
```
        { order_by => "timestamp DESC"
```
[29.660]
[29.847]
```
        { order_by => "id DESC"
```
Replacement in src/lib/Hydra/Helper/Nix.pm at line 156 [30.436]
∅:D[10.5272] → [31.197:248]
B:BD[31.197] → [31.197:248]
```
        , order_by => ["buildstatus", "timestamp"]
```
[10.5272]
[31.248]
```
        , order_by => ["buildstatus", "id"]
```

Replacement in src/root/all.tt at line 7 [32.1038]

B:BD[32.1128] → [33.11269:11432]

<p>Showing builds [% (page - 1) * resultsPerPage + 1 %] - [% (page - 1) * resultsPerPage + builds.size %] out of [% total %] in order of descending timestamp.</p>

[32.1107]

[32.1297]

<p>Showing builds [% (page - 1) * resultsPerPage + 1 %] - [% (page - 1) * resultsPerPage + builds.size %] out of [% total %] in order of descending finish time.</p>

Replacement in src/root/build.tt at line 153 [27.7350]

B:BD[4.128] → [4.128:329]

                     INCLUDE renderDuration duration = actualBuild.stoptime - actualBuild.starttime %]; finished at [% INCLUDE renderDateTime timestamp = actualBuild.stoptime
                  %]</td>

[4.128]

[4.329]

                     INCLUDE renderDuration duration = actualBuild.stoptime - actualBuild.starttime %];
                     finished at [% INCLUDE renderDateTime timestamp = actualBuild.stoptime %]</td>

Replacement in src/root/build.tt at line 300 [27.7350]
B:BD[34.9539] → [34.9539:9568]
```
        <th>Time added:</th>
```
[34.9539]
[34.9568]
```
        <th>Queued:</th>
```

Replacement in src/root/build.tt at line 303 [27.7350]

B:BD[34.9654] → [34.9654:9710]

      [% IF build.finished && build.buildstatus != 4 %]

[34.9654]

[34.9710]

      [% IF build.finished && !build.iscachedbuild %]

Replacement in src/root/build.tt at line 306 [27.7350]

B:BD[34.9757] → [34.9757:9899]

          <td>[% IF build.starttime %][% INCLUDE renderDateTime timestamp = build.starttime %][% ELSE %]<em>(cached build)</em>[% END %]</td>

[34.9757]

[34.9899]

          <td>[% INCLUDE renderDateTime timestamp = build.starttime %]</td>

Replacement in src/root/build.tt at line 310 [27.7350]

B:BD[34.9961] → [34.9961:10101]

          <td>[% IF build.stoptime %][% INCLUDE renderDateTime timestamp = build.stoptime %][% ELSE %]<em>(cached build)</em>[% END %]</td>

[34.9961]

[34.10101]

          <td>[% INCLUDE renderDateTime timestamp = build.stoptime %]</td>

Replacement in src/root/common.tt at line 83 [35.2803]

B:BD[26.1032] → [26.1032:1059]

        <th>Timestamp</th>

[26.1032]

[36.1425]

        <th>[% IF showSchedulingInfo %]Queued at[% ELSE %]Finished at[% END %]</th>

Replacement in src/root/common.tt at line 116 [35.2803]

B:BD[37.2648] → [37.2648:2719]

      <td>[% date.format(build.timestamp, '%Y-%m-%d %H:%M:%S') %]</td>

[37.2648]

[37.2719]

      <td>[% date.format(showSchedulingInfo ? build.timestamp : build.stoptime, '%Y-%m-%d %H:%M:%S') %]</td>

Deletion in src/script/hydra-build at line 57 [38.2912]

B:BD[8.855] → [8.855:923]

                , timestamp => time # !!! Why change the timestamp?

Deletion in src/script/hydra-build at line 309 [38.2912]
B:BD[10.10827] → [10.10827:10891]
```
            , timestamp => time # !!! Why change the timestamp?
```

Replacement in src/script/hydra-queue-runner at line 103 [38.7823]

∅:D[7.494] → [17.7208:7291]

B:BD[39.703] → [17.7208:7291]

                { join => ['project'], order_by => ["priority DESC", "timestamp"],

[7.494]

[40.1248]

                { join => ['project'], order_by => ["priority DESC", "id"],

Replacement in src/sql/hydra.sql at line 125 [42.1]

∅:D[15.37614] → [41.9050:9139]

B:BD[41.9050] → [41.9050:9139]

    timestamp     integer not null, -- time this build was scheduled / finished building

[15.37614]

[43.4219]

    timestamp     integer not null, -- time this build was added

Replacement in src/sql/hydra.sql at line 161 [42.1]

∅:D[15.37616] → [44.2515:2570]

B:BD[44.2515] → [44.2515:2570]

B:BD[44.2570] → [10.11082:11109]

    startTime     integer, -- if busy, time we started
    stopTime      integer,

[15.37616]

[41.9861]

    startTime     integer, -- if busy/finished, time we started
    stopTime      integer, -- if finished, time we finished