v2writable: rename {partitions} field to {shards}

Our internal data structure should be consistent with Xapian
terminology.

diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index 5549b855bd65f66ed0766c36de8c177d011b6e28..29388ad6ddd10b7f352f143c51d732b690291c8c 100644 (file)
--- 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 03e6e9515c68033608001c5c5b233e6f23f40ec1..aa13aa8fb4722d7215422182bbcc024b5efacacf 100644 (file)
--- 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 89bacc5007ea93f3de5c78da26de1e4a893347e7..322d827a697f34a9be4402241fe4944ed97fa1bd 100644 (file)
--- 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 b0f88d27b75855cc1a77f41f172195b34ee2aeb3..88df2d64a30a065dd057f36f6568b8644693f58f 100644 (file)
--- 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));