/* filterindex.c - generate the list of candidate entries from a filter */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include "idl.h"
static int presence_candidates(
- Backend *be,
+ Operation *op,
AttributeDescription *desc,
ID *ids );
static int equality_candidates(
- Backend *be,
+ Operation *op,
AttributeAssertion *ava,
ID *ids,
ID *tmp );
static int approx_candidates(
- Backend *be,
+ Operation *op,
AttributeAssertion *ava,
ID *ids,
ID *tmp );
static int substring_candidates(
- Backend *be,
+ Operation *op,
SubstringsAssertion *sub,
ID *ids,
ID *tmp );
static int list_candidates(
- Backend *be,
+ Operation *op,
Filter *flist,
int ftype,
ID *ids,
int
bdb_filter_candidates(
- Backend *be,
+ Operation *op,
Filter *f,
ID *ids,
ID *tmp,
ID *stack )
{
- int rc = -1;
+ int rc = 0;
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, ENTRY, "=> bdb_filter_candidates\n", 0, 0, 0 );
#else
#endif
switch ( f->f_choice ) {
+ case SLAPD_FILTER_COMPUTED:
+ break;
+
case SLAPD_FILTER_DN_ONE:
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tDN ONE\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_FILTER, "\tDN ONE\n", 0, 0, 0 );
#endif
- rc = bdb_dn2idl( be, f->f_dn, DN_ONE_PREFIX, ids );
+ rc = bdb_dn2idl( op->o_bd, f->f_dn, DN_ONE_PREFIX, ids,
+ op->o_tmpmemctx );
if( rc == DB_NOTFOUND ) {
BDB_IDL_ZERO( ids );
rc = 0;
#else
Debug( LDAP_DEBUG_FILTER, "\tDN SUBTREE\n", 0, 0, 0 );
#endif
- rc = bdb_dn2idl( be, f->f_dn, DN_SUBTREE_PREFIX, ids );
+ rc = bdb_dn2idl( op->o_bd, f->f_dn, DN_SUBTREE_PREFIX, ids,
+ op->o_tmpmemctx );
break;
case LDAP_FILTER_PRESENT:
#else
Debug( LDAP_DEBUG_FILTER, "\tPRESENT\n", 0, 0, 0 );
#endif
- rc = presence_candidates( be, f->f_desc, ids );
+ rc = presence_candidates( op, f->f_desc, ids );
break;
case LDAP_FILTER_EQUALITY:
#else
Debug( LDAP_DEBUG_FILTER, "\tEQUALITY\n", 0, 0, 0 );
#endif
- rc = equality_candidates( be, f->f_ava, ids, tmp );
+ rc = equality_candidates( op, f->f_ava, ids, tmp );
break;
case LDAP_FILTER_APPROX:
#else
Debug( LDAP_DEBUG_FILTER, "\tAPPROX\n", 0, 0, 0 );
#endif
- rc = approx_candidates( be, f->f_ava, ids, tmp );
+ rc = approx_candidates( op, f->f_ava, ids, tmp );
break;
case LDAP_FILTER_SUBSTRINGS:
#else
Debug( LDAP_DEBUG_FILTER, "\tSUBSTRINGS\n", 0, 0, 0 );
#endif
- rc = substring_candidates( be, f->f_sub, ids, tmp );
+ rc = substring_candidates( op, f->f_sub, ids, tmp );
break;
case LDAP_FILTER_GE:
#else
Debug( LDAP_DEBUG_FILTER, "\tGE\n", 0, 0, 0 );
#endif
- rc = presence_candidates( be, f->f_ava->aa_desc, ids );
+ rc = presence_candidates( op, f->f_ava->aa_desc, ids );
break;
case LDAP_FILTER_LE:
#else
Debug( LDAP_DEBUG_FILTER, "\tLE\n", 0, 0, 0 );
#endif
- rc = presence_candidates( be, f->f_ava->aa_desc, ids );
+ rc = presence_candidates( op, f->f_ava->aa_desc, ids );
break;
case LDAP_FILTER_NOT:
#else
Debug( LDAP_DEBUG_FILTER, "\tNOT\n", 0, 0, 0 );
#endif
+ { struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+ BDB_IDL_ALL( bdb, ids );
+ }
break;
case LDAP_FILTER_AND:
#else
Debug( LDAP_DEBUG_FILTER, "\tAND\n", 0, 0, 0 );
#endif
- rc = list_candidates( be,
+ rc = list_candidates( op,
f->f_and, LDAP_FILTER_AND, ids, tmp, stack );
break;
#else
Debug( LDAP_DEBUG_FILTER, "\tOR\n", 0, 0, 0 );
#endif
- rc = list_candidates( be,
+ rc = list_candidates( op,
f->f_or, LDAP_FILTER_OR, ids, tmp, stack );
break;
Debug( LDAP_DEBUG_FILTER, "\tUNKNOWN %lu\n",
(unsigned long) f->f_choice, 0, 0 );
#endif
+ /* Must not return NULL, otherwise extended filters break */
+ { struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+ BDB_IDL_ALL( bdb, ids );
+ }
}
#ifdef NEW_LOGGING
static int
list_candidates(
- Backend *be,
+ Operation *op,
Filter *flist,
int ftype,
ID *ids,
ID *tmp,
ID *save )
{
- struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
int rc = 0;
Filter *f;
Debug( LDAP_DEBUG_FILTER, "=> bdb_list_candidates 0x%x\n", ftype, 0, 0 );
#endif
- if ( ftype == LDAP_FILTER_OR ) {
- BDB_IDL_ALL( bdb, save );
- BDB_IDL_ZERO( ids );
- } else {
- BDB_IDL_CPY( save, ids );
- }
+ /* Copy so we can propagate pre-computed IDLs */
+ BDB_IDL_CPY( save, ids );
for ( f = flist; f != NULL; f = f->f_next ) {
- rc = bdb_filter_candidates( be, f, save, tmp,
+ rc = bdb_filter_candidates( op, f, save, tmp,
save+BDB_IDL_UM_SIZE );
if ( rc != 0 ) {
}
break;
}
+
if ( ftype == LDAP_FILTER_AND ) {
- bdb_idl_intersection( ids, save );
+ if ( f == flist ) {
+ BDB_IDL_CPY( ids, save );
+ } else {
+ bdb_idl_intersection( ids, save );
+ }
if( BDB_IDL_IS_ZERO( ids ) )
break;
} else {
- bdb_idl_union( ids, save );
- BDB_IDL_ALL( bdb, save );
+ if ( f == flist ) {
+ BDB_IDL_CPY( ids, save );
+ } else {
+ bdb_idl_union( ids, save );
+ }
}
}
static int
presence_candidates(
- Backend *be,
+ Operation *op,
AttributeDescription *desc,
ID *ids )
{
- struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
DB *db;
int rc;
slap_mask_t mask;
- struct berval prefix = {0};
+ struct berval prefix = {0, NULL};
#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ENTRY, "=> bdb_presence_candidates\n", 0, 0, 0 );
+ LDAP_LOG ( INDEX, ENTRY, "=> bdb_presence_candidates (%s)\n",
+ desc->ad_cname.bv_val, 0, 0 );
#else
- Debug( LDAP_DEBUG_TRACE, "=> bdb_presence_candidates\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "=> bdb_presence_candidates (%s)\n",
+ desc->ad_cname.bv_val, 0, 0 );
#endif
if( desc == slap_schema.si_ad_objectClass ) {
return 0;
}
- rc = bdb_index_param( be, desc, LDAP_FILTER_PRESENT,
+ rc = bdb_index_param( op->o_bd, desc, LDAP_FILTER_PRESENT,
&db, &mask, &prefix );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_presence_candidates: index_param returned=%d\n", rc, 0, 0 );
+ "<= bdb_presence_candidates: (%s) index_param "
+ "returned=%d\n",
+ desc->ad_cname.bv_val, rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_presence_candidates: index_param returned=%d\n",
- rc, 0, 0 );
+ "<= bdb_presence_candidates: (%s) index_param "
+ "returned=%d\n",
+ desc->ad_cname.bv_val, rc, 0 );
#endif
return 0;
}
/* not indexed */
#ifdef NEW_LOGGING
LDAP_LOG(INDEX, RESULTS,
- "<= bdb_presence_candidates: not indexed\n", 0, 0, 0 );
+ "<= bdb_presence_candidates: (%s) not indexed\n",
+ desc->ad_cname.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_presence_candidates: not indexed\n",
- 0, 0, 0 );
+ "<= bdb_presence_candidates: (%s) not indexed\n",
+ desc->ad_cname.bv_val, 0, 0 );
#endif
return 0;
}
if( prefix.bv_val == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(INDEX, RESULTS,
- "<= bdb_presence_candidates: no prefix\n", 0, 0, 0 );
+ "<= bdb_presence_candidates: (%s) no prefix\n",
+ desc->ad_cname.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_presence_candidates: no prefix\n",
- 0, 0, 0 );
+ "<= bdb_presence_candidates: (%s) no prefix\n",
+ desc->ad_cname.bv_val, 0, 0 );
#endif
return 0;
}
- rc = bdb_key_read( be, db, NULL, &prefix, ids );
+ rc = bdb_key_read( op->o_bd, db, NULL, &prefix, ids );
if( rc == DB_NOTFOUND ) {
BDB_IDL_ZERO( ids );
} else if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_presence_candidates: key read failed (%d)\n", rc, 0, 0 );
+ "<= bdb_presence_candidates: (%s) "
+ "key read failed (%d)\n",
+ desc->ad_cname.bv_val, rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_presense_candidates: key read failed (%d)\n",
- rc, 0, 0 );
+ "<= bdb_presense_candidates: (%s) "
+ "key read failed (%d)\n",
+ desc->ad_cname.bv_val, rc, 0 );
#endif
goto done;
}
static int
equality_candidates(
- Backend *be,
+ Operation *op,
AttributeAssertion *ava,
ID *ids,
ID *tmp )
int i;
int rc;
slap_mask_t mask;
- struct berval prefix = {0};
+ struct berval prefix = {0, NULL};
struct berval *keys = NULL;
MatchingRule *mr;
#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ENTRY, "=> bdb_equality_candidates\n", 0, 0, 0 );
+ LDAP_LOG ( INDEX, ENTRY, "=> bdb_equality_candidates (%s)\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
#else
- Debug( LDAP_DEBUG_TRACE, "=> bdb_equality_candidates\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "=> bdb_equality_candidates (%s)\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
#endif
- rc = bdb_index_param( be, ava->aa_desc, LDAP_FILTER_EQUALITY,
+ rc = bdb_index_param( op->o_bd, ava->aa_desc, LDAP_FILTER_EQUALITY,
&db, &mask, &prefix );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_equality_candidates: index_param failed (%d)\n", rc, 0, 0);
+ "<= bdb_equality_candidates: (%s) "
+ "index_param failed (%d)\n",
+ ava->aa_desc->ad_cname.bv_val, rc, 0);
#else
Debug( LDAP_DEBUG_ANY,
- "<= bdb_equality_candidates: index_param failed (%d)\n",
- rc, 0, 0 );
+ "<= bdb_equality_candidates: (%s) "
+ "index_param failed (%d)\n",
+ ava->aa_desc->ad_cname.bv_val, rc, 0 );
#endif
return rc;
}
if ( db == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(INDEX, RESULTS,
- "<= bdb_equality_candidates: not indexed\n", 0, 0, 0 );
+ "<= bdb_equality_candidates: (%s) not indexed\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
- "<= bdb_equality_candidates: not indexed\n", 0, 0, 0 );
+ "<= bdb_equality_candidates: (%s) not indexed\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
#endif
return -1;
}
mr,
&prefix,
&ava->aa_value,
- &keys );
+ &keys, op->o_tmpmemctx );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_equality_candidates: (%s) MR filter failed (%d)\n",
- prefix.bv_val, rc, 0 );
+ "<= bdb_equality_candidates: (%s, %s) "
+ "MR filter failed (%d)\n",
+ prefix.bv_val, ava->aa_desc->ad_cname.bv_val, rc );
#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_equality_candidates: (%s) MR filter failed (%d)\n",
- prefix.bv_val, rc, 0 );
+ "<= bdb_equality_candidates: (%s, %s) "
+ "MR filter failed (%d)\n",
+ prefix.bv_val, ava->aa_desc->ad_cname.bv_val, rc );
#endif
return rc;
}
if( keys == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_equality_candidates: no keys\n", 0, 0, 0 );
+ "<= bdb_equality_candidates: (%s) no keys\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_equality_candidates: no keys\n",
- 0, 0, 0 );
+ "<= bdb_equality_candidates: (%s) no keys\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
#endif
return 0;
}
for ( i= 0; keys[i].bv_val != NULL; i++ ) {
- rc = bdb_key_read( be, db, NULL, &keys[i], tmp );
+ rc = bdb_key_read( op->o_bd, db, NULL, &keys[i], tmp );
if( rc == DB_NOTFOUND ) {
BDB_IDL_ZERO( ids );
rc = 0;
+ break;
} else if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_equality_candidates: key read failed (%d)\n", rc, 0, 0);
+ "<= bdb_equality_candidates: (%s) "
+ "key read failed (%d)\n",
+ ava->aa_desc->ad_cname.bv_val, rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_equality_candidates: key read failed (%d)\n",
- rc, 0, 0 );
+ "<= bdb_equality_candidates: (%s) "
+ "key read failed (%d)\n",
+ ava->aa_desc->ad_cname.bv_val, rc, 0 );
#endif
break;
}
if( BDB_IDL_IS_ZERO( tmp ) ) {
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_equality_candidates: NULL\n", 0, 0, 0);
+ "<= bdb_equality_candidates: (%s) NULL\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0);
#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_equality_candidates: NULL\n",
- 0, 0, 0 );
+ "<= bdb_equality_candidates: (%s) NULL\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
#endif
BDB_IDL_ZERO( ids );
break;
}
- bdb_idl_intersection( ids, tmp );
+ if ( i == 0 ) {
+ BDB_IDL_CPY( ids, tmp );
+ } else {
+ bdb_idl_intersection( ids, tmp );
+ }
if( BDB_IDL_IS_ZERO( ids ) )
break;
}
- ber_bvarray_free( keys );
+ ber_bvarray_free_x( keys, op->o_tmpmemctx );
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
static int
approx_candidates(
- Backend *be,
+ Operation *op,
AttributeAssertion *ava,
ID *ids,
ID *tmp )
int i;
int rc;
slap_mask_t mask;
- struct berval prefix = {0};
+ struct berval prefix = {0, NULL};
struct berval *keys = NULL;
MatchingRule *mr;
#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ENTRY, "=> bdb_approx_candidates\n", 0, 0, 0 );
+ LDAP_LOG ( INDEX, ENTRY, "=> bdb_approx_candidates (%s)\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
#else
- Debug( LDAP_DEBUG_TRACE, "=> bdb_approx_candidates\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "=> bdb_approx_candidates (%s)\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
#endif
- rc = bdb_index_param( be, ava->aa_desc, LDAP_FILTER_APPROX,
+ rc = bdb_index_param( op->o_bd, ava->aa_desc, LDAP_FILTER_APPROX,
&db, &mask, &prefix );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_approx_candidates: index_param failed (%d)\n", rc, 0, 0 );
+ "<= bdb_approx_candidates: (%s) "
+ "index_param failed (%d)\n",
+ ava->aa_desc->ad_cname.bv_val, rc, 0 );
#else
Debug( LDAP_DEBUG_ANY,
- "<= bdb_approx_candidates: index_param failed (%d)\n",
- rc, 0, 0 );
+ "<= bdb_approx_candidates: (%s) "
+ "index_param failed (%d)\n",
+ ava->aa_desc->ad_cname.bv_val, rc, 0 );
#endif
return rc;
}
if ( db == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(INDEX, RESULTS,
- "<= bdb_approx_candidates: not indexed\n",0, 0, 0 );
+ "<= bdb_approx_candidates: (%s) not indexed\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
- "<= bdb_approx_candidates: not indexed\n", 0, 0, 0 );
+ "<= bdb_approx_candidates: (%s) not indexed\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
#endif
return -1;
}
mr,
&prefix,
&ava->aa_value,
- &keys );
+ &keys, op->o_tmpmemctx );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_approx_candidates: (%s) MR filter failed (%d)\n",
- prefix.bv_val, rc, 0 );
+ "<= bdb_approx_candidates: (%s, %s) "
+ "MR filter failed (%d)\n",
+ prefix.bv_val, ava->aa_desc->ad_cname.bv_val, rc );
#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_approx_candidates: (%s) MR filter failed (%d)\n",
- prefix.bv_val, rc, 0 );
+ "<= bdb_approx_candidates: (%s, %s) "
+ "MR filter failed (%d)\n",
+ prefix.bv_val, ava->aa_desc->ad_cname.bv_val, rc );
#endif
return rc;
}
if( keys == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_approx_candidates: no keys (%s)\n", prefix.bv_val, 0, 0 );
+ "<= bdb_approx_candidates: (%s) no keys (%s)\n",
+ prefix.bv_val, ava->aa_desc->ad_cname.bv_val, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_approx_candidates: no keys (%s)\n",
- prefix.bv_val, 0, 0 );
+ "<= bdb_approx_candidates: (%s) no keys (%s)\n",
+ prefix.bv_val, ava->aa_desc->ad_cname.bv_val, 0 );
#endif
return 0;
}
for ( i= 0; keys[i].bv_val != NULL; i++ ) {
- rc = bdb_key_read( be, db, NULL, &keys[i], tmp );
+ rc = bdb_key_read( op->o_bd, db, NULL, &keys[i], tmp );
if( rc == DB_NOTFOUND ) {
BDB_IDL_ZERO( ids );
break;
} else if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_approx_candidates: key read failed (%d)\n", rc, 0, 0);
+ LDAP_LOG ( INDEX, RESULTS,
+ "<= bdb_approx_candidates: (%s) "
+ "key read failed (%d)\n",
+ ava->aa_desc->ad_cname.bv_val, rc, 0);
#else
- Debug( LDAP_DEBUG_TRACE, "<= bdb_approx_candidates key read failed (%d)\n",
- rc, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE,
+ "<= bdb_approx_candidates: (%s) "
+ "key read failed (%d)\n",
+ ava->aa_desc->ad_cname.bv_val, rc, 0 );
#endif
break;
}
if( BDB_IDL_IS_ZERO( tmp ) ) {
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_approx_candidates: NULL\n", 0, 0, 0 );
+ "<= bdb_approx_candidates: (%s) NULL\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
#else
- Debug( LDAP_DEBUG_TRACE, "<= bdb_approx_candidates NULL\n",
- 0, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE,
+ "<= bdb_approx_candidates: (%s) NULL\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
#endif
BDB_IDL_ZERO( ids );
break;
}
- bdb_idl_intersection( ids, tmp );
+ if ( i == 0 ) {
+ BDB_IDL_CPY( ids, tmp );
+ } else {
+ bdb_idl_intersection( ids, tmp );
+ }
if( BDB_IDL_IS_ZERO( ids ) )
break;
}
- ber_bvarray_free( keys );
+ ber_bvarray_free_x( keys, op->o_tmpmemctx );
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
static int
substring_candidates(
- Backend *be,
+ Operation *op,
SubstringsAssertion *sub,
ID *ids,
ID *tmp )
int i;
int rc;
slap_mask_t mask;
- struct berval prefix = {0};
+ struct berval prefix = {0, NULL};
struct berval *keys = NULL;
MatchingRule *mr;
#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ENTRY, "=> bdb_substring_candidates\n", 0, 0, 0 );
+ LDAP_LOG ( INDEX, ENTRY, "=> bdb_substring_candidates (%s)\n",
+ sub->sa_desc->ad_cname.bv_val, 0, 0 );
#else
- Debug( LDAP_DEBUG_TRACE, "=> bdb_substring_candidates\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "=> bdb_substring_candidates (%s)\n",
+ sub->sa_desc->ad_cname.bv_val, 0, 0 );
#endif
- rc = bdb_index_param( be, sub->sa_desc, LDAP_FILTER_SUBSTRINGS,
+ rc = bdb_index_param( op->o_bd, sub->sa_desc, LDAP_FILTER_SUBSTRINGS,
&db, &mask, &prefix );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_substring_candidates: index_param failed (%d)\n", rc, 0, 0);
+ "<= bdb_substring_candidates: (%s) "
+ "index_param failed (%d)\n",
+ sub->sa_desc->ad_cname.bv_val, rc, 0);
#else
Debug( LDAP_DEBUG_ANY,
- "<= bdb_substring_candidates: index_param failed (%d)\n",
- rc, 0, 0 );
+ "<= bdb_substring_candidates: (%s) "
+ "index_param failed (%d)\n",
+ sub->sa_desc->ad_cname.bv_val, rc, 0 );
#endif
return rc;
}
if ( db == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_substring_candidates: not indexed\n", 0, 0, 0 );
+ "<= bdb_substring_candidates: (%s) not indexed\n",
+ sub->sa_desc->ad_cname.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
- "<= bdb_substring_candidates: not indexed\n",
- 0, 0, 0 );
+ "<= bdb_substring_candidates: (%s) not indexed\n",
+ sub->sa_desc->ad_cname.bv_val, 0, 0 );
#endif
return -1;
}
mr,
&prefix,
sub,
- &keys );
+ &keys, op->o_tmpmemctx );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_substring_candidates: (%s) MR filter failed (%d)\n",
+ "<= bdb_substring_candidates: (%s) "
+ "MR filter failed (%d)\n",
sub->sa_desc->ad_cname.bv_val, rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_substring_candidates: (%s) MR filter failed (%d)\n",
+ "<= bdb_substring_candidates: (%s) "
+ "MR filter failed (%d)\n",
sub->sa_desc->ad_cname.bv_val, rc, 0 );
#endif
return rc;
}
for ( i= 0; keys[i].bv_val != NULL; i++ ) {
- rc = bdb_key_read( be, db, NULL, &keys[i], tmp );
+ rc = bdb_key_read( op->o_bd, db, NULL, &keys[i], tmp );
if( rc == DB_NOTFOUND ) {
BDB_IDL_ZERO( ids );
} else if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_substring_candidates: key read failed (%d)\n", rc, 0,0);
+ "<= bdb_substring_candidates: (%s) "
+ "key read failed (%d)\n",
+ sub->sa_desc->ad_cname.bv_val, rc, 0 );
#else
- Debug( LDAP_DEBUG_TRACE, "<= bdb_substring_candidates: key read failed (%d)\n",
- rc, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE,
+ "<= bdb_substring_candidates: (%s) "
+ "key read failed (%d)\n",
+ sub->sa_desc->ad_cname.bv_val, rc, 0 );
#endif
break;
}
if( BDB_IDL_IS_ZERO( tmp ) ) {
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_substring_candidates: NULL \n", 0, 0, 0 );
+ "<= bdb_substring_candidates: (%s) NULL\n",
+ sub->sa_desc->ad_cname.bv_val, 0, 0 );
#else
- Debug( LDAP_DEBUG_TRACE, "<= bdb_substring_candidates: NULL\n",
- 0, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE,
+ "<= bdb_substring_candidates: (%s) NULL\n",
+ sub->sa_desc->ad_cname.bv_val, 0, 0 );
#endif
BDB_IDL_ZERO( ids );
break;
}
- bdb_idl_intersection( ids, tmp );
+ if ( i == 0 ) {
+ BDB_IDL_CPY( ids, tmp );
+ } else {
+ bdb_idl_intersection( ids, tmp );
+ }
if( BDB_IDL_IS_ZERO( ids ) )
break;
}
- ber_bvarray_free( keys );
+ ber_bvarray_free_x( keys, op->o_tmpmemctx );
#ifdef NEW_LOGGING
LDAP_LOG ( INDEX, RESULTS,
projects / openldap / blobdiff