Diff for /servers/slapd/back-bdb/dbcache.c between versions 1.28.2.3 and 1.38

version 1.28.2.3, 2003/12/01 00:58:38 version 1.38, 2004/12/06 06:28:47
Line 1 Line 1
 /* dbcache.c - manage cache of open databases */  /* dbcache.c - manage cache of open databases */
 /* $OpenLDAP: pkg/ldap/servers/slapd/back-bdb/dbcache.c,v 1.28.2.2 2003/10/06 14:57:30 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/back-bdb/dbcache.c,v 1.37 2004/09/04 02:54:31 kurt Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *   *
  * Copyright 2000-2003 The OpenLDAP Foundation.   * Copyright 2000-2004 The OpenLDAP Foundation.
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
Line 28 Line 28
 #include "back-bdb.h"  #include "back-bdb.h"
 #include "lutil_hash.h"  #include "lutil_hash.h"
   
   #ifdef BDB_INDEX_USE_HASH
 /* Pass-thru hash function. Since the indexer is already giving us 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.   * values as keys, we don't need BDB to re-hash them.
  */   */
Line 51  bdb_db_hash( Line 52  bdb_db_hash(
         }          }
         return ret;          return ret;
 }  }
   #define BDB_INDEXTYPE   DB_HASH
   #else
   #define BDB_INDEXTYPE   DB_BTREE
   #endif
   
 int  int
 bdb_db_cache(  bdb_db_cache(
Line 95  bdb_db_cache( Line 100  bdb_db_cache(
   
         rc = db_create( &db->bdi_db, bdb->bi_dbenv, 0 );          rc = db_create( &db->bdi_db, bdb->bi_dbenv, 0 );
         if( rc != 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,                  Debug( LDAP_DEBUG_ANY,
                         "bdb_db_cache: db_create(%s) failed: %s (%d)\n",                          "bdb_db_cache: db_create(%s) failed: %s (%d)\n",
                         bdb->bi_dbenv_home, db_strerror(rc), rc );                          bdb->bi_dbenv_home, db_strerror(rc), rc );
 #endif  
                 ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );                  ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
                 return rc;                  return rc;
         }          }
   
         rc = db->bdi_db->set_pagesize( db->bdi_db, BDB_PAGESIZE );          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 );          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_flags( db->bdi_db, DB_DUP | DB_DUPSORT );
   #if 0
         rc = db->bdi_db->set_dup_compare( db->bdi_db, bdb_bt_compare );          rc = db->bdi_db->set_dup_compare( db->bdi_db, bdb_bt_compare );
   #endif
   
         file = ch_malloc( strlen( name ) + sizeof(BDB_SUFFIX) );          file = ch_malloc( strlen( name ) + sizeof(BDB_SUFFIX) );
         sprintf( file, "%s" BDB_SUFFIX, name );          sprintf( file, "%s" BDB_SUFFIX, name );
Line 121  bdb_db_cache( Line 124  bdb_db_cache(
 #endif  #endif
         rc = DB_OPEN( db->bdi_db,          rc = DB_OPEN( db->bdi_db,
                 file, NULL /* name */,                  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 );                  bdb->bi_dbenv_mode );
   
         ch_free( file );          ch_free( file );
   
         if( rc != 0 ) {          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,                  Debug( LDAP_DEBUG_ANY,
                         "bdb_db_cache: db_open(%s) failed: %s (%d)\n",                          "bdb_db_cache: db_open(%s) failed: %s (%d)\n",
                         name, db_strerror(rc), rc );                          name, db_strerror(rc), rc );
 #endif  
                 ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );                  ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
                 return rc;                  return rc;
         }          }

Removed from v.1.28.2.3  
changed lines
  Added in v.1.38


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org