git-svn: avoid redundant get_log calls between invocations
Prefill .rev_db to the maximum revision we tried to fetch; and take advantage of that so we can avoid using get_log() on ranges we've already seen (and have deemed uninteresting). Signed-off-by: Eric Wong <normalperson@yhbt.net>
Eric Wong committed
Jan 31, 2007 at 17:22 UTC
9c93fee51e26d5db82414317fa169294f3fa94b0
1 file changed
+23
-7
git-svn.perl
+23
-7
@@ -655,18 +655,14 @@ sub fetch_all {
655
my $ra = Git::SVN::Ra->new($url);
656
my $head = $ra->get_latest_revnum;
657
my $base = $head;
658
- my $new_remote;
658
foreach my $p (sort keys %$fetch) {
659
my $gs = Git::SVN->new($fetch->{$p}, $repo_id, $p);
661
- my $lr = $gs->last_rev;
660
+ my $lr = $gs->rev_db_max;
661
if (defined $lr) {
662
$base = $lr if ($lr < $base);
664
- } else {
665
- $new_remote = 1;
663
}
664
push @gs, $gs;
665
}
669
- $base = 0 if $new_remote;
666
return if (++$base > $head);
667
$ra->gs_fetch_loop_common($base, $head, @gs);
668
}
@@ -899,13 +895,17 @@ sub last_rev_commit {
895
$rl = readline $fh;
896
defined $rl or return (undef, undef);
897
chomp $rl;
902
- while ($c ne $rl && tell $fh != 0) {
898
+ while (('0' x40) eq $rl && tell $fh != 0) {
899
$offset -= 41;
900
seek $fh, $offset, 2;
901
$rl = readline $fh;
902
defined $rl or return (undef, undef);
903
chomp $rl;
904
}
905
+ if ($c) {
906
+ die "$self->{db_path} and ", $self->refname,
907
+ " inconsistent!:\n$c != $rl\n";
908
+ }
909
my $rev = tell $fh;
910
croak $! if ($rev < 0);
911
$rev = ($rev - 41) / 41;
@@ -917,7 +917,7 @@ sub last_rev_commit {
917
sub get_fetch_range {
918
my ($self, $min, $max) = @_;
919
$max ||= $self->ra->get_latest_revnum;
920
- $min ||= $self->last_rev || 0;
920
+ $min ||= $self->rev_db_max;
921
(++$min, $max);
922
}
923
@@ -1404,6 +1404,16 @@ sub rev_db_set {
1404
}
1405
}
1406
1407
+sub rev_db_max {
1408
+ my ($self) = @_;
1409
+ my @stat = stat $self->{db_path} or
1410
+ die "Couldn't stat $self->{db_path}: $!\n";
1411
+ ($stat[7] % 41) == 0 or
1412
+ die "$self->{db_path} inconsistent size:$stat[7]\n";
1413
+ my $max = $stat[7] / 41;
1414
+ (($max > 0) ? $max - 1 : 0);
1415
+}
1416
+
1417
sub rev_db_get {
1418
my ($self, $rev) = @_;
1419
my $ret;
@@ -2404,6 +2414,12 @@ sub gs_fetch_loop_common {
2414
}
2415
}
2416
}
2417
+ # pre-fill the .rev_db since it'll eventually get filled in
2418
+ # with '0' x40 if something new gets committed
2419
+ foreach my $gs (@gs) {
2420
+ next if defined $gs->rev_db_get($max);
2421
+ $gs->rev_db_set($max, 0 x40);
2422
+ }
2423
last if $max >= $head;
2424
$min = $max + 1;
2425
$max += $inc;