user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] import: avoid needless git update-server-info
Date: Sat, 21 May 2016 10:55:32 +0000	[thread overview]
Message-ID: <20160521105532.16659-1-e@80x24.org> (raw)

We don't need to update-server-info (or read-tree) if fast
import was spawned for removals and no changes were made.
---
 lib/PublicInbox/Import.pm | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 1db2a0b..1afcf5d 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -51,6 +51,7 @@ sub gfi_start {
 	$self->{out} = $out_w;
 	$self->{lockfh} = $lockfh;
 	$self->{pid} = $pid;
+	$self->{nchg} = 0;
 	($in_r, $out_w);
 }
 
@@ -131,6 +132,7 @@ sub remove {
 		"data 3\nrm\n\n",
 		'from ', ($parent ? $parent : $tip), "\n" or wfail;
 	print $w "D $path\n\n" or wfail;
+	$self->{nchg}++;
 	(($self->{tip} = ":$commit"), $cur);
 }
 
@@ -191,6 +193,7 @@ sub add {
 		print $w 'from ', ($parent ? $parent : $tip), "\n" or wfail;
 	}
 	print $w "M 100644 :$blob $path\n\n" or wfail;
+	$self->{nchg}++;
 	$self->{tip} = ":$commit";
 }
 
@@ -202,14 +205,15 @@ sub done {
 	my $pid = delete $self->{pid} or die 'BUG: missing {pid} when done';
 	waitpid($pid, 0) == $pid or die 'fast-import did not finish';
 	$? == 0 or die "fast-import failed: $?";
+	my $nchg = delete $self->{nchg};
 
 	# for compatibility with existing ssoma installations
 	# we can probably remove this entirely by 2020
 	my $git_dir = $self->{git}->{git_dir};
-	my $index = "$git_dir/ssoma.index";
 	# XXX: change the following scope to: if (-e $index) # in 2018 or so..
 	my @cmd = ('git', "--git-dir=$git_dir");
-	unless ($ENV{FAST}) {
+	if ($nchg && !$ENV{FAST}) {
+		my $index = "$git_dir/ssoma.index";
 		my $env = { GIT_INDEX_FILE => $index };
 		my @rt = (@cmd, qw(read-tree -m -v -i), $self->{ref});
 		$pid = spawn(\@rt, $env, undef);
@@ -217,11 +221,13 @@ sub done {
 		waitpid($pid, 0) == $pid or die 'read-tree did not finish';
 		$? == 0 or die "failed to update $git_dir/ssoma.index: $?\n";
 	}
-
-	$pid = spawn([@cmd, 'update-server-info'], undef, undef);
-	defined $pid or die "spawn update-server-info failed: $!\n";
-	waitpid($pid, 0) == $pid or die 'update-server-info did not finish';
-	$? == 0 or die "failed to update-server-info: $?\n";
+	if ($nchg) {
+		$pid = spawn([@cmd, 'update-server-info'], undef, undef);
+		defined $pid or die "spawn update-server-info failed: $!\n";
+		waitpid($pid, 0) == $pid or
+			die 'update-server-info did not finish';
+		$? == 0 or die "failed to update-server-info: $?\n";
+	}
 
 	my $lockfh = delete $self->{lockfh} or die "BUG: not locked: $!";
 	flock($lockfh, LOCK_UN) or die "unlock failed: $!";

             reply	other threads:[~2016-05-21 10:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-21 10:55 Eric Wong [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-05-21 10:55 [PATCH] import: avoid needless git update-server-info Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160521105532.16659-1-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).