lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

Merge pull request #976 from ztzg/x-16304/deep-clone-inputs

Browse source 
GitInput: Include deepClone option in the cache key
This commit is contained in:
Graham Christensen 2021-06-28 15:38:38 -04:00 committed by GitHub
parent 04fdb8e6e6 df7dab1291
commit 6f9db20cd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/lib/Hydra/Plugin/GitInput.pm
View file

@ -182,7 +182,7 @@ sub fetchInput {
# TODO: Fix case where the branch is reset to a previous commit. # TODO: Fix case where the branch is reset to a previous commit.
my $cachedInput; my $cachedInput;
($cachedInput) = $self->{db}->resultset('CachedGitInputs')->search( ($cachedInput) = $self->{db}->resultset('CachedGitInputs')->search(
{uri => $uri, branch => $branch, revision => $revision}, {uri => $uri, branch => $branch, revision => $revision, isdeepclone => defined($deepClone) ? 1 : 0},
{rows => 1}); {rows => 1});
addTempRoot($cachedInput->storepath) if defined $cachedInput; addTempRoot($cachedInput->storepath) if defined $cachedInput;
@ -223,6 +223,7 @@ sub fetchInput {
{ uri => $uri { uri => $uri
, branch => $branch , branch => $branch
, revision => $revision , revision => $revision
, isdeepclone => defined($deepClone) ? 1 : 0
, sha256hash => $sha256 , sha256hash => $sha256
, storepath => $storePath , storepath => $storePath
}); });

15
src/lib/Hydra/Schema/CachedGitInputs.pm
View file

@ -50,6 +50,11 @@ __PACKAGE__->table("cachedgitinputs");
data_type: 'text' data_type: 'text'
is_nullable: 0 is_nullable: 0
=head2 isdeepclone
data_type: 'boolean'
is_nullable: 0
=head2 sha256hash =head2 sha256hash
data_type: 'text' data_type: 'text'
@ -69,6 +74,8 @@ __PACKAGE__->add_columns(
{ data_type => "text", is_nullable => 0 }, { data_type => "text", is_nullable => 0 },
"revision", "revision",
{ data_type => "text", is_nullable => 0 }, { data_type => "text", is_nullable => 0 },
"isdeepclone",
{ data_type => "boolean", is_nullable => 0 },
"sha256hash", "sha256hash",
{ data_type => "text", is_nullable => 0 }, { data_type => "text", is_nullable => 0 },
"storepath", "storepath",
@ -85,14 +92,16 @@ __PACKAGE__->add_columns(
=item * L</revision> =item * L</revision>
=item * L</isdeepclone>
=back =back
=cut =cut
__PACKAGE__->set_primary_key("uri", "branch", "revision"); __PACKAGE__->set_primary_key("uri", "branch", "revision", "isdeepclone");
# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36 # Created by DBIx::Class::Schema::Loader v0.07049 @ 2021-06-19 17:26:24
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:0sdK9uQZpx869oqS5thRLw # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Wr0grsFTaqRlMeM9vpXjrw
1; 1;

3
src/sql/hydra.sql
View file

@ -402,9 +402,10 @@ create table CachedGitInputs (
uri text not null, uri text not null,
branch text not null, branch text not null,
revision text not null, revision text not null,
isDeepClone boolean not null,
sha256hash text not null, sha256hash text not null,
storePath text not null, storePath text not null,
primary key (uri, branch, revision) primary key (uri, branch, revision, isDeepClone)
); );
create table CachedDarcsInputs ( create table CachedDarcsInputs (

12
src/sql/upgrade-76.sql Normal file
View file

@ -0,0 +1,12 @@
-- We don't know if existing checkouts are deep clones. This will
-- force a new fetch (and most likely trigger a new build for deep
-- clones, as the binary contents of '.git' are not deterministic).
DELETE FROM CachedGitInputs;
ALTER TABLE CachedGitInputs
ADD COLUMN isDeepClone BOOLEAN NOT NULL;
ALTER TABLE CachedGitInputs DROP CONSTRAINT cachedgitinputs_pkey;
ALTER TABLE CachedGitInputs ADD CONSTRAINT cachedgitinputs_pkey
PRIMARY KEY (uri, branch, revision, isDeepClone);