diff options
| -rw-r--r-- | src/fuzzy_storage.c | 3 | ||||
| -rw-r--r-- | src/libserver/fuzzy_backend.c | 14 | ||||
| -rw-r--r-- | src/libserver/fuzzy_backend.h | 6 |
3 files changed, 9 insertions, 14 deletions
diff --git a/src/fuzzy_storage.c b/src/fuzzy_storage.c index 04498f84d..31cde97a1 100644 --- a/src/fuzzy_storage.c +++ b/src/fuzzy_storage.c @@ -394,7 +394,6 @@ rspamd_fuzzy_process_updates_queue (struct rspamd_fuzzy_storage_ctx *ctx, gpointer ptr; struct rspamd_fuzzy_mirror *m; guint nupdates = 0, i; - time_t now = time (NULL); if (ctx->updates_pending && g_queue_get_length (ctx->updates_pending) > 0 && @@ -414,7 +413,7 @@ rspamd_fuzzy_process_updates_queue (struct rspamd_fuzzy_storage_ctx *ctx, } if (cmd->cmd == FUZZY_WRITE) { - rspamd_fuzzy_backend_add (ctx->backend, ptr, now); + rspamd_fuzzy_backend_add (ctx->backend, ptr); } else { rspamd_fuzzy_backend_del (ctx->backend, ptr); diff --git a/src/libserver/fuzzy_backend.c b/src/libserver/fuzzy_backend.c index e58e8a546..5a22377bb 100644 --- a/src/libserver/fuzzy_backend.c +++ b/src/libserver/fuzzy_backend.c @@ -135,14 +135,14 @@ static struct rspamd_fuzzy_stmts { { .idx = RSPAMD_FUZZY_BACKEND_INSERT, .sql = "INSERT INTO digests(flag, digest, value, time) VALUES" - "(?1, ?2, ?3, ?4);", - .args = "SDII", + "(?1, ?2, ?3, strftime('%s','now'));", + .args = "SDI", .stmt = NULL, .result = SQLITE_DONE }, { .idx = RSPAMD_FUZZY_BACKEND_UPDATE, - .sql = "UPDATE digests SET value = value + ?1 WHERE " + .sql = "UPDATE digests SET value = value + ?1, time = strftime('%s','now') WHERE " "digest==?2;", .args = "ID", .stmt = NULL, @@ -150,7 +150,7 @@ static struct rspamd_fuzzy_stmts { }, { .idx = RSPAMD_FUZZY_BACKEND_UPDATE_FLAG, - .sql = "UPDATE digests SET value = ?1, flag = ?2 WHERE " + .sql = "UPDATE digests SET value = ?1, flag = ?2, time = strftime('%s','now') WHERE " "digest==?3;", .args = "IID", .stmt = NULL, @@ -662,8 +662,7 @@ rspamd_fuzzy_backend_prepare_update (struct rspamd_fuzzy_backend *backend, gboolean rspamd_fuzzy_backend_add (struct rspamd_fuzzy_backend *backend, - const struct rspamd_fuzzy_cmd *cmd, - time_t timestamp) + const struct rspamd_fuzzy_cmd *cmd) { int rc, i; gint64 id, flag; @@ -740,8 +739,7 @@ rspamd_fuzzy_backend_add (struct rspamd_fuzzy_backend *backend, RSPAMD_FUZZY_BACKEND_INSERT, (gint) (1U << (cmd->flag - 1)), cmd->digest, - (gint64) cmd->value, - (gint64) timestamp); + (gint64) cmd->value); if (rc == SQLITE_OK) { if (cmd->shingles_count > 0) { diff --git a/src/libserver/fuzzy_backend.h b/src/libserver/fuzzy_backend.h index 91a613f2a..6ce50866d 100644 --- a/src/libserver/fuzzy_backend.h +++ b/src/libserver/fuzzy_backend.h @@ -55,10 +55,8 @@ gboolean rspamd_fuzzy_backend_prepare_update (struct rspamd_fuzzy_backend *backe * @param cmd * @return */ -gboolean rspamd_fuzzy_backend_add ( - struct rspamd_fuzzy_backend *backend, - const struct rspamd_fuzzy_cmd *cmd, - time_t timestamp); +gboolean rspamd_fuzzy_backend_add (struct rspamd_fuzzy_backend *backend, + const struct rspamd_fuzzy_cmd *cmd); /** * Delete digest from the database |