From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 26/52] v2writable: allow OO method references
Date: Tue, 27 Oct 2020 07:54:27 +0000 [thread overview]
Message-ID: <20201027075453.19163-27-e@80x24.org> (raw)
In-Reply-To: <20201027075453.19163-1-e@80x24.org>
Using `->can(method)' allows subclasses to override `index_oid'
and `unindex_oid' methods.
---
lib/PublicInbox/V2Writable.pm | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 7c7be1bd..c0306e82 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -1066,10 +1066,11 @@ sub sync_prepare ($$) {
if (my @leftovers = keys %{delete($sync->{D}) // {}}) {
warn('W: unindexing '.scalar(@leftovers)." leftovers\n");
my $arg = { v2w => $self };
+ my $unindex_oid = $self->can('unindex_oid');
for my $oid (@leftovers) {
$oid = unpack('H*', $oid);
$self->{current_info} = "leftover $oid";
- $self->git->cat_async($oid, \&unindex_oid, $arg);
+ $self->git->cat_async($oid, $unindex_oid, $arg);
}
$self->git->cat_async_wait;
}
@@ -1139,9 +1140,10 @@ sub unindex_epoch ($$$$) {
--no-notes --no-color --no-abbrev --no-renames);
my $fh = $git->popen(@cmd, $unindex_range);
local $sync->{in_unindex} = 1;
+ my $unindex_oid = $self->can('unindex_oid');
while (<$fh>) {
/\A:\d{6} 100644 $OID ($OID) [AM]\tm$/o or next;
- $self->git->cat_async($1, \&unindex_oid, $sync);
+ $self->git->cat_async($1, $unindex_oid, $sync);
}
close $fh or die "git log failed: \$?=$?";
$self->git->cat_async_wait;
@@ -1211,17 +1213,19 @@ sub index_epoch ($$$) {
defined(my $stk = $sync->{stacks}->[$i]) or return;
$sync->{stacks}->[$i] = undef;
my $all = $self->git;
+ my $index_oid = $self->can('index_oid');
+ my $unindex_oid = $self->can('unindex_oid');
while (my ($f, $at, $ct, $oid) = $stk->pop_rec) {
$self->{current_info} = "$i.git $oid";
+ my $req = { %$sync, autime => $at, cotime => $ct, oid => $oid };
if ($f eq 'm') {
- my $arg = { %$sync, autime => $at, cotime => $ct };
if ($sync->{max_size}) {
- $all->check_async($oid, \&check_size, $arg);
+ $all->check_async($oid, \&check_size, $req);
} else {
- $all->cat_async($oid, \&index_oid, $arg);
+ $all->cat_async($oid, $index_oid, $req);
}
} elsif ($f eq 'd') {
- $all->cat_async($oid, \&unindex_oid, $sync);
+ $all->cat_async($oid, $unindex_oid, $req);
}
if (${$sync->{need_checkpoint}}) {
reindex_checkpoint($self, $sync);
@@ -1308,7 +1312,7 @@ sub index_sync {
}
}
if ($sync->{max_size} = $opt->{max_size}) {
- $sync->{index_oid} = \&index_oid;
+ $sync->{index_oid} = $self->can('index_oid');
}
# work forwards through history
index_epoch($self, $sync, $_) for (0..$epoch_max);
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 ` [PATCH 25/52] v2writable: more generic sync setup code Eric Wong
2020-10-27 7:54 ` Eric Wong [this message]
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-27-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).