From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 27A361F87F for ; Fri, 14 Jun 2019 03:03:19 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 2/4] xapcmd: preserve indexlevel based on the destination Date: Fri, 14 Jun 2019 03:03:16 +0000 Message-Id: <20190614030318.17216-3-e@80x24.org> In-Reply-To: <20190614030318.17216-1-e@80x24.org> References: <20190614030318.17216-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: To support M:N resharding, we need to ensure we store the indexlevel in the destination shard, rather than the originating one. --- lib/PublicInbox/Xapcmd.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm index dad080c..7204a91 100644 --- a/lib/PublicInbox/Xapcmd.pm +++ b/lib/PublicInbox/Xapcmd.pm @@ -145,7 +145,8 @@ sub run { if ($v == 1) { my $old_parent = dirname($old); same_fs_or_die($old_parent, $old); - $tmp->{$old} = tempdir('xapcmd-XXXXXXXX', DIR => $old_parent); + my $v = PublicInbox::Search::SCHEMA_VERSION(); + $tmp->{$old} = tempdir("xapian$v-XXXXXXXX", DIR => $old_parent); push @q, [ $old, $tmp->{$old} ]; } else { opendir my $dh, $old or die "Failed to opendir $old: $!\n"; @@ -276,7 +277,7 @@ sub cpdb ($$) { $dst->set_metadata('last_commit', $lc) if $lc; # only the first xapian partition (0) gets 'indexlevel' - if ($old =~ m!(?:xapian[0-9]+|xap[0-9]+/0)\z!) { + if ($new =~ m!(?:xapian[0-9]+|xap[0-9]+/0)\b!) { my $l = $src->get_metadata('indexlevel'); if ($l eq 'medium') { $dst->set_metadata('indexlevel', $l); -- EW