From: Art Cancro <ajc@citadel.org>
Date: Wed, 30 Aug 2023 02:49:34 +0000 (-0400)
Subject: Removed double-fetch-room in the indexer.
X-Git-Tag: v989~12
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=4e68bc21e3217ae6c7263d781864dc9eac18b0ef;p=citadel.git

Removed double-fetch-room in the indexer.

I don't want to celebrate prematurely, but we've gotten through 10,000 ops
in every of 10 threads without deadlocking.
---

diff --git a/citadel/server/modules/fulltext/serv_fulltext.c b/citadel/server/modules/fulltext/serv_fulltext.c
index 6909e9f47..216097174 100644
--- a/citadel/server/modules/fulltext/serv_fulltext.c
+++ b/citadel/server/modules/fulltext/serv_fulltext.c
@@ -126,13 +126,11 @@ void ft_index_room(struct ctdlroom *qrbuf, void *data) {
 	if (server_shutting_down) {
 		return;
 	}
-	CtdlGetRoom(&CC->room, qrbuf->QRname);
 
-#if 0
 	int num_msgs = 0;
 	long *msglist;
 	int i;
-	num_msgs = CtdlFetchMsgList(CC->room.QRnumber, &msglist);
+	num_msgs = CtdlFetchMsgList(qrbuf->QRnumber, &msglist);
 	if (msglist != NULL) {
 		for (i=0; i<num_msgs; ++i) {
 			if (
@@ -145,7 +143,6 @@ void ft_index_room(struct ctdlroom *qrbuf, void *data) {
 		}
 		free(msglist);
 	}
-#endif
 }