grahamc/hydra2 - Change 6BLUKEQ2M5RGWMPXPYIFIEVEUBV4PYAZ75S2WSBIATMRGYFMQZHQC

* Caching of "path" inputs, and fake a revision number for those.

Created by Eelco Dolstra on November 25, 2008

6BLUKEQ2M5RGWMPXPYIFIEVEUBV4PYAZ75S2WSBIATMRGYFMQZHQC

Dependencies

In channels

main

Change contents

Replacement in src/Hydra/lib/Hydra/Schema/Buildinputs.pm at line 39 [3.1]

B:BD[3.782] → [2.253:395]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:H8JAWhQt1ehZTEEPH2KGBw

[3.782]

[3.924]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 15:16:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Nv28F7I+7azffAhYPWYTvA

Replacement in src/Hydra/lib/Hydra/Schema/Buildproducts.pm at line 36 [4.4268]

B:BD[4.4922] → [2.396:538]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:EAo0rZSn+5Q5OY7Y1xjuyA

[4.4922]

[4.5064]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 15:16:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Fj95oLQNEptO9LgSfclVGQ

Replacement in src/Hydra/lib/Hydra/Schema/Buildresultinfo.pm at line 30 [5.1594]

B:BD[5.2382] → [2.539:681]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:5R03Kdy5ujkr7s9OfCNbTA

[5.2382]

[5.2524]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 15:16:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:CvVVHVHL2UEZ5XMkgf01OA

Replacement in src/Hydra/lib/Hydra/Schema/Builds.pm at line 73 [4.5202]

B:BD[4.6194] → [2.682:824]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:G1KBKGvEgnTcrgDkUnG1UQ

[4.6194]

[5.3377]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 15:16:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Ty4vMjEqpl6yM81PrOtjqA

Replacement in src/Hydra/lib/Hydra/Schema/Buildschedulinginfo.pm at line 26 [5.3773]

B:BD[5.4473] → [2.825:967]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:MkMR6pE6mrN2BQL18ROYfA

[5.4473]

[5.4615]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 15:16:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:81cloGb6HT/PTPgzB8v5Tg

Replacement in src/Hydra/lib/Hydra/Schema/Buildsteps.pm at line 38 [6.1675]

B:BD[6.2816] → [2.968:1110]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:JbawGso3rboFeQMX6XfgXQ

[6.2816]

[6.2958]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 15:16:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:cNgqL+ZLxQirdHUa/i6mww

Replacement in src/Hydra/lib/Hydra/Schema/Jobsetinputalts.pm at line 34 [7.825]

B:BD[7.1831] → [2.1111:1253]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7+oJOQegjLhp5JeuCS0KPw

[7.1831]

[7.1973]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 15:16:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:zZEUHrrOIOIg1JH0Pgi5xg

Replacement in src/Hydra/lib/Hydra/Schema/Jobsetinputs.pm at line 46 [8.590]

B:BD[8.1681] → [2.1254:1396]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:BCzeQkhJYieHoL4ppjdJvw

[8.1681]

[8.1823]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 15:16:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Uzlil1U0VlHnTe1tvaRO4A

Replacement in src/Hydra/lib/Hydra/Schema/Jobsets.pm at line 51 [8.1960]

B:BD[8.2992] → [2.1551:1693]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:kEcdBc9XKVhz6zO/XEkAxg

[8.2992]

[8.3134]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 15:16:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ednIpbErLs3gjqQd9w4KsA

Replacement in src/Hydra/lib/Hydra/Schema/Projects.pm at line 33 [8.3266]

B:BD[8.3685] → [2.1694:1836]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:rRYzLbd9BlZAQdOjT/GQcw

[8.3685]

[8.3827]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 15:16:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:OGLaq1Y/rLPlz+whXTZnzw

Replacement in src/Hydra/lib/Hydra/Schema.pm at line 11 [4.6376]

B:BD[4.6498] → [2.1837:1979]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 12:58:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:iYwU4nHj9C2HkHwpYlVygQ

[4.6498]

[4.6640]

# Created by DBIx::Class::Schema::Loader v0.04005 @ 2008-11-25 15:16:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:scYtOwO4xnXnKWlNGWyjcQ

Insertion in src/Hydra/programs/Scheduler.pl at line 7 [9.1319]
[2.1994]
[9.1392]
```
use POSIX qw(strftime);
```

Replacement in src/Hydra/programs/Scheduler.pl at line 48 [9.1319]

B:BD[10.2738] → [2.2175:2246]

∅:D[2.2246] → [8.6820:6956]

∅:D[10.2738] → [8.6820:6956]

∅:D[7.5346] → [8.6820:6956]

B:BD[8.6820] → [8.6820:6956]

