From e665a4fa317bf9ceea812bc9ca3f486ec722dfea Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 12 Jun 2019 08:10:04 +0000 Subject: [PATCH] xcpdb: use destination shard as progress prefix For M:N resharding, we'll want to display the number from the new shard number. --- lib/PublicInbox/Xapcmd.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm index 7204a911..5d8c35f4 100644 --- a/lib/PublicInbox/Xapcmd.pm +++ b/lib/PublicInbox/Xapcmd.pm @@ -198,10 +198,11 @@ sub cpdb_retryable ($$) { } sub progress_pfx ($) { - my @p = split('/', $_[0]); + my ($wip) = @_; # tempdir v2: ([0-9])+-XXXXXXXX + my @p = split('/', $wip); # return "xap15/0" for v2, or "xapian15" for v1: - ($p[-1] =~ /\A[0-9]+\z/) ? "$p[-2]/$p[-1]" : $p[-1]; + ($p[-1] =~ /\A([0-9]+)/) ? "$p[-2]/$1" : $p[-1]; } # xapian-compact wrapper @@ -268,7 +269,7 @@ sub cpdb ($$) { my ($it, $end); my ($nr, $tot, $fmt); # progress output my $pr = $opt->{-progress}; - my $pfx = $opt->{-progress_pfx} = progress_pfx($old); + my $pfx = $opt->{-progress_pfx} = progress_pfx($new); do { eval { -- 2.44.0