From: Eric Wong <e@80x24.org> To: meta@public-inbox.org Subject: [PATCH 07/20] v2writable: rename {partitions} field to {shards} Date: Sat, 15 Jun 2019 08:47:03 +0000 Message-ID: <20190615084716.3075-8-e@80x24.org> (raw) In-Reply-To: <20190615084716.3075-1-e@80x24.org> 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
next prev parent reply index 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 ` [PATCH 03/20] admin|xapcmd: user-facing messages say "shard" Eric Wong 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 ` Eric Wong [this message] 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 publically 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-8-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
user/dev discussion of public-inbox itself Archives are clonable: git clone --mirror https://public-inbox.org/meta git clone --mirror http://czquwvybam4bgbro.onion/meta git clone --mirror http://hjrcffqmbrq6wope.onion/meta git clone --mirror http://ou63pmih66umazou.onion/meta Example config snippet for mirrors Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta nntp://news.gmane.org/gmane.mail.public-inbox.general note: .onion URLs require Tor: https://www.torproject.org/ AGPL code for this site: git clone https://public-inbox.org/public-inbox.git