diff options
| author | Eric Wong <e@80x24.org> | 2019-11-15 09:50:39 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2019-11-16 11:05:23 +0000 |
| commit | fe565af9e3e1634412c21fb2fe2bb7612c430e47 (patch) | |
| tree | aa6d75fd6467c0969691f68e4e7199c634757565 | |
| parent | 16b69a6a99661df777affec547ef53bd9007f1f2 (diff) | |
| download | public-inbox-fe565af9e3e1634412c21fb2fe2bb7612c430e47.tar.gz | |
inboxwritable: add ->cleanup method
We've been using this in -edit, and will be using it in some more scripts and tests to optimize for run_mode=2 with run_script. Keeping this in the *Writable modules since I don't see it being useful for the WWW and NNTP read-only interfaces which use PublicInbox::Inbox.
| -rw-r--r-- | lib/PublicInbox/InboxWritable.pm | 4 | ||||
| -rw-r--r-- | lib/PublicInbox/Xapcmd.pm | 2 | ||||
| -rwxr-xr-x | script/public-inbox-edit | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/lib/PublicInbox/InboxWritable.pm b/lib/PublicInbox/InboxWritable.pm index c73910ac..d8391251 100644 --- a/lib/PublicInbox/InboxWritable.pm +++ b/lib/PublicInbox/InboxWritable.pm @@ -257,4 +257,8 @@ sub umask_prepare { $self->{umask} = $umask; } +sub cleanup ($) { + delete @{$_[0]}{qw(over mm git search)}; +} + 1; diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm index c807bf10..77f0524e 100644 --- a/lib/PublicInbox/Xapcmd.pm +++ b/lib/PublicInbox/Xapcmd.pm @@ -234,7 +234,7 @@ sub run { $im->lock_release; } - delete($ibx->{$_}) for (qw(mm over search)); # cleanup + $ibx->cleanup; process_queue(\@q, $cb, $max, $opt); $im->lock_acquire if !$opt->{-coarse_lock}; commit_changes($ibx, $im, $tmp, $opt); diff --git a/script/public-inbox-edit b/script/public-inbox-edit index b437b3c0..1900b267 100755 --- a/script/public-inbox-edit +++ b/script/public-inbox-edit @@ -57,7 +57,7 @@ sub find_mid ($$$) { my $tuple = [ $ibx, $smsg ]; push @{$found->{$cid} ||= []}, $tuple } - delete @$ibx{qw(over mm git search)}; # cleanup + PublicInbox::InboxWritable::cleanup($ibx); } $found; } @@ -131,7 +131,7 @@ foreach my $to_edit (values %$found) { my $edit_fn = $edit_fh->filename; my ($ibx, $smsg) = @{$to_edit->[0]}; my $old_raw = $ibx->msg_by_smsg($smsg); - delete @$ibx{qw(over mm git search)}; # cleanup + PublicInbox::InboxWritable::cleanup($ibx); my $tmp = $$old_raw; if (!$opt->{raw}) { |