Set lock detector to DEFAULT, not NORUN.

[openldap] / servers / slapd / back-bdb / dbcache.c

diff --git a/servers/slapd/back-bdb/dbcache.c b/servers/slapd/back-bdb/dbcache.c
index 5edc674d96649851a5ff006efbdd2cc26492e2dc..36c4daee187fbbb7330e7460bb1fa45cb4e10e60 100644 (file)
--- a/servers/slapd/back-bdb/dbcache.c
+++ b/servers/slapd/back-bdb/dbcache.c
@@ -1,7 +1,7 @@
 /* dbcache.c - manage cache of open databases */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2001 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -17,6 +17,23 @@
 
 #include "slap.h"
 #include "back-bdb.h"
+#include "lutil_hash.h"
+
+/* Pass-thru hash function. Since the indexer is already giving us hash
+ * values as keys, we don't need BDB to re-hash them.
+ */
+#if LUTIL_HASH_BYTES == 4
+static u_int32_t
+bdb_db_hash(
+       DB *db,
+       const void *bytes,
+       u_int32_t length
+)
+{
+       u_int32_t *ret = (u_int32_t *)bytes;
+       return *ret;
+}
+#endif
 
 int
 bdb_db_cache(
@@ -69,9 +86,11 @@ bdb_db_cache(
        }
 
        rc = db->bdi_db->set_pagesize( db->bdi_db, BDB_PAGESIZE );
+#if LUTIL_HASH_BYTES == 4
+       rc = db->bdi_db->set_h_hash( db->bdi_db, bdb_db_hash );
+#endif
 #ifdef BDB_IDL_MULTI
-       rc = db->bdi_db->set_flags( db->bdi_db,
-               DB_DUP | DB_DUPSORT | DB_NODUPDATA );
+       rc = db->bdi_db->set_flags( db->bdi_db, DB_DUP | DB_DUPSORT );
        rc = db->bdi_db->set_dup_compare( db->bdi_db, bdb_bt_compare );
 #endif
 
@@ -80,7 +99,7 @@ bdb_db_cache(
 
        rc = db->bdi_db->open( db->bdi_db,
                file, name,
-               DB_BTREE, bdb->bi_db_opflags | DB_CREATE | DB_THREAD,
+               DB_HASH, bdb->bi_db_opflags | DB_CREATE | DB_THREAD,
                bdb->bi_dbenv_mode );
 
        ch_free( file );