From 79c5fdeacf75a2daeb57a7a5f00a170044e28634 Mon Sep 17 00:00:00 2001 From: "Eric Wong (Contractor, The Linux Foundation)" Date: Thu, 5 Apr 2018 10:03:20 +0000 Subject: [PATCH] v2writable: remove redundant remove from Over DB 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 | 1 - t/v2writable.t | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm index e0c8ac37..83238460 100644 --- a/lib/PublicInbox/V2Writable.pm +++ b/lib/PublicInbox/V2Writable.pm @@ -309,7 +309,6 @@ sub remove_internal { foreach my $idx (@$parts) { $idx->remote_remove($oid, $mid); } - $self->{over}->remove_oid($oid, $mid); } $self->barrier; } diff --git a/t/v2writable.t b/t/v2writable.t index e49c06b9..ab85e9af 100644 --- a/t/v2writable.t +++ b/t/v2writable.t @@ -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) { -- 2.44.0