Sync with HEAD

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

diff --git a/servers/slapd/back-bdb/dbcache.c b/servers/slapd/back-bdb/dbcache.c
index 65cb28d23f728085e0bfbdf4ff5e84640f64145c..adcdf463a7790cfcfca3a30b57250406edc18244 100644 (file)
--- a/servers/slapd/back-bdb/dbcache.c
+++ b/servers/slapd/back-bdb/dbcache.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2004 The OpenLDAP Foundation.
+ * Copyright 2000-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,6 +28,7 @@
 #include "back-bdb.h"
 #include "lutil_hash.h"
 
+#ifdef BDB_INDEX_USE_HASH
 /* Pass-thru hash function. Since the indexer is already giving us hash
  * values as keys, we don't need BDB to re-hash them.
  */
@@ -51,6 +52,10 @@ bdb_db_hash(
        }
        return ret;
 }
+#define        BDB_INDEXTYPE   DB_HASH
+#else
+#define        BDB_INDEXTYPE   DB_BTREE
+#endif
 
 int
 bdb_db_cache(
@@ -95,23 +100,18 @@ bdb_db_cache(
 
        rc = db_create( &db->bdi_db, bdb->bi_dbenv, 0 );
        if( rc != 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( CACHE, 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 );
+#ifdef BDB_INDEX_USE_HASH
        rc = db->bdi_db->set_h_hash( db->bdi_db, bdb_db_hash );
+#endif
        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 );
 
        file = ch_malloc( strlen( name ) + sizeof(BDB_SUFFIX) );
        sprintf( file, "%s" BDB_SUFFIX, name );
@@ -121,21 +121,15 @@ bdb_db_cache(
 #endif
        rc = DB_OPEN( db->bdi_db,
                file, NULL /* name */,
-               DB_HASH, bdb->bi_db_opflags | DB_CREATE | DB_THREAD,
+               BDB_INDEXTYPE, bdb->bi_db_opflags | DB_CREATE | DB_THREAD,
                bdb->bi_dbenv_mode );
 
        ch_free( file );
 
        if( rc != 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( CACHE, 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;
        }