git-svn: Speed up fetch
We were spending a lot of time forking/execing git-cat-file and git-hash-object. We now maintain a global Git repository object in order to use Git.pm's more efficient hash_and_insert_object and cat_blob methods. Signed-off-by: Adam Roben <aroben@apple.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Adam Roben committed
May 23, 2008 at 16:19 UTC
ffe256f9bac8a40ff751a9341a5869d98f72c285
1 file changed
+20
-22
git-svn.perl
+20
-22
@@ -4,7 +4,7 @@
4
use warnings;
5
use strict;
6
use vars qw/ $AUTHOR $VERSION
7
- $sha1 $sha1_short $_revision
7
+ $sha1 $sha1_short $_revision $_repository
8
$_q $_authors %users/;
9
$AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
10
$VERSION = '@@GIT_VERSION@@';
@@ -220,6 +220,7 @@ unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) {
220
}
221
$ENV{GIT_DIR} = $git_dir;
222
}
223
+ $_repository = Git->repository(Repository => $ENV{GIT_DIR});
224
}
225
226
my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
@@ -301,6 +302,7 @@ sub do_git_init_db {
302
}
303
}
304
command_noisy(@init_db);
305
+ $_repository = Git->repository(Repository => ".git");
306
}
307
my $set;
308
my $pfx = "svn-remote.$Git::SVN::default_repo_id";
@@ -317,6 +319,7 @@ sub init_subdir {
319
mkpath([$repo_path]) unless -d $repo_path;
320
chdir $repo_path or die "Couldn't chdir to $repo_path: $!\n";
321
$ENV{GIT_DIR} = '.git';
322
+ $_repository = Git->repository(Repository => $ENV{GIT_DIR});
323
}
324
325
sub cmd_clone {
@@ -3017,6 +3020,7 @@ use vars qw/@ISA/;
3020
use strict;
3021
use warnings;
3022
use Carp qw/croak/;
3023
+use File::Temp qw/tempfile/;
3024
use IO::File qw//;
3025
3026
# file baton members: path, mode_a, mode_b, pool, fh, blob, base
@@ -3172,14 +3176,9 @@ sub apply_textdelta {
3176
my $base = IO::File->new_tmpfile;
3177
$base->autoflush(1);
3178
if ($fb->{blob}) {
3175
- defined (my $pid = fork) or croak $!;
3176
- if (!$pid) {
3177
- open STDOUT, '>&', $base or croak $!;
3178
- print STDOUT 'link ' if ($fb->{mode_a} == 120000);
3179
- exec qw/git-cat-file blob/, $fb->{blob} or croak $!;
3180
- }
3181
- waitpid $pid, 0;
3182
- croak $? if $?;
3179
+ print $base 'link ' if ($fb->{mode_a} == 120000);
3180
+ my $size = $::_repository->cat_blob($fb->{blob}, $base);
3181
+ die "Failed to read object $fb->{blob}" unless $size;
3182
3183
if (defined $exp) {
3184
seek $base, 0, 0 or croak $!;
@@ -3220,14 +3219,18 @@ sub close_file {
3219
sysseek($fh, 0, 0) or croak $!;
3220
}
3221
}
3223
- defined(my $pid = open my $out,'-|') or die "Can't fork: $!\n";
3224
- if (!$pid) {
3225
- open STDIN, '<&', $fh or croak $!;
3226
- exec qw/git-hash-object -w --stdin/ or croak $!;
3222
+
3223
+ my ($tmp_fh, $tmp_filename) = File::Temp::tempfile(UNLINK => 1);
3224
+ my $result;
3225
+ while ($result = sysread($fh, my $string, 1024)) {
3226
+ syswrite($tmp_fh, $string, $result);
3227
}
3228
- chomp($hash = do { local $/; <$out> });
3229
- close $out or croak $!;
3228
+ defined $result or croak $!;
3229
+ close $tmp_fh or croak $!;
3230
+
3231
close $fh or croak $!;
3232
+
3233
+ $hash = $::_repository->hash_and_insert_object($tmp_filename);
3234
$hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
3235
close $fb->{base} or croak $!;
3236
} else {
@@ -3553,13 +3556,8 @@ sub chg_file {
3556
} elsif ($m->{mode_a} =~ /^120/ && $m->{mode_b} !~ /^120/) {
3557
$self->change_file_prop($fbat,'svn:special',undef);
3558
}
3556
- defined(my $pid = fork) or croak $!;
3557
- if (!$pid) {
3558
- open STDOUT, '>&', $fh or croak $!;
3559
- exec qw/git-cat-file blob/, $m->{sha1_b} or croak $!;
3560
- }
3561
- waitpid $pid, 0;
3562
- croak $? if $?;
3559
+ my $size = $::_repository->cat_blob($m->{sha1_b}, $fh);
3560
+ croak "Failed to read object $m->{sha1_b}" unless $size;
3561
$fh->flush == 0 or croak $!;
3562
seek $fh, 0, 0 or croak $!;
3563