X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchIdx.pm;h=e5c872d52fd3fd477f42301f7407acbd8d0061fb;hb=ef68ada3b207fdb511ebe6d33b072a84277e6cd6;hp=f4f3ba34f5c951f3a0b3045a7babbb3cbd0f0934;hpb=a23c5b9673a374b6abf4416824796cec5446dd9a;p=public-inbox.git

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index f4f3ba34..e5c872d5 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -94,7 +94,7 @@ sub need_xapian ($) { $_[0]->{indexlevel} =~ $xapianlevels }
 sub idx_release {
 	my ($self, $wake) = @_;
 	if (need_xapian($self)) {
-		my $xdb = delete $self->{xdb} or croak 'not acquired';
+		my $xdb = delete $self->{xdb} or croak '{xdb} not acquired';
 		$xdb->close;
 	}
 	$self->lock_release($wake) if $self->{creat};
@@ -103,7 +103,7 @@ sub idx_release {
 
 sub load_xapian_writable () {
 	return 1 if $X->{WritableDatabase};
-	PublicInbox::Search::load_xapian() or return;
+	PublicInbox::Search::load_xapian() or die "failed to load Xapian: $@\n";
 	my $xap = $PublicInbox::Search::Xap;
 	for (qw(Document TermGenerator WritableDatabase)) {
 		$X->{$_} = $xap.'::'.$_;
@@ -750,7 +750,8 @@ sub index_sync {
 	my ($self, $opt) = @_;
 	delete $self->{lock_path} if $opt->{-skip_lock};
 	$self->with_umask(\&_index_sync, $self, $opt);
-	if ($opt->{reindex} && !$opt->{quit}) {
+	if ($opt->{reindex} && !$opt->{quit} &&
+			!grep(defined, @$opt{qw(since until)})) {
 		my %again = %$opt;
 		delete @again{qw(rethread reindex)};
 		index_sync($self, \%again);
@@ -775,18 +776,18 @@ sub v1_checkpoint ($$;$) {
 	# $newest may be undef
 	my $newest = $stk ? $stk->{latest_cmt} : ${$sync->{latest_cmt}};
 	if (defined($newest)) {
-		my $cur = $self->{mm}->last_commit || '';
-		if (need_update($self, $cur, $newest)) {
+		my $cur = $self->{mm}->last_commit;
+		if (need_update($self, $sync, $cur, $newest)) {
 			$self->{mm}->last_commit($newest);
 		}
 	}
 	${$sync->{max}} = $self->{batch_bytes};
 
 	$self->{mm}->{dbh}->commit;
-	my $xdb = need_xapian($self) ? $self->{xdb} : undef;
+	my $xdb = $self->{xdb};
 	if ($newest && $xdb) {
 		my $cur = $xdb->get_metadata('last_commit');
-		if (need_update($self, $cur, $newest)) {
+		if (need_update($self, $sync, $cur, $newest)) {
 			$xdb->set_metadata('last_commit', $newest);
 		}
 	}
@@ -870,9 +871,14 @@ sub log2stack ($$$) {
 
 	# Count the new files so they can be added newest to oldest
 	# and still have numbers increasing from oldest to newest
-	my $fh = $git->popen(qw(log --raw -r --pretty=tformat:%at-%ct-%H
-				--no-notes --no-color --no-renames --no-abbrev),
-				$range);
+	my @cmd = qw(log --raw -r --pretty=tformat:%at-%ct-%H
+			--no-notes --no-color --no-renames --no-abbrev);
+	for my $k (qw(since until)) {
+		my $v = $sync->{-opt}->{$k} // next;
+		next if !$sync->{-opt}->{reindex};
+		push @cmd, "--$k=$v";
+	}
+	my $fh = $git->popen(@cmd, $range);
 	my ($at, $ct, $stk, $cmt);
 	while (<$fh>) {
 		return if $sync->{quit};
@@ -928,10 +934,17 @@ sub is_ancestor ($$$) {
 	$? == 0;
 }
 
-sub need_update ($$$) {
-	my ($self, $cur, $new) = @_;
+sub need_update ($$$$) {
+	my ($self, $sync, $cur, $new) = @_;
 	my $git = $self->{ibx}->git;
-	return 1 if $cur && !is_ancestor($git, $cur, $new);
+	$cur //= ''; # XS Search::Xapian ->get_metadata doesn't give undef
+
+	# don't rewind if --{since,until,before,after} are in use
+	return if $cur ne '' &&
+		grep(defined, @{$sync->{-opt}}{qw(since until)}) &&
+		is_ancestor($git, $new, $cur);
+
+	return 1 if $cur ne '' && !is_ancestor($git, $cur, $new);
 	my $range = $cur eq '' ? $new : "$cur..$new";
 	chomp(my $n = $git->qx(qw(rev-list --count), $range));
 	($n eq '' || $n > 0);