* [PATCH] xcpdb: preserve indexlevel for extindex
@ 2023-04-26 0:49 7% Eric Wong
0 siblings, 0 replies; 1+ results
From: Eric Wong @ 2023-04-26 0:49 UTC (permalink / raw)
To: meta
This likely fixes indexlevel preservation for some v2 on some
systems, too, since (apparently) we need to sort shards
numerically to get Xapian metadata working properly on a
combined (multi-shard) Xapian DB.
---
lib/PublicInbox/Xapcmd.pm | 9 ++++-----
t/extsearch.t | 31 +++++++++++++++++++++++++++++--
2 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index c87baa7b..3a4c5622 100644
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -219,7 +219,7 @@ sub prepare_run {
my @old_shards;
while (defined(my $dn = readdir($dh))) {
if ($dn =~ /\A[0-9]+\z/) {
- push @old_shards, $dn;
+ push(@old_shards, $dn + 0);
} elsif ($dn eq '.' || $dn eq '..') {
} elsif ($dn =~ /\Aover\.sqlite3/) {
} elsif ($dn eq 'misc' && $misc_ok) {
@@ -228,7 +228,7 @@ sub prepare_run {
}
}
die "No Xapian shards found in $old\n" unless @old_shards;
-
+ @old_shards = sort { $a <=> $b } @old_shards;
my ($src, $max_shard);
if (!defined($reshard) || $reshard == scalar(@old_shards)) {
# 1:1 copy
@@ -464,11 +464,10 @@ sub cpdb ($$) { # cb_spawn callback
$dst->set_metadata('last_commit', $lc) if $lc;
# only the first xapian shard (0) gets 'indexlevel'
- if ($new =~ m!(?:xapian[0-9]+|xap[0-9]+/0)\b!) {
+ if ($new =~ m!/(?:xapian[0-9]+|(?:ei|xap)[0-9]+/0)\b!) {
my $l = $src->get_metadata('indexlevel');
- if ($l eq 'medium') {
+ $l eq 'medium' and
$dst->set_metadata('indexlevel', $l);
- }
}
if ($pr_data) {
my $tot = $src->get_doccount;
diff --git a/t/extsearch.t b/t/extsearch.t
index 03bcad95..8cbd26f0 100644
--- a/t/extsearch.t
+++ b/t/extsearch.t
@@ -1,8 +1,7 @@
#!perl -w
# Copyright (C) all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
-use strict;
-use Test::More;
+use v5.12;
use PublicInbox::TestCommon;
use PublicInbox::Config;
use PublicInbox::InboxWritable;
@@ -554,4 +553,32 @@ EOM
is_deeply($x, $o, 'xref3 and over docids match');
}
+{
+ my $d = "$home/eidx-med";
+ ok(run_script([qw(-extindex --dangerous --all -L medium -j3), $d]),
+ 'extindex medium init');
+ my $es = PublicInbox::ExtSearch->new($d);
+ is($es->xdb->get_metadata('indexlevel'), 'medium',
+ 'es indexlevel before');
+ my @xdb = $es->xdb_shards_flat;
+ is($xdb[0]->get_metadata('indexlevel'), 'medium',
+ '0 indexlevel before');
+ shift @xdb;
+ for (@xdb) {
+ ok(!$_->get_metadata('indexlevel'), 'no indexlevel in >0 shard')
+ }
+ is($es->xdb->get_metadata('indexlevel'), 'medium', 'indexlevel before');
+ ok(run_script([qw(-xcpdb -R5), $d]), 'xcpdb R5');
+ $es = PublicInbox::ExtSearch->new($d);
+ is($es->xdb->get_metadata('indexlevel'), 'medium',
+ '0 indexlevel after');
+ @xdb = $es->xdb_shards_flat;
+ is(scalar(@xdb), 5, 'got 5 shards');
+ is($xdb[0]->get_metadata('indexlevel'), 'medium', '0 indexlevel after');
+ shift @xdb;
+ for (@xdb) {
+ ok(!$_->get_metadata('indexlevel'), 'no indexlevel in >0 shard')
+ }
+}
+
done_testing;
^ permalink raw reply related [relevance 7%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-04-26 0:49 7% [PATCH] xcpdb: preserve indexlevel for extindex Eric Wong
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).