[cvs] bogofilter/src datastore_txn_dummies.c,1.10,1.11

[Matthias A. <m-...@us...>]

Update of /cvsroot/bogofilter/bogofilter/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2264/src

Modified Files:
	datastore_txn_dummies.c 
Log Message:
Fix SQLite3 regression in 0.94.0 that broke consistency guarantees 
and caused a _massive_ slowdown.
This is a band-aid fix, the whole datastore OO interface needs to be 
redone, and redone properly. It is a horrible entangled mess currently.


Index: datastore_txn_dummies.c
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/datastore_txn_dummies.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- datastore_txn_dummies.c	14 Mar 2005 02:34:08 -0000	1.10
+++ datastore_txn_dummies.c	22 Mar 2005 12:52:59 -0000	1.11
@@ -37,9 +37,9 @@
 
 dsm_t dsm_transactional = {
     /* public -- used in datastore.c */
-    NULL,
-    NULL,
-    NULL,
+    &db_txn_begin,
+    &db_txn_abort,
+    &db_txn_commit,
 
     /* private -- used in datastore_db_*.c */
     NULL,
@@ -56,7 +56,8 @@
     NULL
 };
 
-#if	!defined(DISABLE_TRANSACTIONS) && !defined(ENABLE_TRANSACTIONS)
+#ifndef ENABLE_SQLITE_DATASTORE
+#if !defined(DISABLE_TRANSACTIONS) && !defined(ENABLE_TRANSACTIONS)
 void *dbe_init(bfdir *d, bffile *f) {
     (void)d;
     (void)f;
@@ -64,10 +65,17 @@
 }
 #endif
 
-#ifndef ENABLE_SQLITE_DATASTORE
 int db_txn_begin(void *vhandle) { (void)vhandle; return 0; }
 int db_txn_abort(void *vhandle) { (void)vhandle; return 0; }
 int db_txn_commit(void *vhandle) { (void)vhandle; return 0; }
+#else
+extern void *dsm;
+void *dbe_init(bfdir *d, bffile *f) {
+    dsm = &dsm_transactional;
+    (void)d;
+    (void)f;
+    return (void *)~0;
+}
 #endif
 
 ex_t dbe_recover(bfdir *directory, bool catastrophic, bool force)