X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Ffilterindex.c;h=53289e7ffaf3ddf3356d583456b8853e933a1d68;hb=5d9479a3e82cc1ed5260f26878bf710a3b65faec;hp=dc76338b19bc77afa8b411b52a15490a969f4e48;hpb=bee0650d9ccf930491f6b9cbf2e149a93e0770d8;p=openldap

diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c
index dc76338b19..53289e7ffa 100644
--- a/servers/slapd/back-bdb/filterindex.c
+++ b/servers/slapd/back-bdb/filterindex.c
@@ -1,7 +1,7 @@
 /* filterindex.c - generate the list of candidate entries from a filter */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -13,288 +13,407 @@
 #include "back-bdb.h"
 #include "idl.h"
 
-#ifdef BDB_FILTER_INDICES
-
 static int presence_candidates(
 	Backend *be,
-	ID *range,
 	AttributeDescription *desc,
 	ID *ids );
+
 static int equality_candidates(
 	Backend *be,
-	ID *range,
 	AttributeAssertion *ava,
-	ID *ids );
+	ID *ids,
+	ID *tmp );
 static int approx_candidates(
 	Backend *be,
-	ID *range,
 	AttributeAssertion *ava,
-	ID *ids );
+	ID *ids,
+	ID *tmp );
 static int substring_candidates(
 	Backend *be,
-	ID *range,
 	SubstringsAssertion *sub,
-	ID *ids );
+	ID *ids,
+	ID *tmp );
 
 static int list_candidates(
 	Backend *be,
-	ID *range,
 	Filter *flist,
 	int ftype,
-	ID *ids );
-
+	ID *ids,
+	ID *tmp,
+	ID *stack );
 
 int
 bdb_filter_candidates(
 	Backend	*be,
-	ID *range,
 	Filter	*f,
-	ID *ids )
+	ID *ids,
+	ID *tmp,
+	ID *stack )
 {
 	int rc = -1;
+#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
 
 	switch ( f->f_choice ) {
 	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 );
+		if( rc == DB_NOTFOUND ) {
+			BDB_IDL_ZERO( ids );
+			rc = 0;
+		}
 		break;
 
 	case SLAPD_FILTER_DN_SUBTREE:
+#ifdef NEW_LOGGING
+		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tDN SUBTREE\n", 0, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tDN SUBTREE\n", 0, 0, 0 );
+#endif
 		rc = bdb_dn2idl( be, f->f_dn, DN_SUBTREE_PREFIX, ids );
 		break;
 
 	case LDAP_FILTER_PRESENT:
+#ifdef NEW_LOGGING
+		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tPRESENT\n", 0, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tPRESENT\n", 0, 0, 0 );
-		rc = presence_candidates( be, range, f->f_desc, ids );
+#endif
+		rc = presence_candidates( be, f->f_desc, ids );
 		break;
 
-#if 0
 	case LDAP_FILTER_EQUALITY:
+#ifdef NEW_LOGGING
+		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tEQUALITY\n", 0, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tEQUALITY\n", 0, 0, 0 );
-		rc = equality_candidates( be, range, f->f_ava, ids );
+#endif
+		rc = equality_candidates( be, 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 );
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tAPPROX\n", 0, 0, 0 );
-		rc = approx_candidates( be, range, f->f_ava, ids );
+#endif
+		rc = approx_candidates( be, 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 );
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tSUBSTRINGS\n", 0, 0, 0 );
-		rc = substring_candidates( be, range, f->f_sub, ids );
-		break;
 #endif
+		rc = substring_candidates( be, 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 );
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tGE\n", 0, 0, 0 );
-		rc = 0;
+#endif
+		rc = presence_candidates( be, 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 );
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tLE\n", 0, 0, 0 );
-		rc = 0;
+#endif
+		rc = presence_candidates( be, f->f_ava->aa_desc, ids );
 		break;
 
