From: Eric Wong <e@80x24.org>
Date: Sun, 17 Oct 2021 09:52:50 +0000 (-1100)
Subject: extindex: better locations for {quit} checks
X-Git-Tag: v1.7.0~112
X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=commitdiff_plain;h=1f07fa568f1c466b44bb69c89ad847a233437014

extindex: better locations for {quit} checks

Check for graceful termination at every message since it's
a fairly inexpensive check.
---

diff --git a/lib/PublicInbox/ExtSearchIdx.pm b/lib/PublicInbox/ExtSearchIdx.pm
index cb5256a2..f479cf9e 100644
--- a/lib/PublicInbox/ExtSearchIdx.pm
+++ b/lib/PublicInbox/ExtSearchIdx.pm
@@ -908,10 +908,9 @@ ibx_id = ? AND xnum >= ? AND xnum <= ?
 				for my $num (@$docids) {
 					$self->{oidx}->eidxq_add($num);
 				}
-				return if $sync->{quit};
 			}
+			return if $sync->{quit};
 		}
-		return if $sync->{quit};
 		next unless scalar keys %x3m;
 		$self->git->async_wait_all; # wait for reindex_unseen
 
@@ -936,6 +935,7 @@ BUG: (non-fatal) $ekey #$xnum $smsg->{blob} still matches (old exp: $exp)
 			for my $i (@$docids) {
 				_unref_doc($sync, $i, $ibx, $xnum, $bin);
 			}
+			return if $sync->{quit};
 		}
 	}
 	defined($hi) and ($hi < $max) and