From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Tue, 1 Aug 2023 10:53:25 +0000 (+0000)
Subject: fts: fts_mailbox_search_next_update_seq() - Check indexing of virtual mailboxes
X-Git-Tag: 2.4.0~2529
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47cc2344a90c980c6d19a2ecd6155d1138304ba8;p=thirdparty%2Fdovecot%2Fcore.git

fts: fts_mailbox_search_next_update_seq() - Check indexing of virtual mailboxes
---

diff --git a/src/plugins/fts/fts-storage.c b/src/plugins/fts/fts-storage.c
index f6be09911e..99c5aa3798 100644
--- a/src/plugins/fts/fts-storage.c
+++ b/src/plugins/fts/fts-storage.c
@@ -295,7 +295,7 @@ fts_mailbox_search_next_nonblock(struct mail_search_context *ctx,
 			*tryagain_r = TRUE;
 			return FALSE;
 		}
-		if (fctx->indexing_timed_out) {
+		if (fctx->indexing_timed_out || fctx->mailbox_failed) {
 			*tryagain_r = FALSE;
 			return FALSE;
 		}
@@ -333,6 +333,34 @@ fts_search_apply_results_level(struct mail_search_context *ctx,
 	}
 }
 
+static int
+fts_mailbox_search_is_virtual_seq_indexed(struct fts_search_context *fctx,
+					  uint32_t seq)
+{
+	const struct virtual_mailbox_vfuncs *v = fctx->box->virtual_vfuncs;
+	struct mailbox *box;
+	uint32_t uid;
+	v->get_real_mail_uid(fctx->box, seq, &box, &uid);
+
+	struct mailbox_status status;
+	if (mailbox_get_status(box, STATUS_FTS_LAST_INDEXED_UID, &status) < 0)
+		return -1;
+
+	if (uid > status.fts_last_indexed_uid)
+		return 0;
+
+	return 1;
+}
+
+static int
+fts_mailbox_search_is_seq_indexed(struct fts_search_context *fctx, uint32_t seq)
+{
+	const struct virtual_mailbox_vfuncs *v = fctx->box->virtual_vfuncs;
+	if (v == NULL)
+		return seq < fctx->first_unindexed_seq ? 1 : 0;
+	return fts_mailbox_search_is_virtual_seq_indexed(fctx, seq);
+}
+
 static bool fts_mailbox_search_next_update_seq(struct mail_search_context *ctx)
 {
 	struct fts_mailbox *fbox = FTS_CONTEXT_REQUIRE(ctx->transaction->box);
@@ -341,7 +369,8 @@ static bool fts_mailbox_search_next_update_seq(struct mail_search_context *ctx)
 
 	if (fctx == NULL || !fctx->fts_lookup_success) {
 		/* fts lookup not done for this search */
-		if (fctx != NULL && fctx->indexing_timed_out)
+		if (fctx != NULL &&
+		    (fctx->indexing_timed_out || fctx->mailbox_failed))
 			return FALSE;
 		return fbox->module_ctx.super.search_next_update_seq(ctx);
 	}
@@ -352,10 +381,13 @@ static bool fts_mailbox_search_next_update_seq(struct mail_search_context *ctx)
 	if (!fbox->module_ctx.super.search_next_update_seq(ctx))
 		return FALSE;
 
-	if (ctx->seq >= fctx->first_unindexed_seq) {
-		/* we've not indexed this far */
-		return TRUE;
+	int ret = fts_mailbox_search_is_seq_indexed(fctx, ctx->seq);
+	if (ret < 0) {
+		fctx->mailbox_failed = TRUE;
+		return FALSE;
 	}
+	if (ret == 0)
+		return TRUE;
 
 	/* apply [non]matches based on the FTS lookup results */
 	idx = 0;
@@ -377,8 +409,12 @@ static int fts_mailbox_search_deinit(struct mail_search_context *ctx)
 			if (fts_indexer_deinit(&fctx->indexer_ctx) < 0)
 				ft->failure_reason = "FTS indexing failed";
 		}
-		if (fctx->indexing_timed_out)
+		if (fctx->indexing_timed_out || fctx->mailbox_failed)
 			ret = -1;
+		else if (fctx->mailbox_failed) {
+			mail_storage_set_internal_error(ctx->transaction->box->storage);
+			ret = -1;
+		}
 		else if (!fctx->fts_lookup_success &&
 			 fctx->enforced != FTS_ENFORCED_NO) {
 			/* FTS lookup failed and we didn't want to fallback to
diff --git a/src/plugins/fts/fts-storage.h b/src/plugins/fts/fts-storage.h
index 0caf58c282..41c16458cb 100644
--- a/src/plugins/fts/fts-storage.h
+++ b/src/plugins/fts/fts-storage.h
@@ -51,6 +51,7 @@ struct fts_search_context {
 	bool fts_lookup_success:1;
 	bool indexing_timed_out:1;
 	bool virtual_seen_unindexed_gaps:1;
+	bool mailbox_failed:1;
 };
 
 /* Figure out if we want to use full text search indexes and update