vndb/manned
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Normalize package info tables + change browsing URLs

Browse source 
This splits the 'package' table into 'packages' and 'package_versions',
which should improve performance in some cases and simplify some future
queries.

Previously it wasn't very well defined whether packages were uniquely
identified by (system, name) or by (system, category, name). This is now
normalized to the latter form. This required changes to the package URLs
to include the category.
This commit is contained in:
Yorhel 2016-10-02 20:07:57 +02:00
parent 26aefaebcd
commit 03d278e4ff
7 changed files with 180 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

21
util/freebsd.sh
View file

@ -52,8 +52,7 @@ check_pkg() { # <sysid> <base-url> <category> <filename> <name> <version>
return
fi
PKGID=`echo "INSERT INTO package (system, category, name, version, released) VALUES(:'sysid',:'cat',:'name',:'ver',:'rel') RETURNING id"\
| $PSQL -v "sysid=$SYSID" -v "cat=$CAT" -v "name=$NAME" -v "ver=$VER" -v "rel=$DATE"`
add_pkginfo $SYSID $CAT $NAME $VER $DATE
add_tar "$TMP/$FN" $PKGID
rm -f "$TMP/$FN"
}
@ -84,8 +83,8 @@ check_pkgdir() { # <sysid> <url>
echo "== Error fetching package index for /$CAT/"
continue
fi
perl -l - "$TMP/pkgnames" "$TMP/pkglist" $SYSID <<'EOP' >"$TMP/newpkgs"
($names, $list, $sysid) = @ARGV;
perl -l - "$TMP/pkgnames" "$TMP/pkglist" $SYSID $CAT <<'EOP' >"$TMP/newpkgs"
($names, $list, $sysid, $cat) = @ARGV;
use DBI;
$db = DBI->connect('dbi:Pg:dbname=manned', 'manned', '', {RaiseError => 1});
@ -103,7 +102,9 @@ check_pkgdir() { # <sysid> <url>
if(!$n || !$names{$n} || !$v) {
warn "== Unknown package: $c\n";
} else {
print "$c $n $v" if !$db->selectrow_arrayref(q{SELECT 1 FROM package WHERE system = ? AND name = ? AND version = ?}, {}, $sysid, $n, $v);
print "$c $n $v" if !$db->selectrow_arrayref(q{
SELECT 1 FROM packages p JOIN package_versions pv ON pv.package = p.id
WHERE p.system = ? AND p.category = ? AND p.name = ? AND pv.version = ?}, {}, $sysid, $cat, $n, $v);
}
}
close F;
@ -720,15 +721,7 @@ f9_1() {
}
f9_2() {
MIR="http://ftp.dk.freebsd.org/pub/FreeBSD/releases/i386/9.2-RELEASE/"
echo "============ $MIR"
check_dist 86 "$MIR/base.txz" "core-base" "2013-09-27"
check_dist 86 "$MIR/games.txz" "core-games" "2013-09-27"
check_pkgdir 86 "$MIR/packages"
}
f9_3() {
MIR="http://ftp.dk.freebsd.org/pub/FreeBSD/releases/i386/9.2-RELEASE/"
MIR="http://ftp-archive.freebsd.org/mirror/FreeBSD-Archive/old-releases/i386/9.2-RELEASE/"
echo "============ $MIR"
check_dist 86 "$MIR/base.txz" "core-base" "2013-09-27"
check_dist 86 "$MIR/games.txz" "core-games" "2013-09-27"