-	case LDAP_FILTER_NOT: {
-			ID tmp[BDB_IDL_SIZE];
-
-			Debug( LDAP_DEBUG_FILTER, "\tNOT\n", 0, 0, 0 );
-			rc = bdb_filter_candidates( be, range, f->f_not, tmp );
-			if( rc == 0 ) {
-				rc = bdb_idl_notin( range, tmp, 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 );
+#else
+		Debug( LDAP_DEBUG_FILTER, "\tNOT\n", 0, 0, 0 );
+#endif
+		break;
 
 	case LDAP_FILTER_AND:
+#ifdef NEW_LOGGING
+		LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tAND\n", 0, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tAND\n", 0, 0, 0 );
-		rc = list_candidates( be, range,
-			f->f_and, LDAP_FILTER_AND, ids );
+#endif
+		rc = list_candidates( be, 
+			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 );
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tOR\n", 0, 0, 0 );
-		rc = list_candidates( be, range,
-			f->f_or, LDAP_FILTER_OR, ids );
+#endif
+		rc = list_candidates( be, 
+			f->f_or, LDAP_FILTER_OR, ids, tmp, stack );
 		break;
 
 	default:
-		Debug( LDAP_DEBUG_FILTER, "\tUNKNOWN %d\n",
-			f->f_choice, 0, 0 );
-	}
-
-	if( rc ) {
-		BDB_IDL_CPY( ids, range );
+#ifdef NEW_LOGGING
+		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
 	}
 
+#ifdef NEW_LOGGING
+	LDAP_LOG ( INDEX, RESULTS, 
+		"=> bdb_filter_candidates: id=%ld first=%ld last=%ld\n", 
+		(long)ids[0], (long)BDB_IDL_FIRST( ids ), (long) BDB_IDL_LAST( ids ));
+#else
 	Debug( LDAP_DEBUG_FILTER,
 		"<= bdb_filter_candidates: id=%ld first=%ld last=%ld\n",
-		ids[0], ids[1],
-		BDB_IDL_IS_RANGE( ids ) ? ids[2] : ids[ids[0]] );
+		(long) ids[0],
+		(long) BDB_IDL_FIRST( ids ),
+		(long) BDB_IDL_LAST( ids ) );
+#endif
 