B:BD[11.50] → [12.2187:2196]

        print "copying input ", $input->name, " from $uri\n";
        
        my $storePath = `nix-store --add "$uri"`
            or die "cannot copy path $uri to the Nix store";
        chomp $storePath;

[10.2738]

[12.2196]


        my $timestamp = time;
        my $sha256;
        my $storePath;
        # Some simple caching: don't check a path more than once every N seconds.
        (my $cachedInput) = $db->resultset('Cachedpathinputs')->search(
            {srcpath => $uri, lastseen => {">", $timestamp - 60}},
            {rows => 1, order_by => "lastseen DESC"});
        if (defined $cachedInput && isValidPath($cachedInput->storepath)) {
            print "CACHED $uri $cachedInput ", $cachedInput->timestamp, " ", $cachedInput->timestamp, "\n";
            $storePath = $cachedInput->storepath;
            $sha256 = $cachedInput->sha256hash;
            $timestamp = $cachedInput->timestamp;
        } else {
            print "copying input ", $input->name, " from $uri\n";
            $storePath = `nix-store --add "$uri"`
                or die "cannot copy path $uri to the Nix store";
            chomp $storePath;
            $sha256 = getStorePathHash $storePath;
            ($cachedInput) = $db->resultset('Cachedpathinputs')->search(
                {srcpath => $uri, sha256hash => $sha256});
            # Path inputs don't have a natural notion of a "revision",
            # so we simulate it by using the timestamp that we first
            # saw this path have this SHA-256 hash.  So if the
            # contents of the path changes, we get a new "revision",
            # but if it doesn't change (or changes back), we don't get
            # a new "revision".
            if (!defined $cachedInput) {
                $db->txn_do(sub {
                    $db->resultset('Cachedpathinputs')->create(
                        { srcpath => $uri
                        , timestamp => $timestamp
                        , lastseen => $timestamp
                        , sha256hash => $sha256
                        , storepath => $storePath
                        });
                });
            } else {
                $timestamp = $cachedInput->timestamp;
                $db->txn_do(sub {
                    $cachedInput->lastseen(time);
                    $cachedInput->update;
                });
            }
        }

Replacement in src/Hydra/programs/Scheduler.pl at line 104 [9.1319]

B:BD[12.2324] → [12.2324:2380]

            , sha256hash => getStorePathHash $storePath

[12.2324]

[12.2380]

            , sha256hash => $sha256
            , revision => strftime "%Y%m%d%H%M%S", gmtime($timestamp)

Replacement in src/Hydra/programs/Scheduler.pl at line 183 [9.1319]

B:BD[13.10742] → [13.10742:10844]

                #, revision => $input->{orig}->revision
                #, tag => $input->{orig}->tag

[13.10742]

[13.10844]

                , revision => $input->{revision}

Replacement in src/Hydra/programs/Scheduler.pl at line 231 [9.1319]
∅:D[2.3477] → [11.1838:1902]
B:BD[11.1838] → [11.1838:1902]
```
            fetchInput($input, $alt, $inputInfo); # !!! caching
```
[2.3477]
[2.3478]
```
            fetchInput($input, $alt, $inputInfo);
```

Replacement in src/Hydra/programs/Scheduler.pl at line 234 [9.1319]

B:BD[11.1995] → [2.3520:3627]

                push @newArgs, "--arg", $argName, "{path = " . $inputInfo->{$argName}->{storePath} . ";}";

[11.1995]

[11.2128]

                push @newArgs, "--arg", $argName,
                    "{path = " . $inputInfo->{$argName}->{storePath} . ";" .
                    " rev = \"" . $inputInfo->{$argName}->{revision} . "\";}";

Replacement in src/Hydra/root/build.tt at line 132 [4.7350]

B:BD[3.2245] → [14.1370:1442]

    <tr><th>Name</th><th>Type</th><th>What</th><th>Store path</th></tr>

[3.2245]

[3.2297]

    <tr><th>Name</th><th>Type</th><th>Value</th><th>Revision</th><th>Store path</th></tr>

Insertion in src/Hydra/root/build.tt at line 148 [4.7350]

[14.1767]

        <td>[% IF input.revision %][% input.revision %][% END %]</td>

Insertion in src/hydra.sql at line 227 [9.1]

[5.11357]

[8.5642]

);
-- Cache for inputs of type "path" (used for testing Hydra), storing
-- the SHA-256 hash and store path for each source path.  Also stores
-- the timestamp when we first saw the path have these contents, which
-- may be used to generate release names.
create table CachedPathInputs (
    srcPath       text not null,
    timestamp     integer not null, -- when we first saw this hash
    lastSeen      integer not null, -- when we last saw this hash
    sha256hash    text not null,
    storePath     text not null,
    primary key   (srcPath, sha256hash)