v2: avoid redundant/repeated configs for git partition repos

[public-inbox.git] / lib / PublicInbox / V2Writable.pm

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 6d7382780b6607acae8818d2ec2d399f944707ec..461432ea3ffbe695c3fe02f2a5e11b564408cd0f 100644 (file)
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -62,18 +62,19 @@ sub add {
        # leaking FDs to it...
        $self->idx_init;
 
-       my $num = num_for($self, $mime);
+       my $mid0;
+       my $num = num_for($self, $mime, \$mid0);
        defined $num or return; # duplicate
+       defined $mid0 or die "BUG: $mid0 undefined\n";
        my $im = $self->importer;
        my $cmt = $im->add($mime);
        $cmt = $im->get_mark($cmt);
-       my $oid = $im->{last_object_id};
-       my ($len, $msgref) = @{$im->{last_object}};
+       my ($oid, $len, $msgref) = @{$im->{last_object}};
 
        my $nparts = $self->{partitions};
        my $part = $num % $nparts;
        my $idx = $self->idx_part($part);
-       $idx->index_raw($len, $msgref, $num, $oid);
+       $idx->index_raw($len, $msgref, $num, $oid, $mid0);
        my $n = $self->{transact_bytes} += $len;
        if ($n > (PublicInbox::SearchIdx::BATCH_BYTES * $nparts)) {
                $self->checkpoint;
@@ -83,12 +84,15 @@ sub add {
 }
 
 sub num_for {
-       my ($self, $mime) = @_;
+       my ($self, $mime, $mid0) = @_;
        my $mids = mids($mime->header_obj);
        if (@$mids) {
                my $mid = $mids->[0];
                my $num = $self->{skel}->{mm}->mid_insert($mid);
-               return $num if defined($num); # common case
+               if (defined $num) { # common case
+                       $$mid0 = $mid;
+                       return $num;
+               };
 
                # crap, Message-ID is already known, hope somebody just resent:
                $self->done; # write barrier, clears $self->{skel}
@@ -111,38 +115,39 @@ sub num_for {
                        $num = $self->{skel}->{mm}->mid_insert($m);
                        if (defined $num) {
                                warn "alternative <$m> for <$mid> found\n";
+                               $$mid0 = $m;
                                return $num;
                        }
                }
        }
        # none of the existing Message-IDs are good, generate a new one:
-       num_for_harder($self, $mime);
+       num_for_harder($self, $mime, $mid0);
 }
 
 sub num_for_harder {
-       my ($self, $mime) = @_;
+       my ($self, $mime, $mid0) = @_;
 
        my $hdr = $mime->header_obj;
        my $dig = content_digest($mime);
-       my $mid = $dig->clone->hexdigest . '@localhost';
-       my $num = $self->{skel}->{mm}->mid_insert($mid);
+       $$mid0 = $dig->clone->hexdigest . '@localhost';
+       my $num = $self->{skel}->{mm}->mid_insert($$mid0);
        unless (defined $num) {
                # it's hard to spoof the last Received: header
                my @recvd = $hdr->header_raw('Received');
                $dig->add("Received: $_") foreach (@recvd);
-               $mid = $dig->clone->hexdigest . '@localhost';
-               $num = $self->{skel}->{mm}->mid_insert($mid);
+               $$mid0 = $dig->clone->hexdigest . '@localhost';
+               $num = $self->{skel}->{mm}->mid_insert($$mid0);
 
                # fall back to a random Message-ID and give up determinism:
                until (defined($num)) {
                        $dig->add(rand);
-                       $mid = $dig->clone->hexdigest . '@localhost';
-                       warn "using random Message-ID <$mid> as fallback\n";
-                       $num = $self->{skel}->{mm}->mid_insert($mid);
+                       $$mid0 = $dig->clone->hexdigest . '@localhost';
+                       warn "using random Message-ID <$$mid0> as fallback\n";
+                       $num = $self->{skel}->{mm}->mid_insert($$mid0);
                }
        }
        my @cur = $hdr->header_raw('Message-Id');
-       $hdr->header_set('Message-Id', @cur, "<$mid>");
+       $hdr->header_set('Message-Id', "<$$mid0>", @cur);
        $num;
 }
 
@@ -239,16 +244,20 @@ sub git_init {
        die "$git_dir exists\n" if -e $git_dir;
        my @cmd = (qw(git init --bare -q), $git_dir);
        PublicInbox::Import::run_die(\@cmd);
-       @cmd = (qw/git config/, "--file=$git_dir/config",
-                       'repack.writeBitmaps', 'true');
-       PublicInbox::Import::run_die(\@cmd);
 
        my $all = "$self->{-inbox}->{mainrepo}/all.git";
        unless (-d $all) {
                @cmd = (qw(git init --bare -q), $all);
                PublicInbox::Import::run_die(\@cmd);
+               @cmd = (qw/git config/, "--file=$all/config",
+                               'repack.writeBitmaps', 'true');
+               PublicInbox::Import::run_die(\@cmd);
        }
 
+       @cmd = (qw/git config/, "--file=$git_dir/config",
+                       'include.path', '../../all.git/config');
+       PublicInbox::Import::run_die(\@cmd);
+
        my $alt = "$all/objects/info/alternates";
        my $new_obj_dir = "../../git/$new.git/objects";
        my %alts;
@@ -312,7 +321,7 @@ sub import_init {
        my ($self, $git, $packed_bytes) = @_;
        my $im = PublicInbox::Import->new($git, undef, undef, $self->{-inbox});
        $im->{bytes_added} = int($packed_bytes / $PACKING_FACTOR);
-       $im->{want_object_id} = 1;
+       $im->{want_object_info} = 1;
        $im->{ssoma_lock} = 0;
        $im->{path_type} = 'v2';
        $self->{im} = $im;