-	return 0;
+	return rc;
 }
 
 static int
 list_candidates(
 	Backend	*be,
-	ID *range,
 	Filter	*flist,
 	int		ftype,
-	ID *ids )
+	ID *ids,
+	ID *tmp,
+	ID *save )
 {
+	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 	int rc = 0;
 	Filter	*f;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG ( INDEX, ARGS, "=> bdb_list_candidates: 0x%x\n", ftype, 0 , 0 );
+#else
 	Debug( LDAP_DEBUG_FILTER, "=> bdb_list_candidates 0x%x\n", ftype, 0, 0 );
+#endif
 
-	if( ftype == LDAP_FILTER_AND ) {
-		BDB_IDL_CPY( ids, range );
-	} else {
+	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 ) {
-		ID tmp[BDB_IDL_SIZE];
-		ID result[BDB_IDL_SIZE];
-		rc = bdb_filter_candidates( be, range, f, tmp );
+		rc = bdb_filter_candidates( be, f, save, tmp,
+			save+BDB_IDL_UM_SIZE );
 
 		if ( rc != 0 ) {
-			/* Error: treat as undefined */
-			if( ftype == LDAP_FILTER_AND ) {
+			if ( ftype == LDAP_FILTER_AND ) {
+				rc = 0;
 				continue;
 			}
-			BDB_IDL_CPY( ids, range );
 			break;
 		}
-
-
+		
 		if ( ftype == LDAP_FILTER_AND ) {
-			bdb_idl_intersection( tmp, ids, result );
-			if( BDB_IDL_IS_ZERO( result ) ) {
-				BDB_IDL_ZERO( ids );
+			bdb_idl_intersection( ids, save );
+			if( BDB_IDL_IS_ZERO( ids ) )
 				break;
-			}
 		} else {
-			bdb_idl_union( tmp, ids, result );
-			if( BDB_IDL_IS_ALL( range, result ) ) {
-				BDB_IDL_CPY( ids, range );
-				break;
-			}
+			bdb_idl_union( ids, save );
+			BDB_IDL_ALL( bdb, save );
 		}
+	}
 
-		BDB_IDL_CPY( ids, result );
+	if( rc ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( INDEX, RESULTS, 
+			"<= bdb_list_candidates: id=%ld first=%ld last=%ld\n",
+			(long) ids[0], (long) BDB_IDL_FIRST( ids ), 
+			(long) BDB_IDL_LAST( ids ) );
+#else
+		Debug( LDAP_DEBUG_FILTER,
+			"<= bdb_list_candidates: id=%ld first=%ld last=%ld\n",
+			(long) ids[0],
+			(long) BDB_IDL_FIRST(ids),
+			(long) BDB_IDL_LAST(ids) );
+#endif
+
+	} else {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( INDEX, ARGS, "<= bdb_list_candidates: rc=%d\n", rc, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_FILTER,
+			"<= bdb_list_candidates: undefined rc=%d\n",
+			rc, 0, 0 );
+#endif
 	}
 
-	Debug( LDAP_DEBUG_FILTER,
-		"<= bdb_list_candidates: id=%ld first=%ld last=%ld\n",
-		ids[0], BDB_IDL_FIRST(ids), BDB_IDL_LAST(ids) );
-	return 0;
+	return rc;
 }
 
 static int
 presence_candidates(
 	Backend	*be,
-	ID *range,
 	AttributeDescription *desc,
 	ID *ids )
 {
+	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 	DB *db;
 	int rc;
 	slap_mask_t mask;
-	struct berval *prefix;
+	struct berval prefix = {0};
 
+#ifdef NEW_LOGGING
+	LDAP_LOG ( INDEX, ENTRY, "=> bdb_presence_candidates\n", 0, 0, 0 );
+#else
 	Debug( LDAP_DEBUG_TRACE, "=> bdb_presence_candidates\n", 0, 0, 0 );
-	BDB_IDL_ZERO( ids );
+#endif
+
+	if( desc == slap_schema.si_ad_objectClass ) {
+		BDB_IDL_ALL( bdb, ids );
+		return 0;
+	}
 
 	rc = bdb_index_param( be, desc, LDAP_FILTER_PRESENT,
 		&db, &mask, &prefix );
 
 	if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( INDEX, RESULTS, 
+			"=> bdb_presence_candidates: index_parm returned=%d\n", rc, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"<= bdb_presence_candidates: index_param returned=%d\n",
 			rc, 0, 0 );
-		return rc;
+#endif
+		return 0;
 	}
 
 	if( db == NULL ) {
 		/* not indexed */
+#ifdef NEW_LOGGING
+		LDAP_LOG(INDEX, RESULTS, 
+			"<= bdb_presence_candidates: not indexed\n", 0, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE,
-			"<= bdb_presense_candidates: not indexed\n",
+			"<= bdb_presence_candidates: not indexed\n",
 			0, 0, 0 );
-		rc = -1;
-		goto done;
+#endif
+		return 0;
 	}
 
-	if( prefix == NULL ) {
+	if( prefix.bv_val == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(INDEX, RESULTS, 
+			"<= bdb_presence_candidates: no prefix\n", 0, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE,
-			"<= bdb_presense_candidates: no prefix\n",
+			"<= bdb_presence_candidates: no prefix\n",
 			0, 0, 0 );
-		rc = -1;
-		goto done;
+#endif
+		return 0;
 	}
 
-	rc = bdb_key_read( be, db, prefix, ids );
+	rc = bdb_key_read( be, db, NULL, &prefix, ids );
 
 	if( rc == DB_NOTFOUND ) {
+		BDB_IDL_ZERO( ids );
 		rc = 0;
-
 	} else if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( INDEX, RESULTS, 
+			"<= bdb_presence_candidates: key read failed (%d)\n", rc, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"<= bdb_presense_candidates: key read failed (%d)\n",
 			rc, 0, 0 );
+#endif
 		goto done;
 	}
 
+#ifdef NEW_LOGGING
+	LDAP_LOG ( INDEX, RESULTS, 
+		"<= bdb_presence_candidates: id=%ld first=%ld last=%ld\n",
+		(long)ids[0], (long)BDB_IDL_FIRST( ids ), (long)BDB_IDL_LAST( ids ) );
+#else
 	Debug(LDAP_DEBUG_TRACE,
 		"<= bdb_presence_candidates: id=%ld first=%ld last=%ld\n",
-		ids[0], BDB_IDL_FIRST(ids), BDB_IDL_LAST(ids) );
+		(long) ids[0],
+		(long) BDB_IDL_FIRST(ids),
+		(long) BDB_IDL_LAST(ids) );
+#endif
 
 done:
-	ber_bvfree( prefix );
 	return rc;
 }
 
 static int
 equality_candidates(
 	Backend	*be,
-	ID *range,
 	AttributeAssertion *ava,
-	ID *ids )
+	ID *ids,
+	ID *tmp )
 {
 	DB	*db;
 	int i;
 	int rc;
-	char *dbname;
 	slap_mask_t mask;
-	struct berval *prefix;
-	struct berval **keys = NULL;
+	struct berval prefix = {0};
+	struct berval *keys = NULL;
 	MatchingRule *mr;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG ( INDEX, ENTRY, "=> equality_candidates\n", 0, 0, 0 );
+#else
 	Debug( LDAP_DEBUG_TRACE, "=> bdb_equality_candidates\n", 0, 0, 0 );
-
-	BDB_IDL_RANGE_CPY( range, ids );
+#endif
 
 	rc = bdb_index_param( be, 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);
+#else
 		Debug( LDAP_DEBUG_ANY,
-			"<= equality_candidates: index_param failed (%d)\n",
+			"<= bdb_equality_candidates: index_param failed (%d)\n",
 			rc, 0, 0 );
-		return 0;
+#endif
+		return rc;
+	}
+
+	if ( db == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(INDEX, RESULTS, 
+			"=> bdb_equality_candidates: not indexed\n", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY,
+			"<= bdb_equality_candidates: not indexed\n", 0, 0, 0 );
+#endif
+		return -1;
 	}
 
 	mr = ava->aa_desc->ad_type->sat_equality;
 	if( !mr ) {
-		ber_bvfree( prefix );
-		return 0;
+		return -1;
 	}
 
 	if( !mr->smr_filter ) {
-		ber_bvfree( prefix );
-		return 0;
+		return -1;
 	}
 
 	rc = (mr->smr_filter)(
@@ -302,90 +421,133 @@ equality_candidates(
 		mask,
 		ava->aa_desc->ad_type->sat_syntax,
 		mr,
-		prefix,
-		ava->aa_value,
+		&prefix,
+		&ava->aa_value,
 		&keys );
 
-	ber_bvfree( prefix );
-
 	if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( INDEX, RESULTS, 
+			"=> bdb_equality_candidates: MR filter failed (%d)\n", rc, 0, 0);
+#else
 		Debug( LDAP_DEBUG_TRACE,
-			"<= bdb_equality_candidates: (%s%s) MR filter failed (%d)\n",
-			"", "", rc );
-		return 0;
+			"<= bdb_equality_candidates: MR filter failed (%d)\n",
+			rc, 0, 0 );
+#endif
+		return rc;
 	}
 
 	if( keys == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( INDEX, RESULTS, 
+			"=> bdb_equality_candidates: no keys\n", 0, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE,
-			"<= bdb_equality_candidates: no keys (%s%s)\n",
-			"", "", 0 );
+			"<= bdb_equality_candidates: no keys\n",
+			0, 0, 0 );
+#endif
 		return 0;
 	}
 
