X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Ffulltext%2Fserv_fulltext.c;h=17c755da53308264df17b0defac5479007229e59;hb=dc48bee02071eb3eb2f535e203c36c528e1547a8;hp=3709ef6319398c3515143af9871a7e473e9fcdfc;hpb=9571de81331e169c042c630800bff1bde499c8a9;p=citadel.git diff --git a/citadel/modules/fulltext/serv_fulltext.c b/citadel/modules/fulltext/serv_fulltext.c index 3709ef631..17c755da5 100644 --- a/citadel/modules/fulltext/serv_fulltext.c +++ b/citadel/modules/fulltext/serv_fulltext.c @@ -1,6 +1,6 @@ /* * This module handles fulltext indexing of the message base. - * Copyright (c) 2005-2015 by the citadel.org team + * Copyright (c) 2005-2018 by the citadel.org team * * This program is open source software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -80,6 +80,7 @@ int longcmp(const void *rec1, const void *rec2) { return(0); } + /* * Flush our index cache out to disk. */ @@ -90,7 +91,7 @@ void ft_flush_cache(void) { for (i=0; i<65536; ++i) { if ((time(NULL) - last_update) >= 10) { syslog(LOG_INFO, - "Flushing index cache to disk (%d%% complete)", + "fulltext: flushing index cache to disk (%d%% complete)", (i * 100 / 65536) ); last_update = time(NULL); @@ -103,7 +104,7 @@ void ft_flush_cache(void) { ftc_msgs[i] = NULL; } } - syslog(LOG_INFO, "Flushed index cache to disk (100%% complete)"); + syslog(LOG_INFO, "fulltext: flushed index cache to disk (100%% complete)"); } @@ -122,17 +123,17 @@ void ft_index_message(long msgnum, int op) { msg = CtdlFetchMessage(msgnum, 1, 1); if (msg == NULL) { - syslog(LOG_ERR, "ft_index_message() could not load msg %ld", msgnum); + syslog(LOG_ERR, "fulltext: ft_index_message() could not load msg %ld", msgnum); return; } if (!CM_IsEmpty(msg, eSuppressIdx)) { - syslog(LOG_DEBUG, "ft_index_message() excluded msg %ld", msgnum); + syslog(LOG_DEBUG, "fulltext: ft_index_message() excluded msg %ld", msgnum); CM_Free(msg); return; } - syslog(LOG_DEBUG, "ft_index_message() %s msg %ld", (op ? "adding" : "removing") , msgnum); + syslog(LOG_DEBUG, "fulltext: ft_index_message() %s msg %ld", (op ? "adding" : "removing") , msgnum); /* Output the message as text before indexing it, so we don't end up * indexing a bunch of encoded base64, etc. @@ -143,13 +144,13 @@ void ft_index_message(long msgnum, int op) { msgtext = CC->redirect_buffer; CC->redirect_buffer = NULL; if (msgtext != NULL) { - syslog(LOG_DEBUG, "Wordbreaking message %ld (%d bytes)", msgnum, StrLength(msgtext)); + syslog(LOG_DEBUG, "fulltext: wordbreaking message %ld (%d bytes)", msgnum, StrLength(msgtext)); } txt = SmashStrBuf(&msgtext); wordbreaker(txt, &num_tokens, &tokens); free(txt); - syslog(LOG_DEBUG, "Indexing message %ld [%d tokens]", msgnum, num_tokens); + syslog(LOG_DEBUG, "fulltext: indexing message %ld [%d tokens]", msgnum, num_tokens); if (num_tokens > 0) { for (i=0; i ft_num_alloc) { ft_num_alloc += 1024; - ft_newmsgs = realloc(ft_newmsgs, - (ft_num_alloc * sizeof(long))); + ft_newmsgs = realloc(ft_newmsgs, (ft_num_alloc * sizeof(long))); } ft_newmsgs[ft_num_msgs - 1] = msgnum; } } + /* * Scan a room for messages to index. */ @@ -240,14 +240,11 @@ void ft_index_room(struct ctdlroom *qrbuf, void *data) */ void do_fulltext_indexing(void) { int i; - static time_t last_index = 0L; static time_t last_progress = 0L; - time_t run_time = 0L; - time_t end_time = 0L; static int is_running = 0; if (is_running) return; /* Concurrency check - only one can run */ is_running = 1; - + /* * Don't do this if the site doesn't have it enabled. */ @@ -256,43 +253,26 @@ void do_fulltext_indexing(void) { } /* - * Make sure we don't run the indexer too frequently. - * FIXME move the setting into config - */ - - if ( (time(NULL) - last_index) < 300L) { - return; - } - - /* - * Check to see whether the fulltext index is up to date; if there - * are no messages to index, don't waste any more time trying. - */ - if ( - (CtdlGetConfigLong("MMfulltext") >= CtdlGetConfigLong("MMhighest")) - && (CtdlGetConfigInt("MM_fulltext_wordbreaker") == FT_WORDBREAKER_ID) - ) { - return; /* nothing to do! */ - } - - run_time = time(NULL); - syslog(LOG_DEBUG, "do_fulltext_indexing() started (%ld)", run_time); - - /* - * If we've switched wordbreaker modules, burn the index and start - * over. + * If we've switched wordbreaker modules, burn the index and start over. */ begin_critical_section(S_CONTROL); if (CtdlGetConfigInt("MM_fulltext_wordbreaker") != FT_WORDBREAKER_ID) { - syslog(LOG_DEBUG, "wb ver on disk = %d, code ver = %d", + syslog(LOG_DEBUG, "fulltext: wb ver on disk = %d, code ver = %d", CtdlGetConfigInt("MM_fulltext_wordbreaker"), FT_WORDBREAKER_ID ); - syslog(LOG_INFO, "(re)initializing full text index"); + syslog(LOG_INFO, "fulltext: (re)initializing index"); cdb_trunc(CDB_FULLTEXT); CtdlSetConfigLong("MMfulltext", 0); } end_critical_section(S_CONTROL); + /* + * Silently return if our fulltext index is up to date with new messages. + */ + if ((CtdlGetConfigLong("MMfulltext") >= CtdlGetConfigLong("MMhighest"))) { + return; /* nothing to do! */ + } + /* * Now go through each room and find messages to index. */ @@ -314,7 +294,7 @@ void do_fulltext_indexing(void) { for (i=0; i= FT_MAX_CACHE) { - syslog(LOG_DEBUG, "Time to flush."); + syslog(LOG_DEBUG, "fulltext: time to flush."); ft_newhighest = ft_newmsgs[i]; break; } @@ -343,30 +323,25 @@ void do_fulltext_indexing(void) { ft_num_alloc = 0; ft_newmsgs = NULL; } - end_time = time(NULL); if (server_shutting_down) { is_running = 0; return; } - syslog(LOG_DEBUG, "do_fulltext_indexing() duration (%ld)", end_time - run_time); - /* Save our place so we don't have to do this again */ ft_flush_cache(); begin_critical_section(S_CONTROL); CtdlSetConfigLong("MMfulltext", ft_newhighest); CtdlSetConfigInt("MM_fulltext_wordbreaker", FT_WORDBREAKER_ID); end_critical_section(S_CONTROL); - last_index = time(NULL); - syslog(LOG_DEBUG, "do_fulltext_indexing() finished"); + syslog(LOG_DEBUG, "fulltext: indexing finished"); is_running = 0; return; } - /* * API call to perform searches. * (This one does the "all of these words" search.) @@ -476,6 +451,7 @@ void cmd_srch(char *argbuf) { cprintf("000\n"); } + /* * Zero out our index cache. */ @@ -495,6 +471,7 @@ void ft_delete_remove(char *room, long msgnum) } } + /*****************************************************************************/ CTDL_MODULE_INIT(fulltext)