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

Fix prev commit, LE/GE searches advanced in wrong direction.

Browse source 
Terminate EQ/SUBSTR query searches sooner.
This commit is contained in:
Howard Chu 2006-05-23 02:53:54 +00:00
parent 29dd199f8f
commit 5e50d2e2e4
1 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
servers/slapd/overlays/pcache.c
View file

@ -555,7 +555,7 @@ find_filter( Operation *op, Avlnode *root, Filter *inputf, Filter *first )
Filter* fi;
const char* text;
MatchingRule* mrule = NULL;
int res=0;
int res=0, eqpass= 0;
int ret, rc, dir;
Avlnode *ptr;
CachedQuery cq, *qc;
@ -571,7 +571,7 @@ find_filter( Operation *op, Avlnode *root, Filter *inputf, Filter *first )
dir = TAVL_DIR_LEFT;
} else {
ptr = tavl_find3( root, &cq, pcache_filter_cmp, &ret );
dir = (first->f_choice == LDAP_FILTER_LE) ? TAVL_DIR_LEFT :
dir = (first->f_choice == LDAP_FILTER_GE) ? TAVL_DIR_LEFT :
TAVL_DIR_RIGHT;
}
@ -579,6 +579,30 @@ find_filter( Operation *op, Avlnode *root, Filter *inputf, Filter *first )
qc = ptr->avl_data;
fi = inputf;
fs = qc->filter;
/* an incoming substr query can only be satisfied by a cached
* substr query.
*/
if ( first->f_choice == LDAP_FILTER_SUBSTRINGS &&
qc->first->f_choice != LDAP_FILTER_SUBSTRINGS )
break;
/* an incoming eq query can be satisfied by a cached eq or substr
* query
*/
if ( first->f_choice == LDAP_FILTER_EQUALITY ) {
if ( eqpass == 0 ) {
if ( qc->first->f_choice != LDAP_FILTER_EQUALITY ) {
nextpass: eqpass = 1;
ptr = tavl_end( root, 1 );
dir = TAVL_DIR_LEFT;
continue;
}
} else {
if ( qc->first->f_choice != LDAP_FILTER_SUBSTRINGS )
break;
}
}
do {
res=0;
switch (fs->f_choice) {
@ -604,6 +628,8 @@ find_filter( Operation *op, Avlnode *root, Filter *inputf, Filter *first )
if (rc != LDAP_SUCCESS) {
return NULL;
}
if ( fi==first && fi->f_choice==LDAP_FILTER_EQUALITY && ret )
goto nextpass;
}
switch (fs->f_choice) {
case LDAP_FILTER_OR: