grahamc/hydra - Change TJK27WSBFOM6LKVCSA7LTTCWUGB4O2AL22PNIDQXS4BFOFCISH2QC

Open the DB using Hydra::Model::DB->new

This gets rid of the openHydraDB function and ensures that we open the database in a consistent way.

Also drop the PostgreSQL sequence hacks. They don't seem to be necessary anymore.

Created by Eelco Dolstra on March 13, 2012

TJK27WSBFOM6LKVCSA7LTTCWUGB4O2AL22PNIDQXS4BFOFCISH2QC

Dependencies

In channels

main

upstream

Change contents

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 9 [7.2663]
[6.143]
[7.2735]
```
use Hydra::Model::DB;
```
Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 26 [7.2663]
B:BD[8.46] → [8.46:81]
```
    return getHydraPath . "/scm" ;
```
[8.46]
[9.111]
```
    return Hydra::Model::DB::getHydraPath . "/scm" ;
```
Insertion in src/lib/Hydra/Helper/Nix.pm at line 8 [12.436]
[10.34]
[11.127]
```
use Hydra::Model::DB;
```

Replacement in src/lib/Hydra/Helper/Nix.pm at line 12 [12.436]

B:BD[13.619] → [4.2431:2508]

    getHydraPath getHydraHome getHydraDBPath openHydraDB getHydraConf txn_do

[13.619]

[14.665]

    getHydraHome getHydraConf txn_do

Deletion in src/lib/Hydra/Helper/Nix.pm at line 19 [12.436]
B:BD[11.302] → [11.302:321]
B:BD[11.321] → [15.30:84]
B:BD[15.84] → [16.65:141]
∅:D[17.129] → [11.503:520]
∅:D[16.141] → [11.503:520]
∅:D[15.153] → [11.503:520]
B:BD[11.503] → [11.503:520]
B:BD[11.520] → [16.142:145]
B:BD[16.145] → [4.2509:2510]
```
sub getHydraPath {
    my $dir = $ENV{"HYDRA_DATA"} || "/var/lib/hydra";
    die "The HYDRA_DATA directory ($dir) does not exist!\n" unless -d $dir;
    return $dir;
}
```

Replacement in src/lib/Hydra/Helper/Nix.pm at line 26 [12.436]

B:BD[16.164] → [18.560:631]

    my $conf = $ENV{"HYDRA_CONFIG"} || (getHydraPath . "/hydra.conf");

[16.164]

[18.631]

    my $conf = $ENV{"HYDRA_CONFIG"} || (Hydra::Model::DB::getHydraPath . "/hydra.conf");

Deletion in src/lib/Hydra/Helper/Nix.pm at line 32 [12.436]

B:BD[11.524] → [11.524:545]

B:BD[11.545] → [19.0:32]

B:BD[19.32] → [3.0:25]

∅:D[3.25] → [19.53:252]

B:BD[19.53] → [19.53:252]

∅:D[19.252] → [12.673:677]

∅:D[11.690] → [12.673:677]

B:BD[12.673] → [12.673:677]

B:BD[12.677] → [11.691:774]

B:BD[11.774] → [2.0:98]

∅:D[2.98] → [11.830:846]

B:BD[11.830] → [11.830:846]

B:BD[11.846] → [20.49:53]

sub getHydraDBPath {
    my $db = $ENV{"HYDRA_DBI"};
    if ( defined $db ) {
      return $db ;
    }
    else {
        my $path = getHydraPath . '/hydra.sqlite';
        die "The Hydra database ($path) not exist!\n" unless -f $path;
        return "dbi:SQLite:$path";
    }
}
sub openHydraDB {
    my $db = Hydra::Schema->connect(getHydraDBPath, "", "", {});
    $db->storage->dbh->do("PRAGMA synchronous = OFF;")
        if defined $ENV{'HYDRA_NO_FSYNC'};
    return $db;
}

