From: Eric Wong <e@yhbt.net>
Date: Sun, 24 May 2020 03:06:37 +0000 (+0000)
Subject: v2writable: only load Xapian when a shard is found
X-Git-Tag: v1.6.0~489
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=d6763f26cd82cae90ced264cfa59d0163ee5180f;p=public-inbox.git

v2writable: only load Xapian when a shard is found

We don't need to load Xapian until we have a directory
which looks like a shard, otherwise we're wasting cycles
on memory when running short-lived processes.
---

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 513e9f23..b393b31f 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -75,11 +75,14 @@ sub count_shards ($) {
 	# Also, shard count may change while -watch is running
 	# due to "xcpdb --reshard"
 	if (-d $xpfx) {
-		require PublicInbox::Search;
-		PublicInbox::Search::load_xapian();
-		my $XapianDatabase = $PublicInbox::Search::X{Database};
+		my $XapianDatabase;
 		foreach my $shard (<$xpfx/*>) {
 			-d $shard && $shard =~ m!/[0-9]+\z! or next;
+			$XapianDatabase //= do {
+				require PublicInbox::Search;
+				PublicInbox::Search::load_xapian();
+				$PublicInbox::Search::X{Database};
+			};
 			eval {
 				$XapianDatabase->new($shard)->close;
 				$n++;