-	for ( i= 0; keys[i] != NULL; i++ ) {
-		ID save[BDB_IDL_SIZE];
-		ID tmp[BDB_IDL_SIZE];
-
-		rc = bdb_key_read( be, db, keys[i], tmp );
-
-		if( rc != LDAP_SUCCESS ) {
+	for ( i= 0; keys[i].bv_val != NULL; i++ ) {
+		rc = bdb_key_read( be, db, NULL, &keys[i], tmp );
+
+		if( rc == DB_NOTFOUND ) {
+			BDB_IDL_ZERO( ids );
+			rc = 0;
+		} else if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG ( INDEX, RESULTS, 
+				"<= bdb_equality_candidates: key read failed (%d)\n", rc, 0, 0);
+#else
 			Debug( LDAP_DEBUG_TRACE,
 				"<= bdb_equality_candidates key read failed (%d)\n",
 				rc, 0, 0 );
+#endif
 			break;
 		}
 
-		if( tmp == NULL ) {
+		if( BDB_IDL_IS_ZERO( tmp ) ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG ( INDEX, RESULTS, "=> bdb_equality_candidates: NULL\n", 0, 0, 0);
+#else
 			Debug( LDAP_DEBUG_TRACE,
 				"<= bdb_equality_candidates NULL\n",
 				0, 0, 0 );
+#endif
+			BDB_IDL_ZERO( ids );
 			break;
 		}
 
-		save = idl;
-		idl = idl_intersection( be, idl, tmp );
-		idl_free( save );
-		idl_free( tmp );
+		bdb_idl_intersection( ids, tmp );
 
-		if( idl == NULL ) break;
+		if( BDB_IDL_IS_ZERO( ids ) )
+			break;
 	}
 
-	ber_bvecfree( keys );
+	ber_bvarray_free( keys );
 
+#ifdef NEW_LOGGING
+	LDAP_LOG ( INDEX, RESULTS, 
+		"<= bdb_equality_candidates: id=%ld first=%ld last=%ld\n", 
+		(long) ids[0], (long) BDB_IDL_FIRST( ids ), 
+		(long) BDB_IDL_LAST( ids ) );
+#else
 	Debug( LDAP_DEBUG_TRACE,
-		"<= bdb_equality_candidates %ld\n",
-		ids[0], BDB_IDL_FIRST(ids), BDB_IDL_LAST(ids) );
-	return( idl );
+		"<= bdb_equality_candidates id=%ld, first=%ld, last=%ld\n",
+		(long) ids[0],
+		(long) BDB_IDL_FIRST(ids),
+		(long) BDB_IDL_LAST(ids) );
+#endif
+	return( rc );
 }
 
 
 static int
 approx_candidates(
 	Backend	*be,
-	ID *range,
 	AttributeAssertion *ava,
-	ID *ids )
+	ID *ids,
+	ID *tmp )
 {
-	ID_BLOCK *idl;
-	DBCache	*db;
+	DB	*db;
 	int i;
 	int rc;
-	char *dbname;
 	slap_mask_t mask;
-	struct berval *prefix;
-	struct berval **keys = NULL;
+	struct berval prefix = {0};
+	struct berval *keys = NULL;
 	MatchingRule *mr;
 
-	Debug( LDAP_DEBUG_TRACE, "=> approx_candidates\n", 0, 0, 0 );
+#ifdef NEW_LOGGING
+	LDAP_LOG ( INDEX, ENTRY, "=> bdb_approx_candidates\n", 0, 0, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE, "=> bdb_approx_candidates\n", 0, 0, 0 );
+#endif
 
 	rc = bdb_index_param( be, 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 );
+#else
 		Debug( LDAP_DEBUG_ANY,
-			"<= approx_candidates: index_param failed (%d)\n",
+			"<= bdb_approx_candidates: index_param failed (%d)\n",
 			rc, 0, 0 );
-		return idl;
+#endif
+		return rc;
+	}
+
+	if ( db == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(INDEX, RESULTS, 
+			"<= bdb_approx_candidates: not indexed\n",0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY,
+			"<= bdb_approx_candidates: not indexed\n", 0, 0, 0 );
+#endif
+		return -1;
 	}
 
 	mr = ava->aa_desc->ad_type->sat_approx;