Replacement in src/lib/Hydra/Model/DB.pm at line 5 [21.2694]

B:BD[21.2784] → [11.854:878]

use Hydra::Helper::Nix;

[21.2784]


sub getHydraPath {
    my $dir = $ENV{"HYDRA_DATA"} || "/var/lib/hydra";
    die "The HYDRA_DATA directory ($dir) does not exist!\n" unless -d $dir;
    return $dir;
}
sub getHydraDBPath {
    my $db = $ENV{"HYDRA_DBI"};
    return $db if defined $db;
    my $path = getHydraPath . '/hydra.sqlite';
    die "The Hydra database ($path) not exist!\n" unless -f $path;
    return "dbi:SQLite:$path";
}

Deletion in src/lib/Hydra/Schema/BuildInputs.pm at line 158 [23.1]
∅:D[22.83] → [23.781:782]
∅:D[24.206] → [23.781:782]
∅:D[25.266] → [23.781:782]
∅:D[26.291] → [23.781:782]
∅:D[27.317] → [23.781:782]
∅:D[28.498] → [23.781:782]
∅:D[29.1112] → [23.781:782]
∅:D[30.1467] → [23.781:782]
∅:D[31.2318] → [23.781:782]
∅:D[32.2938] → [23.781:782]
∅:D[33.6488] → [23.781:782]
B:BD[23.781] → [23.781:782]
B:BD[23.782] → [31.2319:2343]
∅:D[34.142] → [23.924:925]
∅:D[35.142] → [23.924:925]
∅:D[36.142] → [23.924:925]
∅:D[37.142] → [23.924:925]
∅:D[38.142] → [23.924:925]
∅:D[39.142] → [23.924:925]
∅:D[40.142] → [23.924:925]
∅:D[41.142] → [23.924:925]
∅:D[42.142] → [23.924:925]
∅:D[43.142] → [23.924:925]
∅:D[44.142] → [23.924:925]
∅:D[45.203] → [23.924:925]
∅:D[46.205] → [23.924:925]
∅:D[47.222] → [23.924:925]
∅:D[48.231] → [23.924:925]
∅:D[49.241] → [23.924:925]
∅:D[50.289] → [23.924:925]
∅:D[51.308] → [23.924:925]
∅:D[52.321] → [23.924:925]
∅:D[53.325] → [23.924:925]
∅:D[54.395] → [23.924:925]
∅:D[55.437] → [23.924:925]
∅:D[56.507] → [23.924:925]
∅:D[57.537] → [23.924:925]
∅:D[58.555] → [23.924:925]
∅:D[59.571] → [23.924:925]
∅:D[60.629] → [23.924:925]
∅:D[61.729] → [23.924:925]
∅:D[62.825] → [23.924:925]
∅:D[63.843] → [23.924:925]
∅:D[64.852] → [23.924:925]
∅:D[65.867] → [23.924:925]
∅:D[66.875] → [23.924:925]
∅:D[67.1143] → [23.924:925]
∅:D[68.1473] → [23.924:925]
∅:D[69.1540] → [23.924:925]
∅:D[70.1643] → [23.924:925]
∅:D[71.2117] → [23.924:925]
∅:D[31.2343] → [23.924:925]
∅:D[72.3193] → [23.924:925]
B:BD[23.924] → [23.924:925]
B:BD[23.925] → [73.0:136]
∅:D[74.97] → [23.925:926]
∅:D[73.136] → [23.925:926]
∅:D[70.1740] → [23.925:926]
B:BD[23.925] → [23.925:926]
B:BD[23.926] → [73.137:151]
```
use Hydra::Helper::Nix;
sub addSequence {
  my $hydradbi = getHydraDBPath ;
  if ($hydradbi =~ m/^dbi:Pg/) {
    __PACKAGE__->sequence('builds_id_seq');
  }
} 
addSequence ;
```
Deletion in src/lib/Hydra/Schema/BuildInputs.pm at line 159 [23.1]
∅:D[73.152] → [67.1144:1234]
B:BD[23.926] → [67.1144:1234]
```
# You can replace this text with custom content, and it will be preserved on regeneration
```
Deletion in src/lib/Hydra/Schema/Builds.pm at line 434 [21.5202]
∅:D[75.928] → [76.1324:1325]
∅:D[77.5178] → [76.1324:1325]
∅:D[5.6862] → [76.1324:1325]
∅:D[29.11112] → [76.1324:1325]
B:BD[76.1324] → [76.1324:1325]
∅:D[76.1325] → [78.63:87]
B:BD[78.63] → [78.63:87]
```
use Hydra::Helper::Nix;
```
Deletion in src/lib/Hydra/Schema/Builds.pm at line 457 [21.5202]
B:BD[79.2196] → [73.153:171]
B:BD[73.171] → [80.880:1004]
∅:D[73.290] → [22.165:167]
∅:D[80.1004] → [22.165:167]
B:BD[22.165] → [22.165:167]
∅:D[22.167] → [79.2196:2197]
B:BD[79.2196] → [79.2196:2197]
```
sub addSequence {
    my $hydradbi = getHydraDBPath;
    if ($hydradbi =~ m/^dbi:Pg/) {
        __PACKAGE__->sequence('builds_id_seq');
    }
}
```
Deletion in src/lib/Hydra/Schema/Builds.pm at line 520 [21.5202]
B:BD[73.292] → [73.292:305]
∅:D[73.305] → [67.3770:3771]
∅:D[79.3031] → [67.3770:3771]
B:BD[67.3770] → [67.3770:3771]
```
addSequence;
```
Deletion in src/lib/Hydra/Schema/JobsetEvals.pm at line 147 [81.65]
∅:D[76.4616] → [81.1130:1131]
∅:D[29.18496] → [81.1130:1131]
B:BD[81.1130] → [81.1130:1131]
B:BD[81.1131] → [76.4617:4788]
```
use Hydra::Helper::Nix;
# !!! Ugly, should be generated.
my $hydradbi = getHydraDBPath;
if ($hydradbi =~ m/^dbi:Pg/) {
    __PACKAGE__->sequence('jobsetevals_id_seq');
}
```

