/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2000-2004 The OpenLDAP Foundation.
+ * Copyright 2000-2005 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
DBT *key,
char *buf )
{
- if ( key->size == sizeof( ID ) ) {
+ if ( key->size == 4 /* LUTIL_HASH_BYTES */ ) {
unsigned char *c = key->data;
sprintf( buf, "[%02x%02x%02x%02x]", c[0], c[1], c[2], c[3] );
return buf;
{
bdb_idl_cache_entry_t idl_tmp;
bdb_idl_cache_entry_t *matched_idl_entry;
+ int rc = LDAP_NO_SUCH_OBJECT;
DBT2bv( key, &idl_tmp.kstr );
idl_tmp.db = db;
if ( matched_idl_entry != NULL ) {
if ( matched_idl_entry->idl && ids )
BDB_IDL_CPY( ids, matched_idl_entry->idl );
- ldap_pvt_thread_rdwr_runlock( &bdb->bi_idl_tree_rwlock );
ldap_pvt_thread_mutex_lock( &bdb->bi_idl_tree_lrulock );
IDL_LRU_DELETE( bdb, matched_idl_entry );
IDL_LRU_ADD( bdb, matched_idl_entry );
ldap_pvt_thread_mutex_unlock( &bdb->bi_idl_tree_lrulock );
if ( matched_idl_entry->idl )
- return LDAP_SUCCESS;
+ rc = LDAP_SUCCESS;
else
- return DB_NOTFOUND;
+ rc = DB_NOTFOUND;
}
ldap_pvt_thread_rdwr_runlock( &bdb->bi_idl_tree_rwlock );
- return LDAP_NO_SUCH_OBJECT;
+ return rc;
}
void
DB *db,
DB_TXN *tid,
DBT *key,
- ID *ids )
+ ID *ids,
+ DBC **saved_cursor,
+ int get_flag )
{
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
int rc;
- DBT data;
+ DBT data, key2, *kptr;
DBC *cursor;
ID *i;
void *ptr;
size_t len;
int rc2;
int flags = bdb->bi_db_opflags | DB_MULTIPLE;
+ int opflag;
/* If using BerkeleyDB 4.0, the buf must be large enough to
* grab the entire IDL in one get(), otherwise BDB will leak
*
* configure now requires Berkeley DB 4.1.
*/
-#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR == 0)
+#if DB_VERSION_FULL < 0x04010000
# define BDB_ENOUGH 5
#else
+ /* We sometimes test with tiny IDLs, and BDB always wants buffers
+ * that are at least one page in size.
+ */
+# if BDB_IDL_DB_SIZE < 4096
+# define BDB_ENOUGH 2048
+# else
# define BDB_ENOUGH 1
+# endif
#endif
ID buf[BDB_IDL_DB_SIZE*BDB_ENOUGH];
assert( ids != NULL );
- if ( bdb->bi_idl_cache_size ) {
+ if ( saved_cursor && *saved_cursor ) {
+ opflag = DB_NEXT;
+ } else if ( get_flag == LDAP_FILTER_GE ) {
+ opflag = DB_SET_RANGE;
+ } else if ( get_flag == LDAP_FILTER_LE ) {
+ opflag = DB_FIRST;
+ } else {
+ opflag = DB_SET;
+ }
+
+ /* only non-range lookups can use the IDL cache */
+ if ( bdb->bi_idl_cache_size && opflag == DB_SET ) {
rc = bdb_idl_cache_get( bdb, db, key, ids );
if ( rc != LDAP_NO_SUCH_OBJECT ) return rc;
}
data.ulen = sizeof(buf);
data.flags = DB_DBT_USERMEM;
- if ( tid ) flags |= DB_RMW;
-
- rc = db->cursor( db, tid, &cursor, bdb->bi_db_opflags );
- if( rc != 0 ) {
- Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
- "cursor failed: %s (%d)\n", db_strerror(rc), rc, 0 );
- return rc;
+ /* If we're not reusing an existing cursor, get a new one */
+ if( opflag != DB_NEXT ) {
+ rc = db->cursor( db, tid, &cursor, bdb->bi_db_opflags );
+ if( rc != 0 ) {
+ Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
+ "cursor failed: %s (%d)\n", db_strerror(rc), rc, 0 );
+ return rc;
+ }
+ } else {
+ cursor = *saved_cursor;
}
+
+ /* If this is a LE lookup, save original key so we can determine
+ * when to stop. If this is a GE lookup, save the key since it
+ * will be overwritten.
+ */
+ if ( get_flag == LDAP_FILTER_LE || get_flag == LDAP_FILTER_GE ) {
+ DBTzero( &key2 );
+ key2.flags = DB_DBT_USERMEM;
+ key2.ulen = sizeof(keybuf);
+ key2.data = keybuf;
+ key2.size = key->size;
+ AC_MEMCPY( keybuf, key->data, key->size );
+ kptr = &key2;
+ } else {
+ kptr = key;
+ }
+ len = key->size;
+ rc = cursor->c_get( cursor, kptr, &data, flags | opflag );
- rc = cursor->c_get( cursor, key, &data, flags | DB_SET );
+ /* skip presence key on range inequality lookups */
+ while (rc == 0 && kptr->size != len) {
+ rc = cursor->c_get( cursor, kptr, &data, flags | DB_NEXT_NODUP );
+ }
+ /* If we're doing a LE compare and the new key is greater than
+ * our search key, we're done
+ */
+ if (rc == 0 && get_flag == LDAP_FILTER_LE && memcmp( kptr->data,
+ key->data, key->size ) > 0 ) {
+ rc = DB_NOTFOUND;
+ }
if (rc == 0) {
i = ids;
while (rc == 0) {
DB_MULTIPLE_NEXT(ptr, &data, j, len);
if (j) {
++i;
- AC_MEMCPY( i, j, sizeof(ID) );
+ BDB_DISK2ID( j, i );
}
}
rc = cursor->c_get( cursor, key, &data, flags | DB_NEXT_DUP );
data.size = BDB_IDL_SIZEOF(ids);
}
- rc2 = cursor->c_close( cursor );
+ if ( saved_cursor && rc == 0 ) {
+ if ( !*saved_cursor )
+ *saved_cursor = cursor;
+ rc2 = 0;
+ }
+ else
+ rc2 = cursor->c_close( cursor );
if (rc2) {
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
"close failed: %s (%d)\n", db_strerror(rc2), rc2, 0 );
int rc;
DBT data;
DBC *cursor;
- ID lo, hi, tmp;
+ ID lo, hi, nlo, nhi, nid;
char *err;
{
data.ulen = data.size;
data.flags = DB_DBT_USERMEM;
+ BDB_ID2DISK( id, &nid );
+
rc = db->cursor( db, tid, &cursor, bdb->bi_db_opflags );
if ( rc != 0 ) {
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: "
"cursor failed: %s (%d)\n", db_strerror(rc), rc, 0 );
return rc;
}
- data.data = &tmp;
+ data.data = &nlo;
/* Fetch the first data item for this key, to see if it
* exists and if it's a range.
*/
- rc = cursor->c_get( cursor, key, &data, DB_SET | DB_RMW );
+ rc = cursor->c_get( cursor, key, &data, DB_SET );
err = "c_get";
if ( rc == 0 ) {
- if ( tmp != 0 ) {
+ if ( nlo != 0 ) {
/* not a range, count the number of items */
db_recno_t count;
rc = cursor->c_count( cursor, &count, 0 );
if ( count >= BDB_IDL_DB_MAX ) {
/* No room, convert to a range */
DBT key2 = *key;
+ db_recno_t i;
key2.dlen = key2.ulen;
key2.flags |= DB_DBT_PARTIAL;
- lo = tmp;
- data.data = &hi;
+ BDB_DISK2ID( &nlo, &lo );
+ data.data = &nhi;
+
rc = cursor->c_get( cursor, &key2, &data, DB_NEXT_NODUP );
if ( rc != 0 && rc != DB_NOTFOUND ) {
err = "c_get next_nodup";
goto fail;
}
}
- if ( id < lo )
+ BDB_DISK2ID( &nhi, &hi );
+ /* Update hi/lo if needed, then delete all the items
+ * between lo and hi
+ */
+ if ( id < lo ) {
lo = id;
- else if ( id > hi )
+ nlo = nid;
+ } else if ( id > hi ) {
hi = id;
- rc = db->del( db, tid, key, 0 );
+ nhi = nid;
+ }
+ data.data = &nid;
+ /* Don't fetch anything, just position cursor */
+ data.flags = DB_DBT_USERMEM | DB_DBT_PARTIAL;
+ data.dlen = data.ulen = 0;
+ rc = cursor->c_get( cursor, key, &data, DB_SET );
+ if ( rc != 0 ) {
+ err = "c_get 2";
+ goto fail;
+ }
+ rc = cursor->c_del( cursor, 0 );
if ( rc != 0 ) {
- err = "del";
+ err = "c_del range1";
goto fail;
}
- data.data = &id;
- id = 0;
+ /* Delete all the records */
+ for ( i=1; i<count; i++ ) {
+ rc = cursor->c_get( cursor, &key2, &data, DB_NEXT_DUP );
+ if ( rc != 0 ) {
+ err = "c_get next_dup";
+ goto fail;
+ }
+ rc = cursor->c_del( cursor, 0 );
+ if ( rc != 0 ) {
+ err = "c_del range";
+ goto fail;
+ }
+ }
+ /* Store the range marker */
+ data.size = data.ulen = sizeof(ID);
+ data.flags = DB_DBT_USERMEM;
+ nid = 0;
rc = cursor->c_put( cursor, key, &data, DB_KEYFIRST );
if ( rc != 0 ) {
- err = "c_put 0";
+ err = "c_put range";
goto fail;
}
- id = lo;
+ nid = nlo;
rc = cursor->c_put( cursor, key, &data, DB_KEYLAST );
if ( rc != 0 ) {
err = "c_put lo";
goto fail;
}
- id = hi;
+ nid = nhi;
rc = cursor->c_put( cursor, key, &data, DB_KEYLAST );
if ( rc != 0 ) {
err = "c_put hi";
* the boundaries
*/
hi = id;
- data.data = &lo;
+ data.data = &nlo;
rc = cursor->c_get( cursor, key, &data, DB_NEXT_DUP );
if ( rc != 0 ) {
err = "c_get lo";
goto fail;
}
+ BDB_DISK2ID( &nlo, &lo );
if ( id > lo ) {
- data.data = &hi;
+ data.data = &nhi;
rc = cursor->c_get( cursor, key, &data, DB_NEXT_DUP );
if ( rc != 0 ) {
err = "c_get hi";
goto fail;
}
+ BDB_DISK2ID( &nhi, &hi );
}
if ( id < lo || id > hi ) {
/* Delete the current lo/hi */
err = "c_del";
goto fail;
}
- data.data = &id;
+ data.data = &nid;
rc = cursor->c_put( cursor, key, &data, DB_KEYFIRST );
if ( rc != 0 ) {
err = "c_put lo/hi";
}
}
} else if ( rc == DB_NOTFOUND ) {
-put1: data.data = &id;
+put1: data.data = &nid;
rc = cursor->c_put( cursor, key, &data, DB_NODUPDATA );
/* Don't worry if it's already there */
if ( rc != 0 && rc != DB_KEYEXIST ) {
int rc;
DBT data;
DBC *cursor;
- ID lo, hi, tmp;
+ ID lo, hi, tmp, nid, nlo, nhi;
char *err;
{
bdb_idl_cache_del( bdb, db, key );
}
+ BDB_ID2DISK( id, &nid );
+
DBTzero( &data );
data.data = &tmp;
data.size = sizeof( id );
/* Fetch the first data item for this key, to see if it
* exists and if it's a range.
*/
- rc = cursor->c_get( cursor, key, &data, DB_SET | DB_RMW );
+ rc = cursor->c_get( cursor, key, &data, DB_SET );
err = "c_get";
if ( rc == 0 ) {
if ( tmp != 0 ) {
/* Not a range, just delete it */
- if (tmp != id) {
+ if (tmp != nid) {
/* position to correct item */
- tmp = id;
- rc = cursor->c_get( cursor, key, &data,
- DB_GET_BOTH | DB_RMW );
+ tmp = nid;
+ rc = cursor->c_get( cursor, key, &data, DB_GET_BOTH );
if ( rc != 0 ) {
err = "c_get id";
goto fail;
/* It's a range, see if we need to rewrite
* the boundaries
*/
- data.data = &lo;
+ data.data = &nlo;
rc = cursor->c_get( cursor, key, &data, DB_NEXT_DUP );
if ( rc != 0 ) {
err = "c_get lo";
goto fail;
}
- data.data = &hi;
+ BDB_DISK2ID( &nlo, &lo );
+ data.data = &nhi;
rc = cursor->c_get( cursor, key, &data, DB_NEXT_DUP );
if ( rc != 0 ) {
err = "c_get hi";
goto fail;
}
+ BDB_DISK2ID( &nhi, &hi );
if ( id == lo || id == hi ) {
if ( id == lo ) {
id++;
} else {
if ( id == lo ) {
/* reposition on lo slot */
- data.data = &lo;
+ data.data = &nlo;
cursor->c_get( cursor, key, &data, DB_PREV );
- lo = id;
}
rc = cursor->c_del( cursor, 0 );
if ( rc != 0 ) {
}
}
if ( lo <= hi ) {
- data.data = &id;
+ BDB_ID2DISK( id, &nid );
+ data.data = &nid;
rc = cursor->c_put( cursor, key, &data, DB_KEYFIRST );
if ( rc != 0 ) {
err = "c_put lo/hi";
projects / openldap / blobdiff