#include <pthread.h>
#include "citadel.h"
#include "server.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
#include "citserver.h"
#include "database.h"
#include "msgbase.h"
DBC *cursors[MAXCDB]; /* Cursors, for traversals... */
};
+#ifdef HAVE_ZLIB
+#include <zlib.h>
+#endif
+
static pthread_key_t tsdkey;
#define MYCURSORS (((struct cdbtsd*)pthread_getspecific(tsdkey))->cursors)
if (pthread_getspecific(tsdkey) != NULL)
return;
- tsd = mallok(sizeof *tsd);
+ tsd = mallok(sizeof(struct cdbtsd));
tsd->tid = NULL;
MAX_CHECKPOINT_KBYTES,
MAX_CHECKPOINT_MINUTES,
0);
+
+/* The DB_INCOMPLETE error is no longer possible (or even defined) as of
+ * Berkeley DB v4.1. When we get to the point where v4.0 and earlier are no
+ * longer supported, we can remove this ifdef.
+ */
+#ifdef DB_INCOMPLETE
if ( (ret != 0) && (ret != DB_INCOMPLETE) ) {
- lprintf(1, "cdb_checkpoint: txn_checkpoint: %s\n", db_strerror(ret));
+ lprintf(1, "cdb_checkpoint: txn_checkpoint: %s\n",
+ db_strerror(ret));
abort();
}
-
if (ret == DB_INCOMPLETE) {
lprintf(3, "WARNING: txn_checkpoint: %s\n", db_strerror(ret));
}
+#else /* DB_INCOMPLETE */
+ if (ret != 0) {
+ lprintf(1, "cdb_checkpoint: txn_checkpoint: %s\n",
+ db_strerror(ret));
+ abort();
+ }
+#endif /* DB_INCOMPLETE */
/* Cull the logs if we haven't done so for 24 hours */
if ((time(NULL) - last_cull) > 86400L) {
u_int32_t flags = 0;
lprintf(9, "cdb_*: open_databases() starting\n");
+#ifdef HAVE_ZLIB
+ lprintf(5, "zlib compression version %s\n", zlibVersion());
+#endif
+
/*
* Silently try to create the database subdirectory. If it's
* already there, no problem.
snprintf(dbfilename, sizeof dbfilename, "cdb.%02x", i);
ret = dbp[i]->open(dbp[i],
+#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
+ NULL, /* new parameter */
+#endif
dbfilename,
NULL,
DB_BTREE,
- DB_CREATE|DB_THREAD,
+ DB_CREATE|DB_THREAD
+#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
+ |DB_AUTO_COMMIT
+#endif
+ ,
0600);
if (ret) {
lprintf(1, "cdb_*: db_open[%d]: %s\n", i, db_strerror(ret));
}
}
+
+/*
+ * Compression functions only used if we have zlib
+ */
+#ifdef HAVE_ZLIB
+
+void cdb_decompress_if_necessary(struct cdbdata *cdb) {
+ static int magic = COMPRESS_MAGIC;
+ struct CtdlCompressHeader zheader;
+ char *uncompressed_data;
+ char *compressed_data;
+ uLongf destLen, sourceLen;
+
+ if (cdb == NULL) return;
+ if (cdb->ptr == NULL) return;
+ if (memcmp(cdb->ptr, &magic, sizeof(magic))) return;
+
+ /* At this point we know we're looking at a compressed item. */
+ memcpy(&zheader, cdb->ptr, sizeof(struct CtdlCompressHeader));
+
+ compressed_data = cdb->ptr;
+ compressed_data += sizeof(struct CtdlCompressHeader);
+
+ sourceLen = (uLongf) zheader.compressed_len;
+ destLen = (uLongf) zheader.uncompressed_len;
+ uncompressed_data = mallok(zheader.uncompressed_len);
+
+ if (uncompress( (Bytef *) uncompressed_data,
+ &destLen,
+ compressed_data,
+ sourceLen
+ ) != Z_OK) {
+ lprintf(1, "uncompress() error\n");
+ abort();
+ }
+
+ phree(cdb->ptr);
+ cdb->len = (size_t) destLen;
+ cdb->ptr = uncompressed_data;
+}
+
+#endif /* HAVE_ZLIB */
+
+
/*
* Store a piece of data. Returns 0 if the operation was successful. If a
* key already exists it should be overwritten.
DBT dkey, ddata;
DB_TXN *tid;
int ret;
+
+#ifdef HAVE_ZLIB
+ struct CtdlCompressHeader zheader;
+ char *compressed_data = NULL;
+ int compressing = 0;
+ size_t buffer_len;
+ uLongf destLen;
+#endif
memset(&dkey, 0, sizeof(DBT));
memset(&ddata, 0, sizeof(DBT));
dkey.data = ckey;
ddata.size = cdatalen;
ddata.data = cdata;
+
+#ifdef HAVE_ZLIB
+ /* Only compress Visit records. Everything else is uncompressed. */
+ if (cdb == CDB_VISIT) {
+ compressing = 1;
+ zheader.magic = COMPRESS_MAGIC;
+ zheader.uncompressed_len = cdatalen;
+ buffer_len = ( (cdatalen * 101) / 100 ) + 100
+ + sizeof(struct CtdlCompressHeader) ;
+ destLen = (uLongf) buffer_len;
+ compressed_data = mallok(buffer_len);
+ if (compress2(
+ (Bytef *) (compressed_data +
+ sizeof(struct CtdlCompressHeader)),
+ &destLen,
+ (Bytef *) cdata,
+ (uLongf) cdatalen,
+ 1
+ ) != Z_OK) {
+ lprintf(1, "compress2() error\n");
+ abort();
+ }
+ zheader.compressed_len = (size_t) destLen;
+ memcpy(compressed_data, &zheader,
+ sizeof(struct CtdlCompressHeader));
+ ddata.size = (size_t) (sizeof(struct CtdlCompressHeader) +
+ zheader.compressed_len);
+ ddata.data = compressed_data;
+ }
+#endif
if (MYTID != NULL)
{
db_strerror(ret));
abort();
}
+#ifdef HAVE_ZLIB
+ if (compressing) phree(compressed_data);
+#endif
return ret;
}
else
{
txcommit(tid);
+#ifdef HAVE_ZLIB
+ if (compressing) phree(compressed_data);
+#endif
return ret;
}
}
tempcdb->len = dret.size;
tempcdb->ptr = dret.data;
+#ifdef HAVE_ZLIB
+ cdb_decompress_if_necessary(tempcdb);
+#endif
return (tempcdb);
}
cdbret = (struct cdbdata *) mallok(sizeof(struct cdbdata));
cdbret->len = data.size;
cdbret->ptr = data.data;
+#ifdef HAVE_ZLIB
+ cdb_decompress_if_necessary(cdbret);
+#endif
return (cdbret);
}