/*
* This is a data store backend for the Citadel server which uses Berkeley DB.
*
- * Copyright (c) 1987-2016 by the citadel.org team
+ * Copyright (c) 1987-2017 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 version 3.
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
*/
/*****************************************************************************
/*****************************************************************************/
#include "sysdep.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/stat.h>
#include <stdio.h>
#include <dirent.h>
#include <zlib.h>
void cdb_abort(void) {
- syslog(LOG_DEBUG,
- "citserver is stopping in order to prevent data loss. uid=%d gid=%d euid=%d egid=%d",
+ syslog(LOG_DEBUG, "db: citserver is stopping in order to prevent data loss. uid=%d gid=%d euid=%d egid=%d",
getuid(),
getgid(),
geteuid(),
getegid()
);
- cit_backtrace();
exit(CTDLEXIT_DB);
}
void cdb_verbose_log(const DB_ENV *dbenv, const char *msg)
{
if (!IsEmptyStr(msg)) {
- syslog(LOG_DEBUG, "DB: %s", msg);
- cit_backtrace();
+ syslog(LOG_DEBUG, "db: %s", msg);
}
}
void cdb_verbose_err(const DB_ENV *dbenv, const char *errpfx, const char *msg)
{
int *FOO = NULL;
- syslog(LOG_ALERT, "DB: %s", msg);
- cit_backtrace();
+ syslog(LOG_ERR, "db: %s", msg);
*FOO = 1;
}
ret = tid->abort(tid);
if (ret) {
- syslog(LOG_EMERG, "bdb(): txn_abort: %s", db_strerror(ret));
+ syslog(LOG_ERR, "db: txn_abort: %s", db_strerror(ret));
cdb_abort();
}
}
ret = tid->commit(tid, 0);
if (ret) {
- syslog(LOG_EMERG, "bdb(): txn_commit: %s", db_strerror(ret));
+ syslog(LOG_ERR, "db: txn_commit: %s", db_strerror(ret));
cdb_abort();
}
}
ret = dbenv->txn_begin(dbenv, NULL, tid, 0);
if (ret) {
- syslog(LOG_EMERG, "bdb(): txn_begin: %s", db_strerror(ret));
+ syslog(LOG_ERR, "db: txn_begin: %s", db_strerror(ret));
cdb_abort();
}
}
static void dbpanic(DB_ENV * env, int errval)
{
- syslog(LOG_EMERG, "bdb(): PANIC: %s", db_strerror(errval));
- cit_backtrace();
+ syslog(LOG_ERR, "db: PANIC: %s", db_strerror(errval));
}
static void cclose(DBC * cursor)
int ret;
if ((ret = cursor->c_close(cursor))) {
- syslog(LOG_EMERG, "bdb(): c_close: %s", db_strerror(ret));
+ syslog(LOG_ERR, "db: c_close: %s", db_strerror(ret));
cdb_abort();
}
}
for (i = 0; i < MAXCDB; i++)
if (cursors[i] != NULL) {
- syslog(LOG_EMERG, "bdb(): cursor still in progress on cdb %02x: %s", i, msg);
+ syslog(LOG_ERR, "db: cursor still in progress on cdb %02x: %s", i, msg);
cdb_abort();
}
}
bailIfCursor(TSD->cursors, "in check_handles");
if (TSD->tid != NULL) {
- syslog(LOG_EMERG, "bdb(): transaction still in progress!");
+ syslog(LOG_ERR, "db: transaction still in progress!");
cdb_abort();
}
}
/*
- * Cull the database logs
+ * Cull the database logs by removing log files that are no longer needed.
+ * Note: this code will be removed once we are confident that Berkeley DB can do this on its own.
*/
void cdb_cull_logs(void)
{
/* Get the list of names. */
if ((ret = dbenv->log_archive(dbenv, &list, flags)) != 0) {
- syslog(LOG_ERR, "cdb_cull_logs: %s", db_strerror(ret));
+ syslog(LOG_ERR, "db: cdb_cull_logs() %s", db_strerror(ret));
return;
}
/* Print the list of names. */
if (list != NULL) {
for (file = list; *file != NULL; ++file) {
- syslog(LOG_DEBUG, "Deleting log: %s", *file);
+ syslog(LOG_DEBUG, "db: deleting log %s", *file);
ret = unlink(*file);
if (ret != 0) {
snprintf(errmsg, sizeof(errmsg),
{
int ret;
- MARKM_syslog(LOG_DEBUG, "-- db checkpoint --");
+ syslog(LOG_DEBUG, "db: -- checkpoint --");
ret = dbenv->txn_checkpoint(dbenv, MAX_CHECKPOINT_KBYTES, MAX_CHECKPOINT_MINUTES, 0);
if (ret != 0) {
- syslog(LOG_EMERG, "cdb_checkpoint: txn_checkpoint: %s", db_strerror(ret));
+ syslog(LOG_ERR, "db: cdb_checkpoint() txn_checkpoint: %s", db_strerror(ret));
cdb_abort();
}
/* After a successful checkpoint, we can cull the unused logs */
if (CtdlGetConfigInt("c_auto_cull")) {
- cdb_cull_logs();
+#ifdef DB_LOG_AUTO_REMOVE
+ ret = dbenv->log_set_config(dbenv, DB_LOG_AUTO_REMOVE, 1); // This version of Berkeley DB can cull the logs on its own!
+#else
+ cdb_cull_logs(); // Citadel knows how to do it too.
+#endif
}
+#ifdef DB_LOG_AUTO_REMOVE
+ else {
+ ret = dbenv->log_set_config(dbenv, DB_LOG_AUTO_REMOVE, 0);
+ }
+#endif
}
u_int32_t flags = 0;
int dbversion_major, dbversion_minor, dbversion_patch;
- syslog(LOG_DEBUG, "bdb(): open_databases() starting");
- syslog(LOG_DEBUG, "Compiled db: %s", DB_VERSION_STRING);
- syslog(LOG_INFO, " Linked db: %s", db_version(&dbversion_major, &dbversion_minor, &dbversion_patch));
- syslog(LOG_INFO, "Linked zlib: %s\n", zlibVersion());
+ syslog(LOG_DEBUG, "db: open_databases() starting");
+ syslog(LOG_DEBUG, "db: Compiled libdb: %s", DB_VERSION_STRING);
+ syslog(LOG_DEBUG, "db: Linked libdb: %s", db_version(&dbversion_major, &dbversion_minor, &dbversion_patch));
+ syslog(LOG_DEBUG, "db: Linked zlib: %s", zlibVersion());
/*
* Silently try to create the database subdirectory. If it's
* already there, no problem.
*/
if ((mkdir(ctdl_data_dir, 0700) != 0) && (errno != EEXIST)){
- syslog(LOG_EMERG,
- "unable to create database directory [%s]: %s",
- ctdl_data_dir, strerror(errno));
+ syslog(LOG_ERR, "db: unable to create database directory [%s]: %m", ctdl_data_dir);
}
if (chmod(ctdl_data_dir, 0700) != 0){
- syslog(LOG_EMERG,
- "unable to set database directory accessrights [%s]: %s",
- ctdl_data_dir, strerror(errno));
+ syslog(LOG_ERR, "db: unable to set database directory accessrights [%s]: %m", ctdl_data_dir);
}
if (chown(ctdl_data_dir, CTDLUID, (-1)) != 0){
- syslog(LOG_EMERG,
- "unable to set the owner for [%s]: %s",
- ctdl_data_dir, strerror(errno));
+ syslog(LOG_ERR, "db: unable to set the owner for [%s]: %m", ctdl_data_dir);
}
- syslog(LOG_DEBUG, "bdb(): Setting up DB environment\n");
+ syslog(LOG_DEBUG, "db: Setting up DB environment\n");
/* db_env_set_func_yield((int (*)(u_long, u_long))sched_yield); */
ret = db_env_create(&dbenv, 0);
if (ret) {
- syslog(LOG_EMERG, "bdb(): db_env_create: %s\n", db_strerror(ret));
- syslog(LOG_EMERG, "exit code %d\n", ret);
+ syslog(LOG_ERR, "db: db_env_create: %s", db_strerror(ret));
+ syslog(LOG_ERR, "db: exit code %d", ret);
exit(CTDLEXIT_DB);
}
dbenv->set_errpfx(dbenv, "citserver");
*/
ret = dbenv->set_cachesize(dbenv, 0, 64 * 1024, 0);
if (ret) {
- syslog(LOG_EMERG, "bdb(): set_cachesize: %s\n", db_strerror(ret));
+ syslog(LOG_ERR, "db: set_cachesize: %s", db_strerror(ret));
dbenv->close(dbenv, 0);
- syslog(LOG_EMERG, "exit code %d\n", ret);
+ syslog(LOG_ERR, "db: exit code %d", ret);
exit(CTDLEXIT_DB);
}
if ((ret = dbenv->set_lk_detect(dbenv, DB_LOCK_DEFAULT))) {
- syslog(LOG_EMERG, "bdb(): set_lk_detect: %s\n", db_strerror(ret));
+ syslog(LOG_ERR, "db: set_lk_detect: %s", db_strerror(ret));
dbenv->close(dbenv, 0);
- syslog(LOG_EMERG, "exit code %d\n", ret);
+ syslog(LOG_ERR, "db: exit code %d", ret);
exit(CTDLEXIT_DB);
}
flags = DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_INIT_TXN | DB_INIT_LOCK | DB_THREAD | DB_RECOVER;
- syslog(LOG_DEBUG, "dbenv->open(dbenv, %s, %d, 0)\n", ctdl_data_dir, flags);
+ syslog(LOG_DEBUG, "db: dbenv->open(dbenv, %s, %d, 0)", ctdl_data_dir, flags);
ret = dbenv->open(dbenv, ctdl_data_dir, flags, 0);
if (ret == DB_RUNRECOVERY) {
- syslog(LOG_ALERT, "dbenv->open: %s\n", db_strerror(ret));
- syslog(LOG_ALERT, "Attempting recovery...\n");
+ syslog(LOG_ERR, "db: dbenv->open: %s", db_strerror(ret));
+ syslog(LOG_ERR, "db: attempting recovery...");
flags |= DB_RECOVER;
ret = dbenv->open(dbenv, ctdl_data_dir, flags, 0);
}
if (ret == DB_RUNRECOVERY) {
- syslog(LOG_ALERT, "dbenv->open: %s\n", db_strerror(ret));
- syslog(LOG_ALERT, "Attempting catastrophic recovery...\n");
+ syslog(LOG_ERR, "db: dbenv->open: %s", db_strerror(ret));
+ syslog(LOG_ERR, "db: attempting catastrophic recovery...");
flags &= ~DB_RECOVER;
flags |= DB_RECOVER_FATAL;
ret = dbenv->open(dbenv, ctdl_data_dir, flags, 0);
}
if (ret) {
- syslog(LOG_EMERG, "dbenv->open: %s\n", db_strerror(ret));
+ syslog(LOG_ERR, "db: dbenv->open: %s", db_strerror(ret));
dbenv->close(dbenv, 0);
- syslog(LOG_EMERG, "exit code %d\n", ret);
+ syslog(LOG_ERR, "db: exit code %d", ret);
exit(CTDLEXIT_DB);
}
- syslog(LOG_INFO, "Starting up DB\n");
+ syslog(LOG_INFO, "db: mounting databases");
for (i = 0; i < MAXCDB; ++i) {
/* Create a database handle */
ret = db_create(&dbp[i], dbenv, 0);
if (ret) {
- syslog(LOG_EMERG, "db_create: %s\n", db_strerror(ret));
- syslog(LOG_EMERG, "exit code %d\n", ret);
+ syslog(LOG_ERR, "db: db_create: %s", db_strerror(ret));
+ syslog(LOG_ERR, "db: exit code %d", ret);
exit(CTDLEXIT_DB);
}
0600
);
if (ret) {
- syslog(LOG_EMERG, "db_open[%02x]: %s\n", i, db_strerror(ret));
+ syslog(LOG_ERR, "db: db_open[%02x]: %s", i, db_strerror(ret));
if (ret == ENOMEM) {
- syslog(LOG_EMERG, "You may need to tune your database; please read http://www.citadel.org/doku.php?id=faq:troubleshooting:out_of_lock_entries for more information.");
+ syslog(LOG_ERR, "db: You may need to tune your database; please read http://www.citadel.org/doku.php?id=faq:troubleshooting:out_of_lock_entries for more information.");
}
- syslog(LOG_EMERG, "exit code %d\n", ret);
+ syslog(LOG_ERR, "db: exit code %d", ret);
exit(CTDLEXIT_DB);
}
}
if (dp != NULL) {
while (d = readdir(dp), d != NULL) {
if (d->d_name[0] != '.') {
- snprintf(filename, sizeof filename,
- "%s/%s", ctdl_data_dir, d->d_name);
- syslog(LOG_DEBUG, "chmod(%s, 0600) returned %d\n",
- filename, chmod(filename, 0600)
- );
- syslog(LOG_DEBUG, "chown(%s, CTDLUID, -1) returned %d\n",
+ snprintf(filename, sizeof filename, "%s/%s", ctdl_data_dir, d->d_name);
+ syslog(LOG_DEBUG, "db: chmod(%s, 0600) returned %d", filename, chmod(filename, 0600));
+ syslog(LOG_DEBUG, "db: chown(%s, CTDLUID, -1) returned %d",
filename, chown(filename, CTDLUID, (-1))
);
}
closedir(dp);
}
- syslog(LOG_DEBUG, "open_databases() finished\n");
+ syslog(LOG_DEBUG, "db: open_databases() finished");
}
int a;
int ret;
+ syslog(LOG_INFO, "db: performing final checkpoint");
if ((ret = dbenv->txn_checkpoint(dbenv, 0, 0, 0))) {
- syslog(LOG_EMERG,
- "txn_checkpoint: %s\n", db_strerror(ret));
+ syslog(LOG_ERR, "txn_checkpoint: %s", db_strerror(ret));
+ }
+
+ syslog(LOG_INFO, "db: flushing the database logs");
+ if ((ret = dbenv->log_flush(dbenv, NULL))) {
+ syslog(LOG_ERR, "db: log_flush: %s", db_strerror(ret));
}
/* print some statistics... */
/* close the tables */
for (a = 0; a < MAXCDB; ++a) {
- syslog(LOG_INFO, "Closing database %02x\n", a);
+ syslog(LOG_INFO, "db: closing database %02x", a);
ret = dbp[a]->close(dbp[a], 0);
if (ret) {
- syslog(LOG_EMERG, "db_close: %s\n", db_strerror(ret));
+ syslog(LOG_ERR, "db: db_close: %s", db_strerror(ret));
}
}
/* Close the handle. */
ret = dbenv->close(dbenv, 0);
if (ret) {
- syslog(LOG_EMERG, "DBENV->close: %s\n", db_strerror(ret));
+ syslog(LOG_EMERG, "db: DBENV->close: %s", db_strerror(ret));
}
}
if (uncompress((Bytef *) uncompressed_data,
(uLongf *) & destLen,
(const Bytef *) compressed_data,
- (uLong) sourceLen) != Z_OK) {
- syslog(LOG_EMERG, "uncompress() error\n");
+ (uLong) sourceLen) != Z_OK)
+ {
+ syslog(LOG_EMERG, "db: uncompress() error");
cdb_abort();
}
}
-
/*
* Store a piece of data. Returns 0 if the operation was successful. If a
* key already exists it should be overwritten.
memset(&dkey, 0, sizeof(DBT));
memset(&ddata, 0, sizeof(DBT));
dkey.size = ckeylen;
- /* no, we don't care for this error. */
- dkey.data = ckey;
-
+ dkey.data = (void *)ckey;
ddata.size = cdatalen;
ddata.data = cdata;
- /* Only compress Visit records. Everything else is uncompressed. */
- if (cdb == CDB_VISIT) {
+ /* Only compress Visit and UseTable records. Everything else is uncompressed. */
+ if ( (cdb == CDB_VISIT) || (cdb == CDB_USETABLE) ) {
compressing = 1;
zheader.magic = COMPRESS_MAGIC;
zheader.uncompressed_len = cdatalen;
- buffer_len = ((cdatalen * 101) / 100) + 100
- + sizeof(struct CtdlCompressHeader);
+ buffer_len = ((cdatalen * 101) / 100) + 100 + sizeof(struct CtdlCompressHeader);
destLen = (uLongf) buffer_len;
compressed_data = malloc(buffer_len);
if (compress2((Bytef *) (compressed_data + sizeof(struct CtdlCompressHeader)),
&destLen, (Bytef *) cdata, (uLongf) cdatalen, 1) != Z_OK)
{
- syslog(LOG_EMERG, "compress2() error\n");
+ syslog(LOG_EMERG, "db: compress2() error");
cdb_abort();
}
zheader.compressed_len = (size_t) destLen;
&ddata, /* data */
0); /* flags */
if (ret) {
- syslog(LOG_EMERG, "cdb_store(%d): %s", cdb, db_strerror(ret));
+ syslog(LOG_EMERG, "db: cdb_store(%d): %s", cdb, db_strerror(ret));
cdb_abort();
}
if (compressing)
free(compressed_data);
return ret;
-
- } else {
+ }
+ else {
bailIfCursor(TSD->cursors, "attempt to write during r/o cursor");
retry:
txabort(tid);
goto retry;
} else {
- syslog(LOG_EMERG, "cdb_store(%d): %s", cdb, db_strerror(ret));
+ syslog(LOG_EMERG, "db: cdb_store(%d): %s", cdb, db_strerror(ret));
cdb_abort();
}
} else {
if (TSD->tid != NULL) {
ret = dbp[cdb]->del(dbp[cdb], TSD->tid, &dkey, 0);
if (ret) {
- syslog(LOG_EMERG, "cdb_delete(%d): %s\n", cdb, db_strerror(ret));
+ syslog(LOG_EMERG, "db: cdb_delete(%d): %s", cdb, db_strerror(ret));
if (ret != DB_NOTFOUND) {
cdb_abort();
}
txabort(tid);
goto retry;
} else {
- syslog(LOG_EMERG, "cdb_delete(%d): %s\n",
- cdb, db_strerror(ret));
+ syslog(LOG_EMERG, "db: cdb_delete(%d): %s", cdb, db_strerror(ret));
cdb_abort();
}
} else {
ret = TSD->cursors[cdb]->c_dup(TSD->cursors[cdb], &curs, DB_POSITION);
if (ret) {
- syslog(LOG_EMERG, "localcursor: %s\n", db_strerror(ret));
+ syslog(LOG_EMERG, "db: localcursor: %s", db_strerror(ret));
cdb_abort();
}
memset(&dkey, 0, sizeof(DBT));
dkey.size = keylen;
- /* no we don't care about this error. */
- dkey.data = key;
+ dkey.data = (void *)key;
if (TSD->tid != NULL) {
memset(&dret, 0, sizeof(DBT));
}
if ((ret != 0) && (ret != DB_NOTFOUND)) {
- syslog(LOG_EMERG, "cdb_fetch(%d): %s\n", cdb, db_strerror(ret));
+ syslog(LOG_EMERG, "db: cdb_fetch(%d): %s", cdb, db_strerror(ret));
cdb_abort();
}
tempcdb = (struct cdbdata *) malloc(sizeof(struct cdbdata));
if (tempcdb == NULL) {
- syslog(LOG_EMERG, "cdb_fetch: Cannot allocate memory for tempcdb\n");
+ syslog(LOG_EMERG, "db: cdb_fetch: Cannot allocate memory for tempcdb");
cdb_abort();
return NULL; /* make it easier for static analysis... */
}
int ret = 0;
if (TSD->cursors[cdb] != NULL) {
- syslog(LOG_EMERG,
- "cdb_rewind: must close cursor on database %d before reopening.\n", cdb);
+ syslog(LOG_EMERG, "db: cdb_rewind: must close cursor on database %d before reopening", cdb);
cdb_abort();
/* cclose(TSD->cursors[cdb]); */
}
*/
ret = dbp[cdb]->cursor(dbp[cdb], TSD->tid, &TSD->cursors[cdb], 0);
if (ret) {
- syslog(LOG_EMERG, "cdb_rewind: db_cursor: %s\n", db_strerror(ret));
+ syslog(LOG_EMERG, "db: cdb_rewind: db_cursor: %s", db_strerror(ret));
cdb_abort();
}
}
if (ret) {
if (ret != DB_NOTFOUND) {
- syslog(LOG_EMERG, "cdb_next_item(%d): %s\n", cdb, db_strerror(ret));
+ syslog(LOG_EMERG, "db: cdb_next_item(%d): %s", cdb, db_strerror(ret));
cdb_abort();
}
cdb_close_cursor(cdb);
bailIfCursor(TSD->cursors, "can't begin transaction during r/o cursor");
if (TSD->tid != NULL) {
- syslog(LOG_EMERG, "cdb_begin_transaction: ERROR: nested transaction\n");
+ syslog(LOG_EMERG, "db: cdb_begin_transaction: ERROR: nested transaction");
cdb_abort();
}
for (i = 0; i < MAXCDB; i++)
if (TSD->cursors[i] != NULL) {
- syslog(LOG_WARNING,
- "cdb_end_transaction: WARNING: cursor %d still open at transaction end\n",
- i);
+ syslog(LOG_WARNING, "db: cdb_end_transaction: WARNING: cursor %d still open at transaction end", i);
cclose(TSD->cursors[i]);
TSD->cursors[i] = NULL;
}
if (TSD->tid == NULL) {
- syslog(LOG_EMERG,
- "cdb_end_transaction: ERROR: txcommit(NULL) !!\n");
+ syslog(LOG_ERR, "db: cdb_end_transaction: ERROR: txcommit(NULL) !!");
cdb_abort();
- } else {
+ }
+ else {
txcommit(TSD->tid);
}
u_int32_t count;
if (TSD->tid != NULL) {
- syslog(LOG_EMERG, "cdb_trunc must not be called in a transaction.");
+ syslog(LOG_EMERG, "db: cdb_trunc must not be called in a transaction.");
cdb_abort();
- } else {
+ }
+ else {
bailIfCursor(TSD->cursors, "attempt to write during r/o cursor");
retry:
/* txabort(tid); */
goto retry;
} else {
- syslog(LOG_EMERG, "cdb_truncate(%d): %s\n", cdb, db_strerror(ret));
+ syslog(LOG_EMERG, "db: cdb_truncate(%d): %s", cdb, db_strerror(ret));
if (ret == ENOMEM) {
- syslog(LOG_EMERG, "You may need to tune your database; please read http://www.citadel.org/doku.php?id=faq:troubleshooting:out_of_lock_entries for more information.");
+ syslog(LOG_EMERG, "db: You may need to tune your database; please read http://www.citadel.org/doku.php?id=faq:troubleshooting:out_of_lock_entries for more information.");
}
exit(CTDLEXIT_DB);
}
}
}
-int SeentDebugEnabled = 0;
-
-#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (SeentDebugEnabled != 0))
-#define SEENM_syslog(LEVEL, FORMAT) \
- DBGLOG(LEVEL) syslog(LEVEL, \
- "%s[%ld]CC[%ld] SEEN[%s][%d] " FORMAT, \
- IOSTR, ioid, ccid, Facility, cType)
-
-#define SEEN_syslog(LEVEL, FORMAT, ...) \
- DBGLOG(LEVEL) syslog(LEVEL, \
- "%s[%ld]CC[%ld] SEEN[%s][%d] " FORMAT, \
- IOSTR, ioid, ccid, Facility, cType, \
- __VA_ARGS__)
-
-time_t CheckIfAlreadySeen(const char *Facility,
- StrBuf *guid,
- time_t now,
- time_t antiexpire,
- eCheckType cType,
- long ccid,
- long ioid)
-{
- time_t InDBTimeStamp = 0;
- struct UseTable ut;
- struct cdbdata *cdbut;
- if (cType != eWrite)
- {
- SEEN_syslog(LOG_DEBUG, "Loading [%s]", ChrPtr(guid));
- cdbut = cdb_fetch(CDB_USETABLE, SKEY(guid));
- if ((cdbut != NULL) && (cdbut->ptr != NULL)) {
- memcpy(&ut, cdbut->ptr,
- ((cdbut->len > sizeof(struct UseTable)) ?
- sizeof(struct UseTable) : cdbut->len));
- InDBTimeStamp = now - ut.ut_timestamp;
+/*
+ * compact (defragment) the database , possibly returning space back to the underlying filesystem
+ */
+void cdb_compact(void)
+{
+ int ret;
+ int i;
- if (InDBTimeStamp < antiexpire)
- {
- SEEN_syslog(LOG_DEBUG, "Found - Not expired %ld < %ld", InDBTimeStamp, antiexpire);
- cdb_free(cdbut);
- return InDBTimeStamp;
- }
- else
- {
- SEEN_syslog(LOG_DEBUG, "Found - Expired. %ld >= %ld", InDBTimeStamp, antiexpire);
- cdb_free(cdbut);
- }
- }
- else
- {
- if (cdbut) cdb_free(cdbut);
-
- SEENM_syslog(LOG_DEBUG, "not Found");
- if (cType == eCheckUpdate)
- return 0;
+ syslog(LOG_DEBUG, "db: cdb_compact() started");
+ for (i = 0; i < MAXCDB; i++) {
+ syslog(LOG_DEBUG, "db: compacting database %d", i);
+ ret = dbp[i]->compact(dbp[i], NULL, NULL, NULL, NULL, DB_FREE_SPACE, NULL);
+ if (ret) {
+ syslog(LOG_ERR, "db: compact: %s", db_strerror(ret));
}
-
- if (cType == eCheckExist)
- return InDBTimeStamp;
}
+ syslog(LOG_DEBUG, "db: cdb_compact() finished");
+}
- memcpy(ut.ut_msgid, SKEY(guid));
- ut.ut_timestamp = now;
- SEENM_syslog(LOG_DEBUG, "Saving new Timestamp");
- /* rewrite the record anyway, to update the timestamp */
- cdb_store(CDB_USETABLE,
- SKEY(guid),
- &ut, sizeof(struct UseTable) );
+// Has an item already been seen (is it in the CDB_USETABLE) ?
+// Returns 0 if it hasn't, 1 if it has
+// In either case, writes the item to the database for next time.
+int CheckIfAlreadySeen(StrBuf *guid)
+{
+ int found = 0;
+ struct UseTable ut;
+ struct cdbdata *cdbut;
+
+ syslog(LOG_DEBUG, "db: CheckIfAlreadySeen(%s)", ChrPtr(guid));
+ cdbut = cdb_fetch(CDB_USETABLE, SKEY(guid));
+ if (cdbut != NULL) {
+ found = 1;
+ cdb_free(cdbut);
+ }
- SEENM_syslog(LOG_DEBUG, "Done Saving");
- return InDBTimeStamp;
+ /* (Re)write the record, to update the timestamp. Zeroing it out makes it compress better. */
+ memset(&ut, 0, sizeof(struct UseTable));
+ memcpy(ut.ut_msgid, SKEY(guid));
+ ut.ut_timestamp = time(NULL);
+ cdb_store(CDB_USETABLE, SKEY(guid), &ut, sizeof(struct UseTable));
+ return(found);
}
}
}
-void LogDebugEnableSeenEnable(const int n)
-{
- SeentDebugEnabled = n;
-}
CTDL_MODULE_INIT(database)
{
if (!threading)
{
- CtdlRegisterDebugFlagHook(HKEY("SeenDebug"), LogDebugEnableSeenEnable, &SeentDebugEnabled);
CtdlRegisterProtoHook(cmd_rsen, "RSEN", "manipulate Aggregators seen database");
}
projects / citadel.git / blobdiff