@@ -395,13 +557,11 @@ approx_candidates(
 	}
 
 	if( !mr ) {
-		ber_bvfree( prefix );
-		return idl;
+		return -1;
 	}
 
 	if( !mr->smr_filter ) {
-		ber_bvfree( prefix );
-		return idl;
+		return -1;
 	}
 
 	rc = (mr->smr_filter)(
@@ -409,119 +569,142 @@ approx_candidates(
 		mask,
 		ava->aa_desc->ad_type->sat_syntax,
 		mr,
-		prefix,
-		ava->aa_value,
+		&prefix,
+		&ava->aa_value,
 		&keys );
 
-	ber_bvfree( prefix );
-
 	if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( INDEX, RESULTS, 
+			"<= bdb_approx_candidates: MR filter failed (%d)\n", rc, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE,
-			"<= approx_candidates: (%s%s) MR filter failed (%d)\n",
-			dbname, LDBM_SUFFIX, rc );
-		return idl;
+			"<= bdb_approx_candidates: (%s) MR filter failed (%d)\n",
+			prefix.bv_val, rc, 0 );
+#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 );
+#else
 		Debug( LDAP_DEBUG_TRACE,
-			"<= approx_candidates: no keys (%s%s)\n",
-			dbname, LDBM_SUFFIX, 0 );
-		return idl;
-	}
-
-	if ( db == NULL ) {
-		Debug( LDAP_DEBUG_ANY,
-			"<= approx_candidates db open failed (%s%s)\n",
-			dbname, LDBM_SUFFIX, 0 );
-		return idl;
+			"<= bdb_approx_candidates: no keys (%s)\n",
+			prefix.bv_val, 0, 0 );
+#endif
+		return 0;
 	}
 
