From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 03/20] admin|xapcmd: user-facing messages say "shard"
Date: Sat, 15 Jun 2019 08:46:59 +0000 [thread overview]
Message-ID: <20190615084716.3075-4-e@80x24.org> (raw)
In-Reply-To: <20190615084716.3075-1-e@80x24.org>
We're slowly getting rid of the word "partition" when it
comes to remain consistent with Xapian docs.
---
lib/PublicInbox/Admin.pm | 2 +-
lib/PublicInbox/Xapcmd.pm | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index 8a2f204..5549b85 100644
--- 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 e1c6fe3..e303da9 100644
--- 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) {
--
EW
next prev parent reply other threads:[~2019-06-15 8:47 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-15 8:46 [PATCH 00/20] v2: use consistent terminology Eric Wong
2019-06-15 8:46 ` [PATCH 01/20] doc: rename our Xapian "partitions" to "shards" Eric Wong
2019-06-15 8:46 ` [PATCH 02/20] v2writable: update comments regarding xcpdb --reshard Eric Wong
2019-06-15 8:46 ` Eric Wong [this message]
2019-06-15 8:47 ` [PATCH 04/20] rename reference to git epochs as "partitions" Eric Wong
2019-06-15 8:47 ` [PATCH 05/20] searchidxpart: start using "shard" in user-visible places Eric Wong
2019-06-15 8:47 ` [PATCH 06/20] v2writable: count_partitions => count_shards Eric Wong
2019-06-15 8:47 ` [PATCH 07/20] v2writable: rename {partitions} field to {shards} Eric Wong
2019-06-15 8:47 ` [PATCH 08/20] tests: change messages to use "shard" instead of partition Eric Wong
2019-06-15 8:47 ` [PATCH 09/20] inboxwritable: s/partitions/shards/ in local var Eric Wong
2019-06-15 8:47 ` [PATCH 10/20] v2: rename SearchIdxPart => SearchIdxShard Eric Wong
2019-06-15 8:47 ` [PATCH 11/20] xapcmd: update comments referencing "partitions" Eric Wong
2019-06-15 8:47 ` [PATCH 12/20] search*: rename {partition} => {shard} Eric Wong
2019-06-15 8:47 ` [PATCH 13/20] v2writable: avoid "part" in internal subs and fields Eric Wong
2019-06-15 8:47 ` [PATCH 14/20] v2writable: rename local vars to match Xapian terminology Eric Wong
2019-06-15 8:47 ` [PATCH 15/20] adminedit: "part" => "shard" for local variables Eric Wong
2019-06-15 8:47 ` [PATCH 16/20] v2writable: use "epoch" consistently when referring to git repos Eric Wong
2019-06-15 8:47 ` [PATCH 17/20] search: use "shard" for local variable Eric Wong
2019-06-15 8:47 ` [PATCH 18/20] xapcmd: favor 'shard' over 'part' in local variables Eric Wong
2019-06-15 8:47 ` [PATCH 19/20] t/xcpdb-reshard: use 'shard' term " Eric Wong
2019-06-15 8:47 ` [PATCH 20/20] comments: replace "partition" with "shard" Eric Wong
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=20190615084716.3075-4-e@80x24.org \
--to=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).