git-svn: use separate, per-repository .rev_db files
We need a separate .rev_db file for each repository we're tracking. This allows us to track the same logical path off multiple mirrors. We preserve a symlink to the old .rev_db (no-UUID) if we're (auto-)migrating from an old version to preserve backwards compatibility. Also, get rid of the uuid() wrapper since we cache UUID in our private config, and the SVN::Ra::get_uuid() function memoizes the return value per-connection. Signed-off-by: Eric Wong <normalperson@yhbt.net>
Eric Wong committed
Feb 12, 2007 at 13:25 UTC
26a62d57a27407132d48e91b3c8f455a5fb22e4b
2 files changed
+134
-50
git-svn.perl
+123
-50
@@ -736,7 +736,7 @@ sub fetch_all {
736
my $url = $remote->{url};
737
my (@gs, @globs);
738
my $ra = Git::SVN::Ra->new($url);
739
- my $uuid = $ra->uuid;
739
+ my $uuid = $ra->get_uuid;
740
my $head = $ra->get_latest_revnum;
741
my $base = $head;
742
@@ -937,7 +937,8 @@ sub new {
937
$self->{url} = command_oneline('config', '--get',
938
"svn-remote.$repo_id.url") or
939
die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
940
- if (-z $self->{db_path} && ::verify_ref($self->refname.'^0')) {
940
+ if ((-z $self->db_path || ! -e $self->db_path) &&
941
+ ::verify_ref($self->refname.'^0')) {
942
$self->rebuild;
943
}
944
$self;
@@ -945,18 +946,36 @@ sub new {
946
947
sub refname { "refs/remotes/$_[0]->{ref_id}" }
948
948
-sub set_svm_vars {
949
- my ($self, $ra) = @_;
950
- my $section = "svn-remote.$self->{repo_id}";
949
+sub svm_uuid {
950
+ my ($self) = @_;
951
+ return $self->{svm}->{uuid} if $self->svm;
952
+ $self->ra;
953
+ unless ($self->{svm}) {
954
+ die "SVM UUID not cached, and reading remotely failed\n";
955
+ }
956
+ $self->{svm}->{uuid};
957
+}
958
959
+sub svm {
960
+ my ($self) = @_;
961
+ return $self->{svm} if $self->{svm};
962
+ my $svm;
963
# see if we have it in our config, first:
964
eval {
954
- $self->{svm} = {
965
+ my $section = "svn-remote.$self->{repo_id}";
966
+ $svm = {
967
source => tmp_config('--get', "$section.svm-source"),
968
uuid => tmp_config('--get', "$section.svm-uuid"),
969
}
970
};
959
- return $ra if ($self->{svm}->{source} && $self->{svm}->{uuid});
971
+ $self->{svm} = $svm if ($svm && $svm->{source} && $svm->{uuid});
972
+ $self->{svm};
973
+}
974
+
975
+sub _set_svm_vars {
976
+ my ($self, $ra) = @_;
977
+
978
+ return $ra if ($self->svm);
979
980
# nope, make sure we're connected to the repository root:
981
if ($ra->{repos_root} ne $self->{url}) {
@@ -965,6 +984,8 @@ sub set_svm_vars {
984
my $r = $ra->get_latest_revnum;
985
my ($props) = ($ra->get_dir('', $r))[2];
986
if (my $src = $props->{'svm:source'}) {
987
+ my $section = "svn-remote.$self->{repo_id}";
988
+
989
# don't know what a '!' is there for, also the
990
# username is of no interest
991
$src =~ s{!$}{};
@@ -984,6 +1005,24 @@ sub set_svm_vars {
1005
$ra;
1006
}
1007
1008
+# this allows us to memoize our SVN::Ra UUID locally and avoid a
1009
+# remote lookup (useful for 'git svn log').
1010
+sub ra_uuid {
1011
+ my ($self) = @_;
1012
+ unless ($self->{ra_uuid}) {
1013
+ my $key = "svn-remote.$self->{repo_id}.uuid";
1014
+ my $uuid = eval { tmp_config('--get', $key) };
1015
+ if (!$@ && $uuid && $uuid =~ /^([a-f\d\-]{30,})$/) {
1016
+ $self->{ra_uuid} = $uuid;
1017
+ } else {
1018
+ die "ra_uuid called without URL\n" unless $self->{url};
1019
+ $self->{ra_uuid} = $self->ra->get_uuid;
1020
+ tmp_config('--add', $key, $self->{ra_uuid});
1021
+ }
1022
+ }
1023
+ $self->{ra_uuid};
1024
+}
1025
+
1026
sub ra {
1027
my ($self) = shift;
1028
my $ra = Git::SVN::Ra->new($self->{url});
@@ -992,7 +1031,7 @@ sub ra {
1031
die "Can't have both 'noMetadata' and ",
1032
"'useSvmProps' options set!\n";
1033
}
995
- $ra = $self->set_svm_vars($ra);
1034
+ $ra = $self->_set_svm_vars($ra);
1035
$self->{-want_revprops} = 1;
1036
}
1037
$ra;
@@ -1048,10 +1087,14 @@ sub last_rev_commit {
1087
return ($rev, $c);
1088
}
1089
}
1090
+ my $db_path = $self->db_path;
1091
+ unless (-e $db_path) {
1092
+ ($self->{last_rev}, $self->{last_commit}) = (undef, undef);
1093
+ return (undef, undef);
1094
+ }
1095
my $offset = -41; # from tail
1096
my $rl;
1053
- open my $fh, '<', $self->{db_path} or
1054
- croak "$self->{db_path} not readable: $!\n";
1097
+ open my $fh, '<', $db_path or croak "$db_path not readable: $!\n";
1098
sysseek($fh, $offset, 2); # don't care for errors
1099
sysread($fh, $rl, 41) == 41 or return (undef, undef);
1100
chomp $rl;
@@ -1062,7 +1105,7 @@ sub last_rev_commit {
1105
chomp $rl;
1106
}
1107
if ($c && $c ne $rl) {
1065
- die "$self->{db_path} and ", $self->refname,
1108
+ die "$db_path and ", $self->refname,
1109
" inconsistent!:\n$c != $rl\n";
1110
}
1111
my $rev = sysseek($fh, 0, 1) or croak $!;
@@ -1187,7 +1230,7 @@ sub do_git_commit {
1230
}
1231
my $author = $log_entry->{author};
1232
my ($name, $email) = (defined $::users{$author} ? @{$::users{$author}}
1190
- : ($author, "$author\@".$self->ra->uuid));
1233
+ : ($author, "$author\@".$self->ra->get_uuid));
1234
$ENV{GIT_AUTHOR_NAME} = $ENV{GIT_COMMITTER_NAME} = $name;
1235
$ENV{GIT_AUTHOR_EMAIL} = $ENV{GIT_COMMITTER_EMAIL} = $email;
1236
$ENV{GIT_AUTHOR_DATE} = $ENV{GIT_COMMITTER_DATE} = $log_entry->{date};
@@ -1227,6 +1270,8 @@ sub do_git_commit {
1270
print "r$log_entry->{revision}";
1271
if (defined $log_entry->{svm_revision}) {
1272
print " (\@$log_entry->{svm_revision})";
1273
+ $self->rev_db_set($log_entry->{svm_revision}, $commit,
1274
+ 0, $self->svm_uuid);
1275
}
1276
print " = $commit ($self->{ref_id})\n";
1277
if (defined $_repack && (--$_repack_nr == 0)) {
@@ -1492,7 +1537,7 @@ sub make_log_entry {
1537
$log_entry{svm_revision} = $r;
1538
} else {
1539
$log_entry{metadata} = $self->full_url . "\@$rev " .
1495
- $self->ra->uuid;
1540
+ $self->ra->get_uuid;
1541
}
1542
\%log_entry;
1543
}
@@ -1531,7 +1576,16 @@ sub set_tree {
1576
1577
sub rebuild {
1578
my ($self) = @_;
1534
- print "Rebuilding $self->{db_path} ...\n";
1579
+ my $db_path = $self->db_path;
1580
+ if (-f $self->{db_root}) {
1581
+ rename $self->{db_root}, $db_path or die
1582
+ "rename $self->{db_root} => $db_path failed: $!\n";
1583
+ my ($dir, $base) = ($db_path =~ m#^(.*?)/?([^/]+)$#);
1584
+ symlink $base, $self->{db_root} or die
1585
+ "symlink $base => $self->{db_root} failed: $!\n";
1586
+ return;
1587
+ }
1588
+ print "Rebuilding $db_path ...\n";
1589
my ($rev_list, $ctx) = command_output_pipe("rev-list", $self->refname);
1590
my $latest;
1591
my $full_url = $self->full_url;
@@ -1558,7 +1612,7 @@ sub rebuild {
1612
print "r$rev = $c\n";
1613
}
1614
command_close_pipe($rev_list, $ctx);
1561
- print "Done rebuilding $self->{db_path}\n";
1615
+ print "Done rebuilding $db_path\n";
1616
}
1617
1618
# rev_db:
@@ -1574,42 +1628,59 @@ sub rebuild {
1628
# And yes, it's still pretty fast (faster than Tie::File).
1629
# These files are disposable unless noMetadata or useSvmProps is set
1630
1631
+sub _rev_db_set {
1632
+ my ($fh, $rev, $commit) = @_;
1633
+ my $offset = $rev * 41;
1634
+ # assume that append is the common case:
1635
+ seek $fh, 0, 2 or croak $!;
1636
+ my $pos = tell $fh;
1637
+ if ($pos < $offset) {
1638
+ for (1 .. (($offset - $pos) / 41)) {
1639
+ print $fh (('0' x 40),"\n") or croak $!;
1640
+ }
1641
+ }
1642
+ seek $fh, $offset, 0 or croak $!;
1643
+ print $fh $commit,"\n" or croak $!;
1644
+}
1645
+
1646
+sub mkfile {
1647
+ my ($path) = @_;
1648
+ unless (-e $path) {
1649
+ my ($dir, $base) = ($path =~ m#^(.*?)/?([^/]+)$#);
1650
+ mkpath([$dir]) unless -d $dir;
1651
+ open my $fh, '>>', $path or die "Couldn't create $path: $!\n";
1652
+ close $fh or die "Couldn't close (create) $path: $!\n";
1653
+ }
1654
+}
1655
+
1656
sub rev_db_set {
1578
- my ($self, $rev, $commit, $update_ref) = @_;
1579
- length $commit == 40 or croak "arg3 must be a full SHA1 hexsum\n";
1580
- my ($db, $db_lock) = ($self->{db_path}, "$self->{db_path}.lock");
1657
+ my ($self, $rev, $commit, $update_ref, $uuid) = @_;
1658
+ length $commit == 40 or die "arg3 must be a full SHA1 hexsum\n";
1659
+ my $db = $self->db_path($uuid);
1660
+ my $db_lock = "$db.lock";
1661
my $sig;
1662
if ($update_ref) {
1663
$SIG{INT} = $SIG{HUP} = $SIG{TERM} = $SIG{ALRM} = $SIG{PIPE} =
1664
$SIG{USR1} = $SIG{USR2} = sub { $sig = $_[0] };
1665
}
1666
+ mkfile($db);
1667
+
1668
$LOCKFILES{$db_lock} = 1;
1669
my $sync;
1588
-
1670
# both of these options make our .rev_db file very, very important
1671
# and we can't afford to lose it because rebuild() won't work
1672
if ($self->use_svm_props || $self->no_metadata) {
1673
$sync = 1;
1674
copy($db, $db_lock) or die "rev_db_set(@_): ",
1594
- "Failed to copy: ",
1675
+ "Failed to copy: ",
1676
"$db => $db_lock ($!)\n";
1677
} else {
1678
rename $db, $db_lock or die "rev_db_set(@_): ",
1598
- "Failed to rename: ",
1679
+ "Failed to rename: ",
1680
"$db => $db_lock ($!)\n";
1681
}
1601
- open my $fh, '+<', $db_lock or croak $!;
1602
- my $offset = $rev * 41;
1603
- # assume that append is the common case:
1604
- seek $fh, 0, 2 or croak $!;
1605
- my $pos = tell $fh;
1606
- if ($pos < $offset) {
1607
- for (1 .. (($offset - $pos) / 41)) {
1608
- print $fh (('0' x 40),"\n") or croak $!;
1609
- }
1610
- }
1611
- seek $fh, $offset, 0 or croak $!;
1612
- print $fh $commit,"\n" or croak $!;
1682
+ open my $fh, '+<', $db_lock or die "Couldn't open $db_lock: $!\n";
1683
+ _rev_db_set($fh, $rev, $commit);
1684
if ($sync) {
1685
$fh->flush or die "Couldn't flush $db_lock: $!\n";
1686
$fh->sync or die "Couldn't sync $db_lock: $!\n";
@@ -1631,19 +1702,20 @@ sub rev_db_set {
1702
1703
sub rev_db_max {
1704
my ($self) = @_;
1634
- my @stat = stat $self->{db_path} or
1635
- die "Couldn't stat $self->{db_path}: $!\n";
1636
- ($stat[7] % 41) == 0 or
1637
- die "$self->{db_path} inconsistent size:$stat[7]\n";
1705
+ my $db_path = $self->db_path;
1706
+ my @stat = stat $db_path or return 0;
1707
+ ($stat[7] % 41) == 0 or die "$db_path inconsistent size: $stat[7]\n";
1708
my $max = $stat[7] / 41;
1709
(($max > 0) ? $max - 1 : 0);
1710
}
1711
1712
sub rev_db_get {
1643
- my ($self, $rev) = @_;
1713
+ my ($self, $rev, $uuid) = @_;
1714
my $ret;
1715
my $offset = $rev * 41;
1646
- open my $fh, '<', $self->{db_path} or croak $!;
1716
+ my $db_path = $self->db_path($uuid);
1717
+ return undef unless -e $db_path;
1718
+ open my $fh, '<', $db_path or croak $!;
1719
if (sysseek($fh, $offset, 0) == $offset) {
1720
my $read = sysread($fh, $ret, 40);
1721
$ret = undef if ($read != 40 || $ret eq ('0'x40));
@@ -1676,13 +1748,16 @@ sub _new {
1748
my $dir = "$ENV{GIT_DIR}/svn/$ref_id";
1749
$_[3] = $path = '' unless (defined $path);
1750
mkpath([$dir]);
1679
- unless (-f "$dir/.rev_db") {
1680
- open my $fh, '>>', "$dir/.rev_db" or croak $!;
1681
- close $fh or croak $!;
1682
- }
1683
- bless { ref_id => $ref_id, dir => $dir, index => "$dir/index",
1751
+ bless {
1752
+ ref_id => $ref_id, dir => $dir, index => "$dir/index",
1753
path => $path, config => "$ENV{GIT_DIR}/svn/config",
1685
- db_path => "$dir/.rev_db", repo_id => $repo_id }, $class;
1754
+ db_root => "$dir/.rev_db", repo_id => $repo_id }, $class;
1755
+}
1756
+
1757
+sub db_path {
1758
+ my ($self, $uuid) = @_;
1759
+ $uuid ||= $self->ra_uuid;
1760
+ "$self->{db_root}.$uuid";
1761
}
1762
1763
sub uri_encode {
@@ -2519,11 +2594,6 @@ sub get_commit_editor {
2594
$self->SUPER::get_commit_editor($log, $cb, @lock, $pool);
2595
}
2596
2522
-sub uuid {
2523
- my ($self) = @_;
2524
- $self->{uuid} ||= $self->get_uuid;
2525
-}
2526
-
2597
sub gs_do_update {
2598
my ($self, $rev_a, $rev_b, $gs, $editor) = @_;
2599
my $new = ($rev_a == $rev_b);
@@ -3140,6 +3210,9 @@ package Git::SVN::Migration;
3210
# - info/url may remain for backwards compatibility
3211
# - this is what we migrate up to this layout automatically,
3212
# - this will be used by git svn init on single branches
3213
+# v3.1 layout (auto migrated):
3214
+# - .rev_db => .rev_db.$UUID, .rev_db will remain as a symlink
3215
+# for backwards compatibility
3216
#
3217
# v4 layout: .git/svn/$repo_id/$id, refs/remotes/$repo_id/$id
3218
# - this is only created for newly multi-init-ed
t/t9107-git-svn-migrate.sh
+11
@@ -96,5 +96,16 @@ test_expect_success 'migrate --minimize on old multi-inited layout' "
96
grep '^:refs/remotes/git-svn' fetch.out
97
"
98
99
+test_expect_success ".rev_db auto-converted to .rev_db.UUID" "
100
+ git-svn fetch -i trunk &&
101
+ expect=$GIT_DIR/svn/trunk/.rev_db.* &&
102
+ test -n \"\$expect\" &&
103
+ mv \$expect $GIT_DIR/svn/trunk/.rev_db &&
104
+ git-svn fetch -i trunk &&
105
+ test -L $GIT_DIR/svn/trunk/.rev_db &&
106
+ test -f \$expect &&
107
+ cmp \$expect $GIT_DIR/svn/trunk/.rev_db
108
+ "
109
+
110
test_done
111