From 6cdfe12cbcdd87ecfdafa487e4d78c3a12ac551e Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 27 Oct 2020 07:54:07 +0000 Subject: [PATCH] v2writable: make OO calls to last_commit-related methods We'll try to reuse as much V2Writable code as possible for external indices, but the way "last_commit" info is stored must be different as external indices will deal with last_commit info for multiple inboxes. --- lib/PublicInbox/V2Writable.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm index 9d08549f..de89b729 100644 --- a/lib/PublicInbox/V2Writable.pm +++ b/lib/PublicInbox/V2Writable.pm @@ -953,7 +953,7 @@ sub index_oid { # cat_async callback } # only update last_commit for $i on reindex iff newer than current -sub update_last_commit ($$$$) { +sub update_last_commit { my ($self, $git, $i, $cmt) = @_; my $last = last_epoch_commit($self, $i); if (defined $last && is_ancestor($git, $last, $cmt)) { @@ -1034,7 +1034,7 @@ sub sync_prepare ($$$) { # reindex stops at the current heads and we later rerun index_sync # without {reindex} - my $reindex_heads = last_commits($self, $epoch_max) if $sync->{reindex}; + my $reindex_heads = $self->last_commits($epoch_max) if $sync->{reindex}; for (my $i = $epoch_max; $i >= 0; $i--) { my $git_dir = git_dir_n($self, $i); @@ -1229,7 +1229,7 @@ sub index_epoch ($$$) { } } $all->async_wait_all; - update_last_commit($self, $git, $i, $stk->{latest_cmt}); + $self->update_last_commit($git, $i, $stk->{latest_cmt}); } sub xapian_only { -- 2.44.0