X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fdbcache.c;h=23d964deaa3bd45446d27ffc150fdc4c4a1c3d86;hb=47c6701a2293fec249cdb84f69b37addfb4b36fc;hp=a92cb44fbb29aeaa11f1ef3a07c838d3ed50c6ca;hpb=7c8c5213b1ebd051af3184137e75e9b6aa5e9803;p=openldap
diff --git a/servers/slapd/back-bdb/dbcache.c b/servers/slapd/back-bdb/dbcache.c
index a92cb44fbb..23d964deaa 100644
--- a/servers/slapd/back-bdb/dbcache.c
+++ b/servers/slapd/back-bdb/dbcache.c
@@ -1,8 +1,17 @@
/* dbcache.c - manage cache of open databases */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2001 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 2000-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
#include "portable.h"
@@ -19,10 +28,10 @@
#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.
*/
-#if LUTIL_HASH_BYTES == 4
static u_int32_t
bdb_db_hash(
DB *db,
@@ -30,9 +39,22 @@ bdb_db_hash(
u_int32_t length
)
{
- u_int32_t *ret = (u_int32_t *)bytes;
- return *ret;
+ 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;
}
+#define BDB_INDEXTYPE DB_HASH
+#else
+#define BDB_INDEXTYPE DB_BTREE
#endif
int
@@ -49,7 +71,7 @@ bdb_db_cache(
*dbout = NULL;
- for( i=BDB_NDB; bdb->bi_databases[i]; i++ ) {
+ for( i=BDB_NDB; i < bdb->bi_ndatabases; i++ ) {
if( !strcmp( bdb->bi_databases[i]->bdi_name, name) ) {
*dbout = bdb->bi_databases[i]->bdi_db;
return 0;
@@ -59,7 +81,7 @@ bdb_db_cache(
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++ ) {
+ for( i=BDB_NDB; i < bdb->bi_ndatabases; 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 );
@@ -78,41 +100,53 @@ 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 );
-#if LUTIL_HASH_BYTES == 4
+#ifdef BDB_INDEX_USE_HASH
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_HASH, bdb->bi_db_opflags | DB_CREATE | DB_THREAD,
+#ifdef HAVE_EBCDIC
+ __atoe( file );
+#endif
+ rc = DB_OPEN( db->bdi_db,
+ file, NULL /* name */,
+ 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;
}
- bdb->bi_databases[i+1] = NULL;
bdb->bi_databases[i] = db;
bdb->bi_ndatabases = i+1;