From 9b20aeef079c67ddaa2911b89f0b1209903d72fb Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Fri, 14 Jun 2019 07:56:58 +0000
Subject: v2writable: count_partitions => count_shards

Another step towards becoming consistent with Xapian terminology
---
 lib/PublicInbox/V2Writable.pm | 6 +++---
 lib/PublicInbox/Xapcmd.pm     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index db905f92..03e6e951 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -52,7 +52,7 @@ sub nproc_parts ($) {
 	$n < 1 ? 1 : $n;
 }
 
-sub count_partitions ($) {
+sub count_shards ($) {
 	my ($self) = @_;
 	my $nparts = 0;
 	my $xpfx = $self->{xpfx};
@@ -103,7 +103,7 @@ sub new {
 		rotate_bytes => int((1024 * 1024 * 1024) / $PACKING_FACTOR),
 		last_commit => [], # git repo -> commit
 	};
-	$self->{partitions} = count_partitions($self) || nproc_parts($creat);
+	$self->{partitions} = count_shards($self) || nproc_parts($creat);
 	bless $self, $class;
 }
 
@@ -289,7 +289,7 @@ sub idx_init {
 		$over->create;
 
 		# xcpdb can change shard count while -watch is idle
-		my $nparts = count_partitions($self);
+		my $nparts = count_shards($self);
 		if ($nparts && $nparts != $self->{partitions}) {
 			$self->{partitions} = $nparts;
 		}
diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index e303da9e..89bacc50 100644
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -63,9 +63,9 @@ sub commit_changes ($$$) {
 	if (!$opt->{-coarse_lock}) {
 		$opt->{-skip_lock} = 1;
 
-		if ($im->can('count_partitions')) {
+		if ($im->can('count_shards')) {
 			my $pr = $opt->{-progress};
-			my $n = $im->count_partitions;
+			my $n = $im->count_shards;
 			if (defined $new_parts && $n != $new_parts) {
 				die
 "BUG: counted $n shards after resharding to $new_parts";
-- 
cgit v1.2.3-24-ge0c7