]> Sergey Matveev's repositories - public-inbox.git/commitdiff
v2writable: remove redundant remove from Over DB
authorEric Wong (Contractor, The Linux Foundation) <e@80x24.org>
Thu, 5 Apr 2018 10:03:20 +0000 (10:03 +0000)
committerEric Wong (Contractor, The Linux Foundation) <e@80x24.org>
Thu, 5 Apr 2018 10:27:13 +0000 (10:27 +0000)
The Xapian partitions will trigger the removal anyways.
Test this and fix some description/spelling errors
while we're at it.

lib/PublicInbox/V2Writable.pm
t/v2writable.t

index e0c8ac37916f629b6f028d8edfd8222d00086c23..832384601625fcbb5bca8cfa374e47d05d72d46b 100644 (file)
@@ -309,7 +309,6 @@ sub remove_internal {
                        foreach my $idx (@$parts) {
                                $idx->remote_remove($oid, $mid);
                        }
-                       $self->{over}->remove_oid($oid, $mid);
                }
                $self->barrier;
        }
index e49c06b98c0efde79faf596f22891bddc0cdc084..ab85e9af86f73a1501a225b2950e3c5015237d44 100644 (file)
@@ -218,7 +218,7 @@ EOF
        $im->done;
        my $tip = shift @after;
        like($tip, qr/\A[a-f0-9]+ test removal\n\z/s,
-               'commit message propaged to git');
+               'commit message propagated to git');
        is_deeply(\@after, \@before, 'only one commit written to git');
        is($ibx->mm->num_for($smsg->mid), undef, 'no longer in Msgmap by mid');
        like($smsg->num, qr/\A\d+\z/, 'numeric number in return message');
@@ -226,8 +226,10 @@ EOF
        my $srch = $ibx->search->reopen;
        my @found = ();
        $srch->each_smsg_by_mid($smsg->mid, sub { push @found, @_; 1 });
-       is(scalar(@found), 0, 'no longer found in Xapian skeleton');
+       is(scalar(@found), 0, 'no longer found in Xapian');
        my @log1 = qw(log -1 --pretty=raw --raw -r --no-abbrev --no-renames);
+       is($srch->{over_ro}->get_art($smsg->num), undef,
+               'removal propagated to Over DB');
 
        my $after = $git0->qx(@log1);
        if ($after =~ m!( [a-f0-9]+ )A\td$!m) {