download-from-binary-cache.pl: Fix race condition

Fixes the error "DBD::SQLite::db do failed: column url is not unique".
This commit is contained in:
Eelco Dolstra 2013-06-05 16:17:06 +02:00
parent f0576d6775
commit 75e12b8e66

View file

@ -265,11 +265,12 @@ sub getAvailableCaches {
elsif ($1 eq "Priority") { $priority = int($2); } elsif ($1 eq "Priority") { $priority = int($2); }
} }
$dbh->do("insert into BinaryCaches(url, timestamp, storeDir, wantMassQuery, priority) values (?, ?, ?, ?, ?)", $dbh->do("insert or replace into BinaryCaches(url, timestamp, storeDir, wantMassQuery, priority) values (?, ?, ?, ?, ?)",
{}, $url, time(), $storeDir, $wantMassQuery, $priority); {}, $url, time(), $storeDir, $wantMassQuery, $priority);
my $id = $dbh->last_insert_id("", "", "", ""); $queryCache->execute($url);
$res = $queryCache->fetchrow_hashref() or die;
next if $storeDir ne $Nix::Config::storeDir; next if $storeDir ne $Nix::Config::storeDir;
push @caches, { id => $id, url => $url, wantMassQuery => $wantMassQuery, priority => $priority }; push @caches, { id => $res->{id}, url => $url, wantMassQuery => $wantMassQuery, priority => $priority };
} }
@caches = sort { $a->{priority} <=> $b->{priority} } @caches; @caches = sort { $a->{priority} <=> $b->{priority} } @caches;