From: ebiederm@xmission.com (Eric W. Biederman)
To: Eric Wong <e@80x24.org>
Cc: meta@public-inbox.org
Subject: Re: [WIP] searchidx: support incremental indexing on indexlevel=basic
Date: Thu, 02 Aug 2018 07:25:37 -0500 [thread overview]
Message-ID: <87wot9hs5a.fsf@xmission.com> (raw)
In-Reply-To: <20180802034404.cnvfqlgvynamnc6n@whir> (Eric Wong's message of "Thu, 2 Aug 2018 03:44:04 +0000")
Eric Wong <e@80x24.org> writes:
> I wrote:
>> While testing this, it looks like I introduced a bug to
>> indexlevel=basic which broke incremental indexing when I made it
>> possible to upgrade to (medium|full). Patch coming for that in
>> a bit...
>
> Eep, I think there's deeper problems with indexlevel=basic and
> incremental updates, since it's still doing lookups against
> Xapian for deletes...
>
> This is my work-in-progress to stop full-reindexing, at least.
So I don't think your change is quite right.
If the repo has only lived with indexlevel == 'basic' then last_commit
should always match the output of xdb->get_metadata('last_commit') as
it will always been undef or ''.
In fact I don't see any code that is updating
$xdb->get_metadata('last_commit');
Am I wrong or can we just always use mm->last_commit for this logic?
Eric
> ----8<-----
> Subject: [PATCH] searchidx: support incremental indexing on indexlevel=basic
>
> ---
> lib/PublicInbox/SearchIdx.pm | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
> index 54f82aa..5cac08f 100644
> --- a/lib/PublicInbox/SearchIdx.pm
> +++ b/lib/PublicInbox/SearchIdx.pm
> @@ -668,6 +668,15 @@ sub need_update ($$$) {
> ($n eq '' || $n > 0);
> }
>
> +sub _last_x_commit {
> + my ($self) = @_;
> + if ($self->{indexlevel} =~ $xapianlevels) {
> + $self->{xdb}->get_metadata('last_commit');
> + } else {
> + $self->{mm}->last_commit || '';
> + }
> +}
> +
> # indexes all unindexed messages (v1 only)
> sub _index_sync {
> my ($self, $opts) = @_;
> @@ -682,7 +691,7 @@ sub _index_sync {
> do {
> $xlog = undef;
> $mkey = 'last_commit';
> - $last_commit = $xdb->get_metadata('last_commit');
> + $last_commit = $self->_last_x_commit;
> $lx = $last_commit;
> if ($reindex) {
> $lx = '';
> @@ -707,7 +716,7 @@ sub _index_sync {
> $xlog = _git_log($self, $range);
>
> $xdb = $self->begin_txn_lazy;
> - } while ($xdb->get_metadata('last_commit') ne $last_commit);
> + } while ($self->_last_x_commit ne $last_commit);
>
> my $dbh = $mm->{dbh} if $mm;
> my $cb = sub {
next prev parent reply other threads:[~2018-08-02 12:25 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-01 16:41 [PATCH 00/13]: Incremental index fixes Eric W. Biederman
2018-08-01 16:43 ` [PATCH 01/13] Import.pm: Don't assume {in} and {out} always exist Eric W. Biederman
2018-08-01 16:43 ` [PATCH 02/13] t/v1reindex.t: Isolate the test cases Eric W. Biederman
2018-08-01 16:43 ` [PATCH 03/13] t/v2reindex.t: Isolate the test cases more Eric W. Biederman
2018-08-01 16:43 ` [PATCH 04/13] t/v[12]reindex.t: Place expected second in Xapian tests Eric W. Biederman
2018-08-01 16:43 ` [PATCH 05/13] t/v[12]reindex.t: Test that the resulting msgmap is as expected Eric W. Biederman
2018-08-01 16:43 ` [PATCH 06/13] t/v[12]reindex.t: Test incremental indexing works Eric W. Biederman
2018-08-01 16:43 ` [PATCH 07/13] SearchIdx.pm: Always assign numbers backwards during incremental indexing Eric W. Biederman
2018-08-01 16:43 ` [PATCH 08/13] Msgmap.pm: Track the largest value of num ever assigned Eric W. Biederman
2018-08-02 3:00 ` Eric Wong
2018-08-02 3:44 ` [WIP] searchidx: support incremental indexing on indexlevel=basic Eric Wong
2018-08-02 12:25 ` Eric W. Biederman [this message]
2018-08-02 17:12 ` Eric W. Biederman
2018-08-02 18:15 ` Eric W. Biederman
2019-05-14 2:04 ` [PATCH 0/3] incremental index fixes for indexlevel=basic Eric Wong
2019-05-14 2:04 ` [PATCH 1/3] v1writable: new wrapper which is closer to v2writable Eric Wong
2019-05-14 2:04 ` [PATCH 2/3] v2writable: allow setting nproc via creat options Eric Wong
2019-05-14 2:04 ` [PATCH 3/3] searchidx: fix incremental index with indexlevel=basic on v1 Eric Wong
2018-08-02 12:08 ` [PATCH 08/13] Msgmap.pm: Track the largest value of num ever assigned Eric W. Biederman
2018-08-01 16:43 ` [PATCH 09/13] t/v[12]reindex.t Verify num_highwater Eric W. Biederman
2018-08-01 16:43 ` [PATCH 10/13] t/v[12]reindex.t: Verify the num highwater is as expected Eric W. Biederman
2018-08-01 16:43 ` [PATCH 11/13] SearchIdx,V2Writeable: Update num_highwater on optimized deletes Eric W. Biederman
2018-08-01 16:43 ` [PATCH 12/13] V2Writeable.pm: Ensure that a found message number is in the msgmap Eric W. Biederman
2018-08-01 16:43 ` [PATCH 13/13] V2Writeable.pm: In unindex_oid delete the message from msgmap Eric W. Biederman
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=87wot9hs5a.fsf@xmission.com \
--to=ebiederm@xmission.com \
--cc=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).