X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Ffilterindex.c;h=2dbb326e324c1ee5c63aa7233eefce292a47fa6d;hb=47c6701a2293fec249cdb84f69b37addfb4b36fc;hp=113c378eaca64e49bf3c0b09d90378d1a194f32e;hpb=6939c531700652491f4be4688c6a1f35a1ab8a18;p=openldap

diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c
index 113c378eac..2dbb326e32 100644
--- a/servers/slapd/back-bdb/filterindex.c
+++ b/servers/slapd/back-bdb/filterindex.c
@@ -1,8 +1,17 @@
 /* filterindex.c - generate the list of candidate entries from a filter */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -14,28 +23,28 @@
 #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,
@@ -44,134 +53,182 @@ static int list_candidates(
 
 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
 	Debug( LDAP_DEBUG_FILTER, "=> bdb_filter_candidates\n", 0, 0, 0 );
 #endif
+#if 0
+	char *subtree="SUBTREE";
+#endif
 
 	switch ( f->f_choice ) {
+	case SLAPD_FILTER_COMPUTED:
+		switch( f->f_result ) {
+		case SLAPD_COMPARE_UNDEFINED:
+		/* This technically is not the same as FALSE, but it
+		 * certainly will produce no matches.
+		 */
+		/* FALL THRU */
+		case LDAP_COMPARE_FALSE:
+			BDB_IDL_ZERO( ids );
+			break;
+		case LDAP_COMPARE_TRUE: {
+			struct bdb_info *bdb = (struct bdb_info *)op->o_bd->be_private;
+			BDB_IDL_ALL( bdb, ids );
+			} break;
+		case LDAP_SUCCESS:
+			/* this is a pre-computed scope, leave it alone */
+			break;
+		}
+		break;
+#if 0	/* Not used any more, search calls bdb_dn2idl directly */
 	case SLAPD_FILTER_DN_ONE:
 #ifdef NEW_LOGGING
-		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tDN ONE\n", 0, 0, 0 );
+		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,
+			stack, op->o_tmpmemctx );
 		if( rc == DB_NOTFOUND ) {
 			BDB_IDL_ZERO( ids );
 			rc = 0;
 		}
 		break;
 
+	case SLAPD_FILTER_DN_CHILDREN:
+		subtree="CHILDREN";
+		/* Fall Thru */
 	case SLAPD_FILTER_DN_SUBTREE:
 #ifdef NEW_LOGGING
-		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tDN SUBTREE\n", 0, 0, 0 );
+		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tDN %s\n",
+			subtree, 0, 0 );
 #else
-		Debug( LDAP_DEBUG_FILTER, "\tDN SUBTREE\n", 0, 0, 0 );
+		Debug( LDAP_DEBUG_FILTER, "\tDN %s\n",
+			subtree, 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,
+			stack, op->o_tmpmemctx );
 		break;
-
+#endif
 	case LDAP_FILTER_PRESENT:
 #ifdef NEW_LOGGING
-		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tPRESENT\n", 0, 0, 0 );
+		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tPRESENT\n",
+			0, 0, 0 );
 #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:
 #ifdef NEW_LOGGING
-		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tEQUALITY\n", 0, 0, 0 );
+		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tEQUALITY\n",
+			0, 0, 0 );
 #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:
 #ifdef NEW_LOGGING
-		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tAPPROX\n", 0, 0, 0 );
+		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tAPPROX\n",
+			0, 0, 0 );
 #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:
 #ifdef NEW_LOGGING
-		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tSUBSTRINGS\n", 0, 0, 0 );
+		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tSUBSTRINGS\n",
+			0, 0, 0 );
 #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:
 		/* no GE index, use pres */
 #ifdef NEW_LOGGING
-		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tGE\n", 0, 0, 0 );
+		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tGE\n",
+			0, 0, 0 );
 #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:
 		/* no LE index, use pres */
 #ifdef NEW_LOGGING
-		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tLE\n", 0, 0, 0 );
+		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tLE\n",
+			0, 0, 0 );
 #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:
 		/* no indexing to support NOT filters */
 #ifdef NEW_LOGGING
-		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tNOT\n",0, 0, 0 );
+		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tNOT\n",
+			0, 0, 0 );
 #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:
 #ifdef NEW_LOGGING
-		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tAND\n", 0, 0, 0 );
+		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tAND\n",
+			0, 0, 0 );
 #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;
 
 	case LDAP_FILTER_OR:
 #ifdef NEW_LOGGING
-		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tOR\n", 0, 0, 0 );
+		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tOR\n",
+			0, 0, 0 );
 #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;
 
 	default:
 #ifdef NEW_LOGGING
-		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tUNKNOWN\n", 0, 0, 0 );
+		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tUNKNOWN\n",
+			0, 0, 0 );
 #else
 		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
