BDB_PAGESIZE not used any more, use BDB/FS default instead

This commit is contained in:
Howard Chu 2008-10-15 10:45:31 +00:00
parent b322e3d643
commit 72a9d87fec
3 changed files with 6 additions and 9 deletions

View File

@ -54,10 +54,6 @@ LDAP_BEGIN_DECL
#define BDB_ID2ENTRY_PAGESIZE 16384
#endif
#ifndef BDB_PAGESIZE
#define BDB_PAGESIZE 4096 /* BDB's original default */
#endif
#define DEFAULT_CACHE_SIZE 1000
/* The default search IDL stack cache depth */

View File

@ -157,10 +157,10 @@ bdb_db_cache(
}
}
/* If no explicit size set, use the default */
/* If no explicit size set, use the FS default */
flags = bdb_db_findsize( bdb, name );
if ( !flags ) flags = BDB_PAGESIZE;
rc = db->bdi_db->set_pagesize( db->bdi_db, flags );
if ( flags )
rc = db->bdi_db->set_pagesize( db->bdi_db, flags );
#ifdef BDB_INDEX_USE_HASH
rc = db->bdi_db->set_h_hash( db->bdi_db, bdb_db_hash );

View File

@ -446,8 +446,9 @@ shm_retry:
flags |= DB_CREATE;
}
} else {
if ( !rc ) rc = BDB_PAGESIZE;
rc = db->bdi_db->set_pagesize( db->bdi_db, rc );
/* Use FS default size if not configured */
if ( rc )
rc = db->bdi_db->set_pagesize( db->bdi_db, rc );
rc = db->bdi_db->set_flags( db->bdi_db,
DB_DUP | DB_DUPSORT );