Update copyright statements

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

diff --git a/servers/slapd/back-bdb/dbcache.c b/servers/slapd/back-bdb/dbcache.c
index 7387b2e6f679cf44504610965350f0521b94971d..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,11 +17,28 @@
 
 #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(
-    Backend    *be,
-    const char *name,
+       Backend *be,
+       const char *name,
        DB **dbout )
 {
        int i;
@@ -32,14 +49,26 @@ bdb_db_cache(
 
        *dbout = NULL;
 
-       for( i=BDB_NDB; bdb->bi_databases[i]->bdi_name; i++ ) {
+       for( i=BDB_NDB; bdb->bi_databases[i]; i++ ) {
+               if( !strcmp( bdb->bi_databases[i]->bdi_name, name) ) {
+                       *dbout = bdb->bi_databases[i]->bdi_db;
+                       return 0;
+               }
+       }
+
+       ldap_pvt_thread_mutex_lock( &bdb->bi_database_mutex );
+
+       /* check again! may have been added by another thread */
+       for( i=BDB_NDB; bdb->bi_databases[i]; i++ ) {
                if( !strcmp( bdb->bi_databases[i]->bdi_name, name) ) {
                        *dbout = bdb->bi_databases[i]->bdi_db;
+                       ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
                        return 0;
                }
        }
 
        if( i >= BDB_INDICES ) {
+               ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
                return -1;
        }
 
@@ -52,15 +81,25 @@ bdb_db_cache(
                Debug( LDAP_DEBUG_ANY,
                        "bdb_db_cache: db_create(%s) failed: %s (%d)\n",
                        bdb->bi_dbenv_home, db_strerror(rc), rc );
+               ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
                return rc;
        }
 
+       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 );
+       rc = db->bdi_db->set_dup_compare( db->bdi_db, bdb_bt_compare );
+#endif
+
        file = ch_malloc( strlen( name ) + sizeof(BDB_SUFFIX) );
        sprintf( file, "%s" BDB_SUFFIX, name );
 
        rc = db->bdi_db->open( db->bdi_db,
                file, name,
-               DB_BTREE, DB_CREATE|DB_THREAD,
+               DB_HASH, bdb->bi_db_opflags | DB_CREATE | DB_THREAD,
                bdb->bi_dbenv_mode );
 
        ch_free( file );
@@ -69,12 +108,16 @@ bdb_db_cache(
                Debug( LDAP_DEBUG_ANY,
                        "bdb_db_cache: db_open(%s) failed: %s (%d)\n",
                        name, db_strerror(rc), rc );
+               ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
                return rc;
        }
 
+       bdb->bi_databases[i+1] = NULL;
        bdb->bi_databases[i] = db;
+       bdb->bi_ndatabases = i+1;
 
        *dbout = db->bdi_db;
 
+       ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
        return 0;
 }