mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-24 13:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for sparse ranges, get next ID from DB

Browse Source 
Instead of iterating thru potentially many nonexistent IDs
This commit is contained in:
Howard Chu 2011-06-01 01:44:51 -07:00
parent ea22849514
commit f5cb879aed
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
servers/slapd/back-bdb/search.c
View File

@ -310,6 +310,36 @@ sameido:
return rs->sr_err; return rs->sr_err;
} }
/* Get the next ID from the DB. Used if the candidate list is
* a range and simple iteration hits missing entryIDs
*/
static ID
bdb_get_nextid(struct bdb_info *bdb, DB_TXN *ltid, ID *cursor)
{
DBC *curs;
DBT key, data;
ID id, nid;
int rc;
id = *cursor + 1;
BDB_ID2DISK( id, &nid );
rc = bdb->bi_id2entry->bdi_db->cursor(
bdb->bi_id2entry->bdi_db, ltid, &curs, bdb->bi_db_opflags );
if ( rc )
return NOID;
key.data = &nid;
key.size = key.ulen = sizeof(ID);
key.flags = DB_DBT_USERMEM;
data.flags = DB_DBT_USERMEM | DB_DBT_PARTIAL;
data.dlen = data.ulen = 0;
rc = curs->c_get( curs, &key, &data, DB_SET_RANGE );
curs->c_close( curs );
if ( rc )
return NOID;
BDB_DISK2ID( &nid, cursor );
return *cursor;
}
int int
bdb_search( Operation *op, SlapReply *rs ) bdb_search( Operation *op, SlapReply *rs )
{ {
@ -743,6 +773,10 @@ fetch_entry_retry:
LDAP_XSTRING(bdb_search) LDAP_XSTRING(bdb_search)
": candidate %ld not found\n", ": candidate %ld not found\n",
(long) id, 0, 0 ); (long) id, 0, 0 );
} else {
/* get the next ID from the DB */
id = bdb_get_nextid( bdb, ltid, &cursor );
cursor = id - 1;
} }
goto loop_continue; goto loop_continue;