Deletion in src/lib/Hydra/Schema/NewsItems.pm at line 88 [82.2337]

∅:D[29.23241] → [82.3942:4112]

B:BD[82.3942] → [82.3942:4112]


use Hydra::Helper::Nix;
# !!! Ugly, should be generated.
my $hydradbi = getHydraDBPath;
if ($hydradbi =~ m/^dbi:Pg/) {
    __PACKAGE__->sequence('newsitems_id_seq');
}

Insertion in src/script/hydra-build at line 9 [59.2912]
[11.1070]
[83.0]
```
use Hydra::Model::DB;
```
Replacement in src/script/hydra-build at line 25 [59.2912]
B:BD[84.155] → [11.1071:1093]
```
my $db = openHydraDB;
```
[84.155]
[85.22]
```
my $db = Hydra::Model::DB->new();
```
Insertion in src/script/hydra-evaluator at line 8 [86.1319]
[7.10946]
[81.2013]
```
use Hydra::Model::DB;
```
Deletion in src/script/hydra-evaluator at line 10 [86.1319]
∅:D[81.2045] → [87.47:48]
B:BD[38.1597] → [87.47:48]
Replacement in src/script/hydra-evaluator at line 20 [86.1319]
B:BD[84.915] → [11.1771:1793]
```
my $db = openHydraDB;
```
[84.915]
[16.382]
```
my $db = Hydra::Model::DB->new();
```
Insertion in src/script/hydra-init at line 6 [4.2638]
[4.2737]
[4.2737]
```
use Hydra::Model::DB;
```
Replacement in src/script/hydra-init at line 11 [4.2638]
B:BD[4.2804] → [4.2804:2826]
```
my $db = openHydraDB;
```
[4.2804]
[4.2826]
```
my $db = Hydra::Model::DB->new();
```
Insertion in src/script/hydra-queue-runner at line 9 [59.7823]
[11.1139]
[88.0]
```
use Hydra::Model::DB;
```

