* [PATCH 00/20] v2: use consistent terminology
@ 2019-06-15 8:46 7% Eric Wong
2019-06-15 8:47 5% ` [PATCH 07/20] v2writable: rename {partitions} field to {shards} Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2019-06-15 8:46 UTC (permalink / raw)
To: meta
Modern Xapian docs and code refer to multi-DB uses as "shards";
so replace the term "partition" with the term "shard". This
way, we'll minimize the learning curve for people new to
public-inbox or Xapian.
We also still had a few places where we referred to git epochs
as "partitions", so fix those up and be consistent with the
majority of our own docs and code.
Eric Wong (20):
doc: rename our Xapian "partitions" to "shards"
v2writable: update comments regarding xcpdb --reshard
admin|xapcmd: user-facing messages say "shard"
rename reference to git epochs as "partitions"
searchidxpart: start using "shard" in user-visible places
v2writable: count_partitions => count_shards
v2writable: rename {partitions} field to {shards}
tests: change messages to use "shard" instead of partition
inboxwritable: s/partitions/shards/ in local var
v2: rename SearchIdxPart => SearchIdxShard
xapcmd: update comments referencing "partitions"
search*: rename {partition} => {shard}
v2writable: avoid "part" in internal subs and fields
v2writable: rename local vars to match Xapian terminology
adminedit: "part" => "shard" for local variables
v2writable: use "epoch" consistently when referring to git repos
search: use "shard" for local variable
xapcmd: favor 'shard' over 'part' in local variables
t/xcpdb-reshard: use 'shard' term in local variables
comments: replace "partition" with "shard"
Documentation/public-inbox-v2-format.pod | 10 +-
Documentation/public-inbox-xcpdb.pod | 11 +-
MANIFEST | 2 +-
lib/PublicInbox/Admin.pm | 4 +-
lib/PublicInbox/AdminEdit.pm | 12 +-
lib/PublicInbox/Inbox.pm | 18 +--
lib/PublicInbox/InboxWritable.pm | 4 +-
lib/PublicInbox/Search.pm | 14 +--
lib/PublicInbox/SearchIdx.pm | 19 +--
.../{SearchIdxPart.pm => SearchIdxShard.pm} | 30 ++---
lib/PublicInbox/V2Writable.pm | 109 +++++++++---------
lib/PublicInbox/WWW.pm | 12 +-
lib/PublicInbox/WwwListing.pm | 2 +-
lib/PublicInbox/WwwStream.pm | 12 +-
lib/PublicInbox/Xapcmd.pm | 96 +++++++--------
t/indexlevels-mirror.t | 2 +-
t/psgi_v2.t | 2 +-
t/v2writable.t | 4 +-
t/view.t | 2 +-
t/xcpdb-reshard.t | 14 +--
20 files changed, 188 insertions(+), 191 deletions(-)
rename lib/PublicInbox/{SearchIdxPart.pm => SearchIdxShard.pm} (78%)
--
EW
^ permalink raw reply [relevance 7%]
* [PATCH 07/20] v2writable: rename {partitions} field to {shards}
2019-06-15 8:46 7% [PATCH 00/20] v2: use consistent terminology Eric Wong
@ 2019-06-15 8:47 5% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2019-06-15 8:47 UTC (permalink / raw)
To: meta
Our internal data structure should be consistent with Xapian
terminology.
---
lib/PublicInbox/Admin.pm | 2 +-
lib/PublicInbox/V2Writable.pm | 10 +++++-----
lib/PublicInbox/Xapcmd.pm | 4 ++--
t/v2writable.t | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index 5549b85..29388ad 100644
--- a/lib/PublicInbox/Admin.pm
+++ b/lib/PublicInbox/Admin.pm
@@ -204,7 +204,7 @@ sub index_inbox {
if ($jobs == 0) {
$v2w->{parallel} = 0;
} else {
- my $n = $v2w->{partitions};
+ my $n = $v2w->{shards};
if ($jobs != ($n + 1)) {
warn
"Unable to respect --jobs=$jobs, inbox was created with $n shards\n";
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 03e6e95..aa13aa8 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -103,7 +103,7 @@ sub new {
rotate_bytes => int((1024 * 1024 * 1024) / $PACKING_FACTOR),
last_commit => [], # git repo -> commit
};
- $self->{partitions} = count_shards($self) || nproc_parts($creat);
+ $self->{shards} = count_shards($self) || nproc_parts($creat);
bless $self, $class;
}
@@ -134,7 +134,7 @@ sub add {
sub do_idx ($$$$$$$) {
my ($self, $msgref, $mime, $len, $num, $oid, $mid0) = @_;
$self->{over}->add_overview($mime, $len, $num, $oid, $mid0);
- my $npart = $self->{partitions};
+ my $npart = $self->{shards};
my $part = $num % $npart;
my $idx = idx_part($self, $part);
$idx->index_raw($len, $msgref, $num, $oid, $mid0, $mime);
@@ -290,12 +290,12 @@ sub idx_init {
# xcpdb can change shard count while -watch is idle
my $nparts = count_shards($self);
- if ($nparts && $nparts != $self->{partitions}) {
- $self->{partitions} = $nparts;
+ if ($nparts && $nparts != $self->{shards}) {
+ $self->{shards} = $nparts;
}
# need to create all parts before initializing msgmap FD
- my $max = $self->{partitions} - 1;
+ my $max = $self->{shards} - 1;
# idx_parts must be visible to all forked processes
my $idx = $self->{idx_parts} = [];
diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index 89bacc5..322d827 100644
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -70,10 +70,10 @@ sub commit_changes ($$$) {
die
"BUG: counted $n shards after resharding to $new_parts";
}
- my $prev = $im->{partitions};
+ my $prev = $im->{shards};
if ($pr && $prev != $n) {
$pr->("shard count changed: $prev => $n\n");
- $im->{partitions} = $n;
+ $im->{shards} = $n;
}
}
diff --git a/t/v2writable.t b/t/v2writable.t
index b0f88d2..88df2d6 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -34,7 +34,7 @@ my $mime = PublicInbox::MIME->create(
);
my $im = PublicInbox::V2Writable->new($ibx, {nproc => 1});
-is($im->{partitions}, 1, 'one partition when forced');
+is($im->{shards}, 1, 'one shard when forced');
ok($im->add($mime), 'ordinary message added');
foreach my $f ("$mainrepo/msgmap.sqlite3",
glob("$mainrepo/xap*/*"),
@@ -199,7 +199,7 @@ EOF
my @before = $git0->qx(@log, qw(--pretty=oneline));
my $before = $git0->qx(@log, qw(--pretty=raw --raw -r));
$im = PublicInbox::V2Writable->new($ibx, {nproc => 2});
- is($im->{partitions}, 1, 'detected single partition from previous');
+ is($im->{shards}, 1, 'detected single shard from previous');
my $smsg = $im->remove($mime, 'test removal');
$im->done;
my @after = $git0->qx(@log, qw(--pretty=oneline));
--
EW
^ permalink raw reply related [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-06-15 8:46 7% [PATCH 00/20] v2: use consistent terminology Eric Wong
2019-06-15 8:47 5% ` [PATCH 07/20] v2writable: rename {partitions} field to {shards} 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).