-	for ( i= 0; keys[i] != NULL; i++ ) {
-		ID_BLOCK *save;
-		ID_BLOCK *tmp;
+	for ( i= 0; keys[i].bv_val != NULL; i++ ) {
+		rc = bdb_key_read( be, db, NULL, &keys[i], tmp );
 
-		rc = key_read( be, db, keys[i], &tmp );
-
-		if( rc != LDAP_SUCCESS ) {
-			idl_free( idl );
-			idl = NULL;
-			Debug( LDAP_DEBUG_TRACE, "<= approx_candidates key read failed (%d)\n",
+		if( rc == DB_NOTFOUND ) {
+			BDB_IDL_ZERO( ids );
+			rc = 0;
+			break;
+		} else if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( INDEX, RESULTS, 
+			"<= bdb_approx_candidates: key read failed (%d)\n", rc, 0, 0);
+#else
+			Debug( LDAP_DEBUG_TRACE, "<= bdb_approx_candidates key read failed (%d)\n",
 				rc, 0, 0 );
+#endif
 			break;
 		}
 
-		if( tmp == NULL ) {
-			idl_free( idl );
-			idl = NULL;
-			Debug( LDAP_DEBUG_TRACE, "<= approx_candidates NULL\n",
+		if( BDB_IDL_IS_ZERO( tmp ) ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG ( INDEX, RESULTS, 
+				"<= bdb_approx_candidates: NULL\n", 0, 0, 0 );
+#else
+			Debug( LDAP_DEBUG_TRACE, "<= bdb_approx_candidates NULL\n",
 				0, 0, 0 );
+#endif
+			BDB_IDL_ZERO( ids );
 			break;
 		}
 
-		save = idl;
-		idl = idl_intersection( be, idl, tmp );
-		idl_free( save );
+		bdb_idl_intersection( ids, tmp );
 
-		if( idl == NULL ) break;
+		if( BDB_IDL_IS_ZERO( ids ) )
+			break;
 	}
 
-	ber_bvecfree( keys );
-
-	Debug( LDAP_DEBUG_TRACE, "<= approx_candidates %ld\n",
-		ids[0], BDB_IDL_FIRST(ids), BDB_IDL_LAST(ids) );
-
-	return( idl );
+	ber_bvarray_free( keys );
+
+#ifdef NEW_LOGGING
+	LDAP_LOG ( INDEX, RESULTS, 
+		"<= bdb_approx_candidates: id=%ld first=%ld last=%ld\n", 
+		(long) ids[0], (long) BDB_IDL_FIRST( ids ), 
+		(long) BDB_IDL_LAST( ids ) );
+#else
+	Debug( LDAP_DEBUG_TRACE, "<= bdb_approx_candidates %ld, first=%ld, last=%ld\n",
+		(long) ids[0],
+		(long) BDB_IDL_FIRST(ids),
+		(long) BDB_IDL_LAST(ids) );
+#endif
+	return( rc );
 }
 
 static int
 substring_candidates(
 	Backend	*be,
-	ID *range,
 	SubstringsAssertion	*sub,
-	ID *ids )
+	ID *ids,
+	ID *tmp )
 {
-	ID_BLOCK *idl;
-	DBCache	*db;
+	DB	*db;
 	int i;
 	int rc;
 	slap_mask_t mask;
-	struct berval *prefix;
-	struct berval **keys = NULL;
+	struct berval prefix = {0};
+	struct berval *keys = NULL;
 	MatchingRule *mr;
 
-	Debug( LDAP_DEBUG_TRACE, "=> substrings_candidates\n", 0, 0, 0 );
-
-	idl = idl_allids( be );
+#ifdef NEW_LOGGING
+	LDAP_LOG ( INDEX, ENTRY, "=> bdb_substring_candidates\n", 0, 0, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE, "=> bdb_substring_candidates\n", 0, 0, 0 );
+#endif
 
 	rc = bdb_index_param( be, 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);
+#else
 		Debug( LDAP_DEBUG_ANY,
-			"<= substrings_candidates: index_param failed (%d)\n",
+			"<= bdb_substring_candidates: index_param failed (%d)\n",
 			rc, 0, 0 );
-		return idl;
+#endif
+		return rc;
 	}
 
-	if( dbname == NULL ) {
-		/* not indexed */
+	if ( db == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( INDEX, RESULTS, 
+			"<= bdb_substring_candidates: not indexed\n", 0, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_ANY,
-			"<= substrings_candidates: not indexed\n",
+			"<= bdb_substring_candidates not indexed\n",
 			0, 0, 0 );
-		ber_bvfree( prefix );
-		return idl;
+#endif
+		return -1;
 	}
 
 	mr = sub->sa_desc->ad_type->sat_substr;
 
 	if( !mr ) {
-		ber_bvfree( prefix );
-		return idl;
+		return -1;
 	}
 
 	if( !mr->smr_filter ) {
-		ber_bvfree( prefix );
-		return idl;
+		return -1;
 	}
 
 	rc = (mr->smr_filter)(
@@ -529,70 +712,85 @@ substring_candidates(
 		mask,
 		sub->sa_desc->ad_type->sat_syntax,
 		mr,
-		prefix,
+		&prefix,
 		sub,
 		&keys );
 
-	ber_bvfree( prefix );
-
 	if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( INDEX, RESULTS, 
+			"<= bdb_substring_candidates: (%s) MR filter failed (%d)\n", 
+			sub->sa_desc->ad_cname.bv_val, rc, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE,
-			"<= substrings_candidates: (%s%s) MR filter failed (%d)\n",
-			dbname, LDBM_SUFFIX, rc );
-		return idl;
+			"<= bdb_substring_candidates: (%s) MR filter failed (%d)\n",
+			sub->sa_desc->ad_cname.bv_val, rc, 0 );
+#endif
+		return rc;
 	}
 
 	if( keys == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( INDEX, RESULTS, 
+			"<= bdb_substring_candidates: (%d) MR filter failed (%s)\n", 
+			mask, sub->sa_desc->ad_cname.bv_val, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE,
-			"<= substrings_candidates: (0x%04lx) no keys (%s%s)\n",
-			mask, dbname, LDBM_SUFFIX );
-		return idl;
-	}
-
-	db = ldbm_cache_open( be, dbname, LDBM_SUFFIX, LDBM_READER );
-	
-	if ( db == NULL ) {
-		Debug( LDAP_DEBUG_ANY,
-			"<= substrings_candidates db open failed (%s%s)\n",
-			dbname, LDBM_SUFFIX, 0 );
-		return idl;
+			"<= bdb_substring_candidates: (0x%04lx) no keys (%s)\n",
+			mask, sub->sa_desc->ad_cname.bv_val, 0 );
+#endif
+		return 0;
 	}
 
-	for ( i= 0; keys[i] != NULL; i++ ) {
-		ID_BLOCK *save;
-		ID_BLOCK *tmp;
-
-		rc = key_read( be, db, keys[i], &tmp );
+	for ( i= 0; keys[i].bv_val != NULL; i++ ) {
+		rc = bdb_key_read( be, db, NULL, &keys[i], tmp );
 
-		if( rc != LDAP_SUCCESS ) {
-			idl_free( idl );
-			idl = NULL;
-			Debug( LDAP_DEBUG_TRACE, "<= substrings_candidates key read failed (%d)\n",
+		if( rc == DB_NOTFOUND ) {
+			BDB_IDL_ZERO( ids );
+			rc = 0;
+			break;
+		} else if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG ( INDEX, RESULTS, 
+				"<= bdb_substring_candidates: key read failed (%d)\n", rc, 0,0);
+#else
+			Debug( LDAP_DEBUG_TRACE, "<= bdb_substring_candidates key read failed (%d)\n",
 				rc, 0, 0 );
+#endif
 			break;
 		}
 
-		if( tmp == NULL ) {
-			idl_free( idl );
-			idl = NULL;
-			Debug( LDAP_DEBUG_TRACE, "<= substrings_candidates NULL\n",
+		if( BDB_IDL_IS_ZERO( tmp ) ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG ( INDEX, RESULTS, 
+				"<= bdb_substring_candidates: NULL \n", 0, 0, 0 );
+#else
+			Debug( LDAP_DEBUG_TRACE, "<= bdb_substring_candidates NULL\n",
 				0, 0, 0 );
+#endif
+			BDB_IDL_ZERO( ids );
 			break;
 		}
 
-		save = idl;
-		idl = idl_intersection( be, idl, tmp );
-		idl_free( save );
+		bdb_idl_intersection( ids, tmp );
 
-		if( idl == NULL ) break;
+		if( BDB_IDL_IS_ZERO( ids ) )
+			break;
 	}
 
-	ber_bvecfree( keys );
-
-	Debug( LDAP_DEBUG_TRACE, "<= substrings_candidates %ld\n",
-		ids[0], BDB_IDL_FIRST(ids), BDB_IDL_LAST(ids) );
-
-	return( idl );
+	ber_bvarray_free( keys );
+
+#ifdef NEW_LOGGING
+	LDAP_LOG ( INDEX, RESULTS, 
+		"<= bdb_substring_candidates: id=%ld first=%ld last=%ld\n",
+		(long) ids[0], (long) BDB_IDL_FIRST( ids ), 
+		(long) BDB_IDL_LAST( ids ) );
+#else
+	Debug( LDAP_DEBUG_TRACE, "<= bdb_substring_candidates %ld, first=%ld, last=%ld\n",
+		(long) ids[0],
+		(long) BDB_IDL_FIRST(ids),
+		(long) BDB_IDL_LAST(ids) );
+#endif
+	return( 0 );
 }
 
-#endif
\ No newline at end of file