Replacement in src/script/hydra-queue-runner at line 13 [59.7823]

B:BD[59.7879] → [11.1140:1189]

chdir getHydraPath or die;
my $db = openHydraDB;

[59.7879]

[84.265]

chdir Hydra::Model::DB::getHydraPath or die;
my $db = Hydra::Model::DB->new();

Insertion in src/script/hydra-update-gc-roots at line 9 [89.472]
[89.607]
[90.0]
```
use Hydra::Model::DB;
```
Replacement in src/script/hydra-update-gc-roots at line 12 [89.472]
B:BD[89.608] → [89.608:630]
```
my $db = openHydraDB;
```
[89.608]
[89.741]
```
my $db = Hydra::Model::DB->new();
```

Replacement in src/script/hydra-update-gc-roots at line 79 [89.472]

B:BD[91.112] → [91.112:206]

        if ($jobset->enabled == 0 && (time() - $jobset->lastcheckedtime > (7 * 24 * 3600))) {

[91.112]

[91.206]

        if ($jobset->enabled == 0 && (time() - ($jobset->lastcheckedtime || 0) > (7 * 24 * 3600))) {

Open the DB using Hydra::Model::DB->new

Dependencies

In channels

Change contents

Insertion in src/lib/Hydra/Helper/AddBuilds.pm at line 9 [7.2663]

Replacement in src/lib/Hydra/Helper/AddBuilds.pm at line 26 [7.2663]

Insertion in src/lib/Hydra/Helper/Nix.pm at line 8 [12.436]

Replacement in src/lib/Hydra/Helper/Nix.pm at line 12 [12.436]

Deletion in src/lib/Hydra/Helper/Nix.pm at line 19 [12.436]

Replacement in src/lib/Hydra/Helper/Nix.pm at line 26 [12.436]

Deletion in src/lib/Hydra/Helper/Nix.pm at line 32 [12.436]

Replacement in src/lib/Hydra/Model/DB.pm at line 5 [21.2694]

Deletion in src/lib/Hydra/Schema/BuildInputs.pm at line 158 [23.1]

Deletion in src/lib/Hydra/Schema/BuildInputs.pm at line 159 [23.1]

Deletion in src/lib/Hydra/Schema/Builds.pm at line 434 [21.5202]

Deletion in src/lib/Hydra/Schema/Builds.pm at line 457 [21.5202]

Deletion in src/lib/Hydra/Schema/Builds.pm at line 520 [21.5202]

Deletion in src/lib/Hydra/Schema/JobsetEvals.pm at line 147 [81.65]

Deletion in src/lib/Hydra/Schema/NewsItems.pm at line 88 [82.2337]

Insertion in src/script/hydra-build at line 9 [59.2912]

Replacement in src/script/hydra-build at line 25 [59.2912]

Insertion in src/script/hydra-evaluator at line 8 [86.1319]

Deletion in src/script/hydra-evaluator at line 10 [86.1319]

Replacement in src/script/hydra-evaluator at line 20 [86.1319]

Insertion in src/script/hydra-init at line 6 [4.2638]

Replacement in src/script/hydra-init at line 11 [4.2638]

Insertion in src/script/hydra-queue-runner at line 9 [59.7823]

Replacement in src/script/hydra-queue-runner at line 13 [59.7823]

Insertion in src/script/hydra-update-gc-roots at line 9 [89.472]

Replacement in src/script/hydra-update-gc-roots at line 12 [89.472]

Replacement in src/script/hydra-update-gc-roots at line 79 [89.472]