upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 00:29:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

More back-hdb search optimization

Browse source
This commit is contained in:
Howard Chu 2005-09-13 07:55:01 +00:00
parent 2807a2596b
commit aa3297aa36
3 changed files with 24 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servers/slapd/back-bdb/dn2id.c
View file

@ -953,13 +953,15 @@ hdb_dn2idl_internal(
saveit:
if ( cx->bdb->bi_idl_cache_max_size ) {
cx->key.data = &cx->id;
if ( !BDB_IDL_IS_RANGE( cx->tmp ) && cx->tmp[0] > 1 )
bdb_idl_sort( cx->tmp );
bdb_idl_cache_put( cx->bdb, cx->db, &cx->key, cx->tmp, cx->rc );
}
;
gotit:
if ( !BDB_IDL_IS_ZERO( cx->tmp )) {
if ( cx->prefix == DN_SUBTREE_PREFIX ) {
bdb_idl_append( cx->ids, cx->tmp );
bdb_idl_merge( cx->ids, cx->tmp );
if ( !(cx->ei->bei_state & CACHE_ENTRY_NO_GRANDKIDS)) {
ID *save, idcurs;
EntryInfo *ei = cx->ei;
@ -1038,8 +1040,6 @@ hdb_dn2idl(
DBTzero(&cx.data);
hdb_dn2idl_internal(&cx);
if ( !BDB_IDL_IS_ZERO( ids ) && !BDB_IDL_IS_RANGE( ids ))
bdb_idl_sort( ids );
return cx.rc;
}

46
servers/slapd/back-bdb/idl.c
View file

@ -1244,12 +1244,13 @@ int bdb_idl_append_one( ID *ids, ID id )
return 0;
}
/* Append unsorted list b to unsorted list a. Both lists must have their
* lowest value in slot 1 and highest value in slot 2.
/* Merge sorted list b to sorted list a. There are no common values
* in list a and b.
*/
int bdb_idl_append( ID *a, ID *b )
int bdb_idl_merge( ID *a, ID *b )
{
ID ida, idb;
ID cursora, cursorb, cursorc;
if ( BDB_IDL_IS_ZERO( b ) ) {
return 0;
@ -1263,38 +1264,31 @@ int bdb_idl_append( ID *a, ID *b )
if ( BDB_IDL_IS_RANGE( a ) || BDB_IDL_IS_RANGE(b) ||
a[0] + b[0] >= BDB_IDL_UM_MAX ) {
ida = IDL_MIN( a[1], b[1] );
idb = IDL_MAX( a[2], b[2] );
idb = IDL_MAX( a[a[0]], b[b[0]] );
a[0] = NOID;
a[1] = ida;
a[2] = idb;
return 0;
}
if ( b[1] < a[1] ) {
ida = a[1];
a[1] = b[1];
} else {
ida = b[1];
}
a[0]++;
a[a[0]] = ida;
cursora = a[0];
cursorb = b[0];
cursorc = cursora + cursorb;
a[0] = cursorc;
if ( b[0] > 1 && b[2] > a[2] ) {
ida = a[2];
a[2] = b[2];
} else {
ida = b[2];
}
a[0]++;
a[a[0]] = ida;
if ( b[0] > 2 ) {
int i = b[0] - 2;
AC_MEMCPY(a+a[0]+1, b+3, i * sizeof(ID));
a[0] += i;
while ( cursorc > 0 ) {
if ( b[cursorb] > a[cursora] ) {
a[cursorc] = b[cursorb];
cursorb--;
} else {
if ( cursora == cursorc )
break;
a[cursorc] = a[cursora];
cursora --;
}
cursorc--;
}
return 0;
}
/* Quicksort + Insertion sort for small arrays */

2
servers/slapd/back-bdb/proto-bdb.h
View file

@ -245,7 +245,7 @@ bdb_idl_cache_del(
#define bdb_idl_intersection BDB_SYMBOL(idl_intersection)
#define bdb_idl_union BDB_SYMBOL(idl_union)
#define bdb_idl_sort BDB_SYMBOL(idl_sort)
#define bdb_idl_append BDB_SYMBOL(idl_append)
#define bdb_idl_merge BDB_SYMBOL(idl_merge)
#define bdb_idl_append_one BDB_SYMBOL(idl_append_one)
#define bdb_idl_fetch_key BDB_SYMBOL(idl_fetch_key)