@@ -191,14 +248,14 @@ bdb_filter_candidates(
 
 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;
 
@@ -207,16 +264,14 @@ list_candidates(
 #else
 	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 );
-	}
-
 	for ( f = flist; f != NULL; f = f->f_next ) {
-		rc = bdb_filter_candidates( be, f, save, tmp,
+		/* ignore precomputed scopes */
+		if ( f->f_choice == SLAPD_FILTER_COMPUTED &&
+		     f->f_result == LDAP_SUCCESS ) {
+			continue;
+		}
+		BDB_IDL_ZERO( save );
+		rc = bdb_filter_candidates( op, f, save, tmp,
 			save+BDB_IDL_UM_SIZE );
 
 		if ( rc != 0 ) {
@@ -226,14 +281,22 @@ list_candidates(
 			}
 			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 );
+			}
 		}
 	}
 
@@ -266,38 +329,44 @@ list_candidates(
 
 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
 
+	BDB_IDL_ALL( bdb, ids );
+
 	if( desc == slap_schema.si_ad_objectClass ) {
-		BDB_IDL_ALL( bdb, ids );
 		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;
 	}
@@ -306,11 +375,12 @@ presence_candidates(
 		/* 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;
 	}
@@ -318,16 +388,17 @@ presence_candidates(
 	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;
+		return -1;
 	}
 
-	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 );
@@ -335,11 +406,14 @@ presence_candidates(
 	} 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;
 	}
@@ -362,58 +436,68 @@ done:
 
 static int
 equality_candidates(
-	Backend	*be,
+	Operation *op,
 	AttributeAssertion *ava,
 	ID *ids,
 	ID *tmp )
 {
+	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
 	DB	*db;
 	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,
+	BDB_IDL_ALL( bdb, ids );
+
+	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;
+		return 0;
 	}
 
 	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;
+		return 0;
 	}
 
 	mr = ava->aa_desc->ad_type->sat_equality;
 	if( !mr ) {
-		return -1;
+		return 0;
 	}
 
 	if( !mr->smr_filter ) {
-		return -1;
+		return 0;
 	}
 
 	rc = (mr->smr_filter)(
@@ -423,47 +507,54 @@ equality_candidates(
 		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;
+		return 0;
 	}
 
 	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;
 		}
@@ -471,23 +562,28 @@ equality_candidates(
 		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, 
@@ -507,49 +603,59 @@ equality_candidates(
 
 static int
 approx_candidates(
-	Backend	*be,
+	Operation *op,
 	AttributeAssertion *ava,
 	ID *ids,
 	ID *tmp )
 {
+	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
 	DB	*db;
 	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,
+	BDB_IDL_ALL( bdb, ids );
+
+	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;
+		return 0;
 	}
 
 	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;
+		return 0;
 	}
 
 	mr = ava->aa_desc->ad_type->sat_approx;
@@ -559,11 +665,11 @@ approx_candidates(
 	}
 
 	if( !mr ) {
-		return -1;
+		return 0;
 	}
 
 	if( !mr->smr_filter ) {
-		return -1;
+		return 0;
 	}
 
 	rc = (mr->smr_filter)(
@@ -573,35 +679,38 @@ approx_candidates(
 		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;
+		return 0;
 	}
 
 	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 );
@@ -609,11 +718,15 @@ approx_candidates(
 			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;
 		}
@@ -621,22 +734,28 @@ approx_candidates(
 		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, 
@@ -654,60 +773,69 @@ approx_candidates(
 
 static int
 substring_candidates(
-	Backend	*be,
+	Operation *op,
 	SubstringsAssertion	*sub,
 	ID *ids,
 	ID *tmp )
 {
+	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
 	DB	*db;
 	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,
+	BDB_IDL_ALL( bdb, ids );
+
+	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;
+		return 0;
 	}
 
 	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;
+		return 0;
 	}
 
 	mr = sub->sa_desc->ad_type->sat_substr;
 
 	if( !mr ) {
-		return -1;
+		return 0;
 	}
 
 	if( !mr->smr_filter ) {
-		return -1;
+		return 0;
 	}
 
 	rc = (mr->smr_filter)(
@@ -717,19 +845,21 @@ substring_candidates(
 		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;
+		return 0;
 	}
 
 	if( keys == NULL ) {
@@ -746,7 +876,7 @@ substring_candidates(
 	}
 
 	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 );
@@ -755,10 +885,14 @@ substring_candidates(
 		} 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;
 		}
@@ -766,22 +900,28 @@ substring_candidates(
 		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, 
@@ -794,6 +934,6 @@ substring_candidates(
 		(long) BDB_IDL_FIRST(ids),
 		(long) BDB_IDL_LAST(ids) );
 #endif
-	return( 0 );
+	return( rc );
 }