Delete extranous assert()

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

diff --git a/servers/slapd/back-bdb/dbcache.c b/servers/slapd/back-bdb/dbcache.c
index 9fefd7f287a7e21661621a29d9aed17b5208d010..85ed700fbba42bed33ffe66a739e4ad5c323f394 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,31 @@
 
 #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.
+ */
+static u_int32_t
+bdb_db_hash(
+       DB *db,
+       const void *bytes,
+       u_int32_t length
+)
+{
+       u_int32_t ret = 0;
+       unsigned char *dst = (unsigned char *)&ret;
+       const unsigned char *src = (const unsigned char *)bytes;
+
+       if ( length > sizeof(u_int32_t) )
+               length = sizeof(u_int32_t);
+
+       while ( length ) {
+               *dst++ = *src++;
+               length--;
+       }
+       return ret;
+}
 
 int
 bdb_db_cache(
@@ -61,14 +86,19 @@ bdb_db_cache(
 
        rc = db_create( &db->bdi_db, bdb->bi_dbenv, 0 );
        if( rc != 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "dbcache", LDAP_LEVEL_ERR, "bdb_db_cache: db_create(%s) failed: %s (%d)\n", bdb->bi_dbenv_home, db_strerror(rc), rc ));
+#else
                Debug( LDAP_DEBUG_ANY,
                        "bdb_db_cache: db_create(%s) failed: %s (%d)\n",
                        bdb->bi_dbenv_home, db_strerror(rc), rc );
+#endif
                ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
                return rc;
        }
 
        rc = db->bdi_db->set_pagesize( db->bdi_db, BDB_PAGESIZE );
+       rc = db->bdi_db->set_h_hash( db->bdi_db, bdb_db_hash );
 #ifdef BDB_IDL_MULTI
        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 );
@@ -79,15 +109,19 @@ 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 );
 
        if( rc != 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG (( "dbcache", LDAP_LEVEL_ERR, "bdb_db_cache: db_open(%s) failed: %s (%d)\n", name, db_strerror(rc), rc ));
+#else
                Debug( LDAP_DEBUG_ANY,
                        "bdb_db_cache: db_open(%s) failed: %s (%d)\n",
                        name, db_strerror(rc), rc );
+#endif
                ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
                return rc;
        }