From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 21 Jan 2016 16:45:54 +0000 (+0000)
Subject: Use the unified checkpoints function in fuzzy_backend
X-Git-Tag: 1.1.2~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43c355805a1be1cddff3c289db20c9b947d4833a;p=thirdparty%2Frspamd.git

Use the unified checkpoints function in fuzzy_backend
---

diff --git a/src/libserver/fuzzy_backend.c b/src/libserver/fuzzy_backend.c
index 3f0bed4651..1005e75ec7 100644
--- a/src/libserver/fuzzy_backend.c
+++ b/src/libserver/fuzzy_backend.c
@@ -698,7 +698,7 @@ rspamd_fuzzy_backend_add (struct rspamd_fuzzy_backend *backend,
 gboolean
 rspamd_fuzzy_backend_finish_update (struct rspamd_fuzzy_backend *backend)
 {
-	gint rc, wal_frames, wal_checkpointed, mode;
+	gint rc, wal_frames, wal_checkpointed;
 
 	rc = rspamd_fuzzy_backend_run_stmt (backend, TRUE,
 			RSPAMD_FUZZY_BACKEND_TRANSACTION_COMMIT);
@@ -711,28 +711,14 @@ rspamd_fuzzy_backend_finish_update (struct rspamd_fuzzy_backend *backend)
 		return FALSE;
 	}
 	else {
-#ifdef SQLITE_OPEN_WAL
-#ifdef SQLITE_CHECKPOINT_TRUNCATE
-		mode = SQLITE_CHECKPOINT_TRUNCATE;
-#elif defined(SQLITE_CHECKPOINT_RESTART)
-		mode = SQLITE_CHECKPOINT_RESTART;
-#elif defined(SQLITE_CHECKPOINT_FULL)
-		mode = SQLITE_CHECKPOINT_FULL;
-#endif
-		/* Perform wal checkpoint (might be long) */
-		if (sqlite3_wal_checkpoint_v2 (backend->db,
-				NULL,
-				mode,
-				&wal_frames,
-				&wal_checkpointed) != SQLITE_OK) {
+		if (!rspamd_sqlite3_sync (backend->db, &wal_frames, &wal_checkpointed)) {
 			msg_warn_fuzzy_backend ("cannot commit checkpoint: %s",
 					sqlite3_errmsg (backend->db));
 		}
-		else {
+		else if (wal_checkpointed > 0) {
 			msg_info_fuzzy_backend ("total number of frames in the wal file: "
 					"%d, checkpointed: %d", wal_frames, wal_checkpointed);
 		}
-#endif
 	}
 
 	return TRUE;