ITS#5262 fixes from 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 5e2d6dd41b0c1ddabbef3322871b92388b58fbcd..42f9f8b88320a495dc2ed2d683a8c2cbc982b3d5 100644 (file)
--- 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 <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2007 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
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -17,6 +26,36 @@
 
 #include "slap.h"
 #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.
+ */
+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;
+}
+#define        BDB_INDEXTYPE   DB_HASH
+#else
+#define        BDB_INDEXTYPE   DB_BTREE
+#endif
 
 int
 bdb_db_cache(
@@ -24,7 +63,7 @@ bdb_db_cache(
        const char *name,
        DB **dbout )
 {
-       int i;
+       int i, flags;
        int rc;
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
        struct bdb_db_info *db;
@@ -32,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;
@@ -42,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 );
@@ -69,17 +108,30 @@ bdb_db_cache(
        }
 
        rc = db->bdi_db->set_pagesize( db->bdi_db, BDB_PAGESIZE );
-#ifdef BDB_IDL_MULTI
-       rc = db->bdi_db->set_flags( db->bdi_db, DB_DUP | DB_DUPSORT );
+#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 );
 
        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,
-               bdb->bi_dbenv_mode );
+#ifdef HAVE_EBCDIC
+       __atoe( file );
+#endif
+       flags = DB_CREATE | DB_THREAD;
+#ifdef DB_AUTO_COMMIT
+       if ( !( slapMode & SLAP_TOOL_QUICK ))
+               flags |= DB_AUTO_COMMIT;
+#endif
+       /* Cannot Truncate when Transactions are in use */
+       if ( (slapMode & (SLAP_TOOL_QUICK|SLAP_TRUNCATE_MODE)) ==
+               (SLAP_TOOL_QUICK|SLAP_TRUNCATE_MODE))
+                       flags |= DB_TRUNCATE;
+
+       rc = DB_OPEN( db->bdi_db,
+               file, NULL /* name */,
+               BDB_INDEXTYPE, bdb->bi_db_opflags | flags, bdb->bi_dbenv_mode );
 
        ch_free( file );
 
@@ -91,7 +143,6 @@ bdb_db_cache(
                return rc;
        }
 
-       bdb->bi_databases[i+1] = NULL;
        bdb->bi_databases[i] = db;
        bdb->bi_ndatabases = i+1;