unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] v2writable: avoid spawning "git hash-object"
Date: Thu, 24 Jun 2021 08:41:56 +0000	[thread overview]
Message-ID: <20210624084156.24943-1-e@80x24.org> (raw)

We have git_sha() nowadays that's used everywhere, so avoid
process spawning overhead for "git hash-object".
---
 lib/PublicInbox/V2Writable.pm | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 689d27c8..4c1accbb 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -13,7 +13,7 @@ use PublicInbox::Eml;
 use PublicInbox::Git;
 use PublicInbox::Import;
 use PublicInbox::MID qw(mids references);
-use PublicInbox::ContentHash qw(content_hash content_digest);
+use PublicInbox::ContentHash qw(content_hash content_digest git_sha);
 use PublicInbox::InboxWritable;
 use PublicInbox::OverIdx;
 use PublicInbox::Msgmap;
@@ -447,23 +447,6 @@ sub purge {
 	$rewritten->{rewrites}
 }
 
-# returns the git object_id of $fh, does not write the object to FS
-sub git_hash_raw ($$) {
-	my ($self, $raw) = @_;
-	# grab the expected OID we have to reindex:
-	pipe(my($in, $w)) or die "pipe: $!";
-	my $git_dir = $self->git->{git_dir};
-	my $cmd = ['git', "--git-dir=$git_dir", qw(hash-object --stdin)];
-	my $r = popen_rd($cmd, undef, { 0 => $in });
-	print $w $$raw or die "print \$w: $!";
-	close $w or die "close \$w: $!";
-	local $/ = "\n";
-	chomp(my $oid = <$r>);
-	close $r or die "git hash-object failed: $?";
-	$oid =~ /\A$OID\z/ or die "OID not expected: $oid";
-	$oid;
-}
-
 sub _check_mids_match ($$$) {
 	my ($old_list, $new_list, $hdrs) = @_;
 	my %old_mids = map { $_ => 1 } @$old_list;
@@ -498,7 +481,7 @@ sub replace ($$$) {
 	PublicInbox::Import::drop_unwanted_headers($new_mime);
 
 	my $raw = $new_mime->as_string;
-	my $expect_oid = git_hash_raw($self, \$raw);
+	my $expect_oid = git_sha(1, \$raw)->hexdigest;
 	my $rewritten = _replace($self, $old_mime, $new_mime, \$raw) or return;
 	my $need_reindex = $rewritten->{need_reindex};
 

                 reply	other threads:[~2021-06-24  8:41 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20210624084156.24943-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.
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).