From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 25/52] v2writable: more generic sync setup code
Date: Tue, 27 Oct 2020 07:54:26 +0000 [thread overview]
Message-ID: <20201027075453.19163-26-e@80x24.org> (raw)
In-Reply-To: <20201027075453.19163-1-e@80x24.org>
We want to reuse this code for ExtSearchIdx, eventually.
---
lib/PublicInbox/V2Writable.pm | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index a403f22f..7c7be1bd 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -964,9 +964,9 @@ sub update_last_commit {
}
sub last_commits ($$) {
- my ($self, $epoch_max) = @_;
+ my ($self, $sync) = @_;
my $heads = [];
- for (my $i = $epoch_max; $i >= 0; $i--) {
+ for (my $i = $sync->{epoch_max}; $i >= 0; $i--) {
$heads->[$i] = last_epoch_commit($self, $i);
}
$heads;
@@ -1023,17 +1023,20 @@ $range
$range;
}
-sub sync_prepare ($$$) {
- my ($self, $sync, $epoch_max) = @_;
+# overridden by ExtSearchIdx
+sub artnum_max { $_[0]->{mm}->num_highwater }
+
+sub sync_prepare ($$) {
+ my ($self, $sync) = @_;
my $pr = $sync->{-opt}->{-progress};
my $regen_max = 0;
my $head = $sync->{ibx}->{ref_head} || 'HEAD';
# reindex stops at the current heads and we later rerun index_sync
# without {reindex}
- my $reindex_heads = $self->last_commits($epoch_max) if $sync->{reindex};
+ my $reindex_heads = $self->last_commits($sync) if $sync->{reindex};
- for (my $i = $epoch_max; $i >= 0; $i--) {
+ for (my $i = $sync->{epoch_max}; $i >= 0; $i--) {
my $git_dir = $sync->{ibx}->git_dir_n($i);
-d $git_dir or next; # missing epochs are fine
my $git = PublicInbox::Git->new($git_dir);
@@ -1081,7 +1084,7 @@ sub sync_prepare ($$$) {
$sync->{-regen_fmt} = "% ${pad}u/$regen_max\n";
$sync->{nr} = \(my $nr = 0);
return -1 if $sync->{reindex};
- $regen_max + $self->{mm}->num_highwater() || 0;
+ $regen_max + $self->artnum_max || 0;
}
sub unindex_oid_aux ($$$) {
@@ -1152,11 +1155,10 @@ sub unindex_epoch ($$$$) {
qw(-c gc.reflogExpire=now gc --prune=all --quiet)]);
}
-sub sync_ranges ($$$) {
- my ($self, $sync, $epoch_max) = @_;
+sub sync_ranges ($$) {
+ my ($self, $sync) = @_;
my $reindex = $sync->{reindex};
-
- return last_commits($self, $epoch_max) unless $reindex;
+ return $self->last_commits($sync) unless $reindex;
return [] if ref($reindex) ne 'HASH';
my $ranges = $reindex->{from}; # arrayref;
@@ -1286,9 +1288,10 @@ sub index_sync {
-opt => $opt,
v2w => $self,
ibx => $self->{ibx},
+ epoch_max => $epoch_max,
};
- $sync->{ranges} = sync_ranges($self, $sync, $epoch_max);
- if (sync_prepare($self, $sync, $epoch_max)) {
+ $sync->{ranges} = sync_ranges($self, $sync);
+ if (sync_prepare($self, $sync)) {
# tmp_clone seems to fail if inside a transaction, so
# we rollback here (because we opened {mm} for reading)
# Note: we do NOT rely on DBI transactions for atomicity;
next prev parent reply other threads:[~2020-10-27 7:54 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-27 7:54 [PATCH 00/52] detached external index: mostly Eric Wong
2020-10-27 7:54 ` [PATCH 01/52] doc/standards: add RFCs for URL schemes Eric Wong
2020-11-05 7:54 ` [PATCH v2] " Eric Wong
2020-10-27 7:54 ` [PATCH 02/52] search: hoist out _xdb_sharded for v2 inboxes Eric Wong
2020-10-27 7:54 ` [PATCH 03/52] extsearch: start mocking out Eric Wong
2020-10-27 7:54 ` [PATCH 04/52] searchidx: expose INDEXLEVELS as `our' Eric Wong
2020-10-27 7:54 ` [PATCH 05/52] v2writable: add git method Eric Wong
2020-10-27 7:54 ` [PATCH 06/52] v2writable: make OO calls to last_commit-related methods Eric Wong
2020-10-27 7:54 ` [PATCH 07/52] search: xdb_sharded: make this a public method for ExtSearch Eric Wong
2020-10-27 7:54 ` [PATCH 08/52] searchidx: introduce "xref3" concept Eric Wong
2020-10-27 7:54 ` [PATCH 09/52] v2writable: prepare initialization for external indices Eric Wong
2020-10-27 7:54 ` [PATCH 10/52] v2writable: hoist out write_alternates Eric Wong
2020-10-27 7:54 ` [PATCH 11/52] searchidxshard: allow msgref to be undef Eric Wong
2020-10-27 7:54 ` [PATCH 12/52] v2writable: idx_shard: simplify callers Eric Wong
2020-10-27 7:54 ` [PATCH 13/52] v2writable: count_shards: allow working without {ibx} Eric Wong
2020-10-27 7:54 ` [PATCH 14/52] overidx: introduce changes for external index Eric Wong
2020-10-27 7:54 ` [PATCH 15/52] v2: some changes for ExtSearchIdx compatibility Eric Wong
2020-10-27 7:54 ` [PATCH 16/52] inboxwritable: eidx_key for external index Eric Wong
2020-10-27 7:54 ` [PATCH 17/52] v2writable: rename remaining "remote" terminology Eric Wong
2020-10-27 7:54 ` [PATCH 18/52] v2writable: checkpoint: account for lack of {mm} Eric Wong
2020-10-27 7:54 ` [PATCH 19/52] extsearchidx: initial implementation Eric Wong
2020-10-27 7:54 ` [PATCH 20/52] searchidx: index eidx_key as a boolean term Eric Wong
2020-10-27 7:54 ` [PATCH 21/52] searchidx: xref3 delete support Eric Wong
2020-10-27 7:54 ` [PATCH 22/52] searchidxshard: special init for eidx Eric Wong
2020-10-27 7:54 ` [PATCH 23/52] searchidx: put {ibx} into $sync state Eric Wong
2020-10-27 7:54 ` [PATCH 24/52] searchidx: log2stack: simplify callers Eric Wong
2020-10-27 7:54 ` Eric Wong [this message]
2020-10-27 7:54 ` [PATCH 26/52] v2writable: allow OO method references Eric Wong
2020-10-27 7:54 ` [PATCH 27/52] v2writable: rename {v2w} field to {self} Eric Wong
2020-10-27 7:54 ` [PATCH 28/52] v2writable: make *last_commits and sync_prepare OO methods Eric Wong
2020-10-27 7:54 ` [PATCH 29/52] v2writable: move size check init to sync_prepare Eric Wong
2020-10-27 7:54 ` [PATCH 30/52] extsearchidx: more compatibility with V2Writable callers Eric Wong
2020-10-27 7:54 ` [PATCH 31/52] v2writable: reduce scope of epoch-aware code Eric Wong
2020-10-27 7:54 ` [PATCH 32/52] extsearchidx: remove {unindex_range} field Eric Wong
2020-10-27 7:54 ` [PATCH 33/52] v2writable: pass oid to uindex_oid Eric Wong
2020-10-27 7:54 ` [PATCH 34/52] extsearchidx: sync unit updates Eric Wong
2020-10-27 7:54 ` [PATCH 35/52] searchidx: export prepare_stack Eric Wong
2020-10-27 7:54 ` [PATCH 36/52] extsearchidx: sync updates Eric Wong
2020-10-27 7:54 ` [PATCH 37/52] searchidx: reduce inbox-dependency, wrap ->with_umask Eric Wong
2020-10-27 7:54 ` [PATCH 38/52] searchidx: favor $sync->{ibx} (over $self->{ibx}) Eric Wong
2020-10-27 7:54 ` [PATCH 39/52] Makefile.PL: do not build manpage if POD is missing Eric Wong
2020-10-27 7:54 ` [PATCH 40/52] script: add preliminary eindex implementation Eric Wong
2020-10-27 7:54 ` [PATCH 41/52] index: eindex wiring Eric Wong
2020-10-27 7:54 ` [PATCH 42/52] over: store xref3 data in over.sqlite3 Eric Wong
2020-10-27 7:54 ` [PATCH 43/52] searchidx: remove xref3 support for Xapian Eric Wong
2020-10-27 7:54 ` [PATCH 44/52] t/extsearch.t: verify results and xref3 ordering Eric Wong
2020-10-27 7:54 ` [PATCH 45/52] t/v2writable: remove pointless ->barrier call Eric Wong
2020-10-27 7:54 ` [PATCH 46/52] extsearch: wire up smsg_eml Eric Wong
2020-10-27 7:54 ` [PATCH 47/52] extsearchidx: handle edits Eric Wong
2020-10-27 7:54 ` [PATCH 48/52] extsearch: wire up remaining Inbox-like methods for WWW Eric Wong
2020-10-27 7:54 ` [PATCH 49/52] searchidx: ignore exceptions from ->remove_term Eric Wong
2020-10-27 7:54 ` [PATCH 50/52] extsearchidx: set current_info in warning callbacks Eric Wong
2020-10-27 7:54 ` [PATCH 51/52] extsearchidx: support --batch-size checkpoints Eric Wong
2020-11-03 9:08 ` Eric Wong
2020-10-27 7:54 ` [PATCH 52/52] searchidxshard: make warnings with eidx_key less confusing Eric Wong
2020-10-27 12:08 ` [PATCH 00/52] detached external index: mostly Konstantin Ryabitsev
2020-11-10 18:53 ` detached external index: performance note Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201027075453.19163-26-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).