about summary refs log tree commit homepage
path: root/lib/PublicInbox
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-06-14 07:59:53 +0000
committerEric Wong <e@80x24.org>2019-06-14 21:56:40 +0000
commit240de56c97d767cd5c819ac0be858359e8d2eff3 (patch)
tree23e78da9df2834d49f2f1d6a15609eed54c655d2 /lib/PublicInbox
parent9b20aeef079c67ddaa2911b89f0b1209903d72fb (diff)
downloadpublic-inbox-240de56c97d767cd5c819ac0be858359e8d2eff3.tar.gz
Our internal data structure should be consistent with Xapian
terminology.
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r--lib/PublicInbox/Admin.pm2
-rw-r--r--lib/PublicInbox/V2Writable.pm10
-rw-r--r--lib/PublicInbox/Xapcmd.pm4
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index 5549b855..29388ad6 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 03e6e951..aa13aa8f 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 89bacc50..322d827a 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;
                         }
                 }