admin|xapcmd: user-facing messages say "shard"

We're slowly getting rid of the word "partition" when it
comes to remain consistent with Xapian docs.

diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index 8a2f20431c1ba403bbfc6a95dbe6c9dbd443105d..5549b855bd65f66ed0766c36de8c177d011b6e28 100644 (file)
--- a/lib/PublicInbox/Admin.pm
+++ b/lib/PublicInbox/Admin.pm
@@ -207,7 +207,7 @@ sub index_inbox {
                                my $n = $v2w->{partitions};
                                if ($jobs != ($n + 1)) {
                                        warn
-"Unable to respect --jobs=$jobs, inbox was created with $n partitions\n";
+"Unable to respect --jobs=$jobs, inbox was created with $n shards\n";
                                }
                        }
                }

diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index e1c6fe3a9c9326a14d1dde5f31d31a811884f843..e303da9e8ccd339381614e8a85c5f813b93c129e 100644 (file)
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -68,11 +68,11 @@ sub commit_changes ($$$) {
                        my $n = $im->count_partitions;
                        if (defined $new_parts && $n != $new_parts) {
                                die
-"BUG: counted $n partitions after repartioning to $new_parts";
+"BUG: counted $n shards after resharding to $new_parts";
                        }
                        my $prev = $im->{partitions};
                        if ($pr && $prev != $n) {
-                               $pr->("partition count changed: $prev => $n\n");
+                               $pr->("shard count changed: $prev => $n\n");
                                $im->{partitions} = $n;
                        }
                }
@@ -177,7 +177,7 @@ sub run {
        }
 
        # we want temporary directories to be as deep as possible,
-       # so v2 partitions can keep "xap$SCHEMA_VERSION" on a separate FS.
+       # so v2 shards can keep "xap$SCHEMA_VERSION" on a separate FS.
        if ($v == 1) {
                if (defined $new_parts) {
                        warn
@@ -355,9 +355,9 @@ sub cpdb ($$) {
        if (ref($old) eq 'ARRAY') {
                ($cur_part) = ($new =~ m!xap[0-9]+/([0-9]+)\b!);
                defined $cur_part or
-                       die "BUG: could not extract partition # from $new";
+                       die "BUG: could not extract shard # from $new";
                $new_parts = $opt->{reshard};
-               defined $new_parts or die 'BUG: got array src w/o --partition';
+               defined $new_parts or die 'BUG: got array src w/o --reshard';
 
                # repartitioning, M:N copy means have full read access
                foreach (@$old) {