X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Ffilterindex.c;h=bd8adc0bdc8c2deb688b4adf0a0c59f0ee3757c5;hb=b7f0983efafb6139d45814978ec376f87c228c37;hp=f1fe17c85f866d8f5ed1a54c9628c2bf84348c4c;hpb=d68b891ced4703a1660b75eb7f6dbd8649167621;p=openldap

diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c
index f1fe17c85f..bd8adc0bdc 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,8 +13,6 @@
 #include "back-bdb.h"
 #include "idl.h"
 
-#ifdef BDB_FILTER_INDICES
-
 static int presence_candidates(
 	Backend *be,
 	AttributeDescription *desc,
@@ -41,88 +39,146 @@ static int list_candidates(
 	Filter *flist,
 	int ftype,
 	ID *ids,
-	ID *tmp );
+	ID *tmp,
+	ID *stack );
 
 int
 bdb_filter_candidates(
 	Backend	*be,
 	Filter	*f,
 	ID *ids,
-	ID *tmp )
+	ID *tmp,
+	ID *stack )
 {
 	int rc = -1;
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "filterindex", LDAP_LEVEL_ENTRY, "=> bdb_filter_candidates\n"));
+#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 (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tDN ONE\n"));
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tDN ONE\n", 0, 0, 0 );
+#endif
 		rc = bdb_dn2idl( be, f->f_dn, DN_ONE_PREFIX, ids );
 		break;
 
 	case SLAPD_FILTER_DN_SUBTREE:
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tDN SUBTREE\n"));
+#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 (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tPRESENT\n"));
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tPRESENT\n", 0, 0, 0 );
+#endif
 		rc = presence_candidates( be, f->f_desc, ids );
 		break;
 
 	case LDAP_FILTER_EQUALITY:
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tEQUALITY\n"));
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tEQUALITY\n", 0, 0, 0 );
+#endif
 		rc = equality_candidates( be, f->f_ava, ids, tmp );
 		break;
 
 	case LDAP_FILTER_APPROX:
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tAPPROX\n"));
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tAPPROX\n", 0, 0, 0 );
+#endif
 		rc = approx_candidates( be, f->f_ava, ids, tmp );
 		break;
 
 	case LDAP_FILTER_SUBSTRINGS:
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tSUBSTRINGS\n"));
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tSUBSTRINGS\n", 0, 0, 0 );
+#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 (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tGE\n"));
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tGE\n", 0, 0, 0 );
-		rc = presence_candidates( be, f->f_desc, ids );
+#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 (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tLE\n"));
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tLE\n", 0, 0, 0 );
-		rc = presence_candidates( be, f->f_desc, ids );
+#endif
+		rc = presence_candidates( be, f->f_ava->aa_desc, ids );
 		break;
 
 	case LDAP_FILTER_NOT:
 		/* no indexing to support NOT filters */
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tNOT\n"));
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tNOT\n", 0, 0, 0 );
+#endif
 		break;
 
 	case LDAP_FILTER_AND:
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tAND\n"));
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tAND\n", 0, 0, 0 );
+#endif
 		rc = list_candidates( be, 
-			f->f_and, LDAP_FILTER_AND, ids, tmp );
+			f->f_and, LDAP_FILTER_AND, ids, tmp, stack );
 		break;
 
 	case LDAP_FILTER_OR:
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tOR\n"));
+#else
 		Debug( LDAP_DEBUG_FILTER, "\tOR\n", 0, 0, 0 );
+#endif
 		rc = list_candidates( be, 
-			f->f_or, LDAP_FILTER_OR, ids, tmp );
+			f->f_or, LDAP_FILTER_OR, ids, tmp, stack );
 		break;
 
 	default:
-		Debug( LDAP_DEBUG_FILTER, "\tUNKNOWN %d\n",
-			f->f_choice, 0, 0 );
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_filter_candidates: \tUNKNOWN\n"));
+#else
+		Debug( LDAP_DEBUG_FILTER, "\tUNKNOWN %lu\n",
+			(unsigned long) f->f_choice, 0, 0 );
+#endif
 	}
 
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "filterindex", LDAP_LEVEL_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",
 		(long) ids[0],
 		(long) BDB_IDL_FIRST( ids ),
 		(long) BDB_IDL_LAST( ids ) );
+#endif
 
 	return rc;
 }
@@ -133,21 +189,18 @@ list_candidates(
 	Filter	*flist,
 	int		ftype,
 	ID *ids,
-	ID *tmp )
+	ID *tmp,
+	ID *save )
 {
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 	int rc = 0;
 	Filter	*f;
 
-/* Systems that can't increase thread stack size will die with these
- * structures allocated on the stack. */
-#if !defined(LDAP_PVT_THREAD_STACK_SIZE) || (LDAP_PVT_THREAD_STACK_SIZE == 0)
-	ID *save = ch_malloc(BDB_IDL_UM_SIZEOF);
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "=> bdb_list_candidates: 0x%x\n", ftype));
 #else
-	ID save[BDB_IDL_UM_SIZE];
-#endif
-
 	Debug( LDAP_DEBUG_FILTER, "=> bdb_list_candidates 0x%x\n", ftype, 0, 0 );
+#endif
 
 	if ( ftype == LDAP_FILTER_OR ) {
 		BDB_IDL_ALL( bdb, save );
@@ -157,11 +210,15 @@ list_candidates(
 	}
 
 	for ( f = flist; f != NULL; f = f->f_next ) {
-		rc = bdb_filter_candidates( be, f, save, tmp );
+		rc = bdb_filter_candidates( be, f, save, tmp,
+			save+BDB_IDL_UM_SIZE );
 
 		if ( rc != 0 ) {
-			/* Error: treat as undefined */
-			continue;
+			if ( ftype == LDAP_FILTER_AND ) {
+				rc = 0;
+				continue;
+			}
+			break;
 		}
 		
 		if ( ftype == LDAP_FILTER_AND ) {
@@ -173,16 +230,29 @@ list_candidates(
 			BDB_IDL_ALL( bdb, save );
 		}
 	}
-#if !defined(LDAP_PVT_THREAD_STACK_SIZE) || (LDAP_PVT_THREAD_STACK_SIZE == 0)
-	free(save);
+
+	if( rc ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_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
 
-	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) );
-	return 0;
+	} else {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_ARGS, "<= bdb_list_candidates: rc=%d\n", rc));
+#else
+		Debug( LDAP_DEBUG_FILTER,
+			"<= bdb_list_candidates: undefined rc=%d\n",
+			rc, 0, 0 );
+#endif
+	}
+
+	return rc;
 }
 
 static int
@@ -197,7 +267,11 @@ presence_candidates(
 	slap_mask_t mask;
 	struct berval prefix = {0};
 
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "filterindex", LDAP_LEVEL_ENTRY, "=> bdb_presence_candidates\n"));
+#else
 	Debug( LDAP_DEBUG_TRACE, "=> bdb_presence_candidates\n", 0, 0, 0 );
+#endif
 
 	if( desc == slap_schema.si_ad_objectClass ) {
 		BDB_IDL_ALL( bdb, ids );
@@ -208,44 +282,64 @@ presence_candidates(
 		&db, &mask, &prefix );
 
 	if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_presence_candidates: index_parm returned=%d\n", rc ));
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"<= bdb_presence_candidates: index_param returned=%d\n",
 			rc, 0, 0 );
+#endif
 		return 0;
 	}
 
 	if( db == NULL ) {
 		/* not indexed */
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_presence_candidates: not indexed\n" ));
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"<= bdb_presence_candidates: not indexed\n",
 			0, 0, 0 );
+#endif
 		return 0;
 	}
 
 	if( prefix.bv_val == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_presence_candidates: no prefix\n" ));
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"<= bdb_presence_candidates: no prefix\n",
 			0, 0, 0 );
+#endif
 		return 0;
 	}
 
 	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 (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_presence_candidates: key read failed (%d)\n", rc ));
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"<= bdb_presense_candidates: key read failed (%d)\n",
 			rc, 0, 0 );
+#endif
 		goto done;
 	}
 
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "filterindex", LDAP_LEVEL_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",
 		(long) ids[0],
 		(long) BDB_IDL_FIRST(ids),
 		(long) BDB_IDL_LAST(ids) );
+#endif
 
 done:
 	return rc;
@@ -263,24 +357,36 @@ equality_candidates(
 	int rc;
 	slap_mask_t mask;
 	struct berval prefix = {0};
-	struct berval **keys = NULL;
+	struct berval *keys = NULL;
 	MatchingRule *mr;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "filterindex", LDAP_LEVEL_ENTRY, "=> equality_candidates\n"));
+#else
 	Debug( LDAP_DEBUG_TRACE, "=> bdb_equality_candidates\n", 0, 0, 0 );
+#endif
 
 	rc = bdb_index_param( be, ava->aa_desc, LDAP_FILTER_EQUALITY,
 		&db, &mask, &prefix );
 
 	if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_equality_candidates: index_param failed (%d)\n", rc));
+#else
 		Debug( LDAP_DEBUG_ANY,
 			"<= bdb_equality_candidates: index_param failed (%d)\n",
 			rc, 0, 0 );
+#endif
 		return rc;
 	}
 
 	if ( db == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_equality_candidates: not indexed\n"));
+#else
 		Debug( LDAP_DEBUG_ANY,
 			"<= bdb_equality_candidates: not indexed\n", 0, 0, 0 );
+#endif
 		return -1;
 	}
 
@@ -299,37 +405,56 @@ equality_candidates(
 		ava->aa_desc->ad_type->sat_syntax,
 		mr,
 		&prefix,
-		ava->aa_value,
+		&ava->aa_value,
 		&keys );
 
 	if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_equality_candidates: MR filter failed (%d)\n", rc));
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"<= bdb_equality_candidates: MR filter failed (%d)\n",
 			rc, 0, 0 );
+#endif
 		return rc;
 	}
 
 	if( keys == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_equality_candidates: no keys\n"));
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"<= bdb_equality_candidates: no keys\n",
 			0, 0, 0 );
+#endif
 		return 0;
 	}
 
-	for ( i= 0; keys[i] != NULL; i++ ) {
-		rc = bdb_key_read( be, db, NULL, 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 ) {
+		if( rc == DB_NOTFOUND ) {
+			BDB_IDL_ZERO( ids );
+			rc = 0;
+		} else if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_equality_candidates: key read failed (%d)\n", rc));
+#else
 			Debug( LDAP_DEBUG_TRACE,
 				"<= bdb_equality_candidates key read failed (%d)\n",
 				rc, 0, 0 );
+#endif
 			break;
 		}
 
 		if( BDB_IDL_IS_ZERO( tmp ) ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "=> bdb_equality_candidates: NULL\n"));
+#else
 			Debug( LDAP_DEBUG_TRACE,
 				"<= bdb_equality_candidates NULL\n",
 				0, 0, 0 );
+#endif
 			BDB_IDL_ZERO( ids );
 			break;
 		}
@@ -340,13 +465,17 @@ equality_candidates(
 			break;
 	}
 
-	ber_bvecfree( keys );
+	ber_bvarray_free( keys );
 
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "filterindex", LDAP_LEVEL_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 id=%ld, first=%ld, last=%ld\n",
 		(long) ids[0],
 		(long) BDB_IDL_FIRST(ids),
 		(long) BDB_IDL_LAST(ids) );
+#endif
 	return( rc );
 }
 
@@ -363,24 +492,36 @@ approx_candidates(
 	int rc;
 	slap_mask_t mask;
 	struct berval prefix = {0};
-	struct berval **keys = NULL;
+	struct berval *keys = NULL;
 	MatchingRule *mr;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "filterindex", LDAP_LEVEL_ENTRY, "=> bdb_approx_candidates\n"));
+#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 (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: index_param failed (%d)\n", rc ));
+#else
 		Debug( LDAP_DEBUG_ANY,
 			"<= bdb_approx_candidates: index_param failed (%d)\n",
 			rc, 0, 0 );
+#endif
 		return rc;
 	}
 
 	if ( db == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: not indexed\n" ));
+#else
 		Debug( LDAP_DEBUG_ANY,
 			"<= bdb_approx_candidates: not indexed\n", 0, 0, 0 );
+#endif
 		return -1;
 	}
 
@@ -404,35 +545,55 @@ approx_candidates(
 		ava->aa_desc->ad_type->sat_syntax,
 		mr,
 		&prefix,
-		ava->aa_value,
+		&ava->aa_value,
 		&keys );
 
 	if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: MR filter failed (%d)\n", rc ));
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"<= 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 (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: no keys (%s)\n", prefix.bv_val ));
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"<= bdb_approx_candidates: no keys (%s)\n",
 			prefix.bv_val, 0, 0 );
+#endif
 		return 0;
 	}
 
-	for ( i= 0; keys[i] != NULL; i++ ) {
-		rc = bdb_key_read( be, db, NULL, 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 ) {
+		if( rc == DB_NOTFOUND ) {
+			BDB_IDL_ZERO( ids );
+			rc = 0;
+			break;
+		} else if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: key read failed (%d)\n", rc ));
+#else
 			Debug( LDAP_DEBUG_TRACE, "<= bdb_approx_candidates key read failed (%d)\n",
 				rc, 0, 0 );
+#endif
 			break;
 		}
 
 		if( BDB_IDL_IS_ZERO( tmp ) ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_approx_candidates: NULL\n" ));
+#else
 			Debug( LDAP_DEBUG_TRACE, "<= bdb_approx_candidates NULL\n",
 				0, 0, 0 );
+#endif
 			BDB_IDL_ZERO( ids );
 			break;
 		}
@@ -443,13 +604,16 @@ approx_candidates(
 			break;
 	}
 
-	ber_bvecfree( keys );
+	ber_bvarray_free( keys );
 
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "filterindex", LDAP_LEVEL_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 );
 }
 
@@ -465,36 +629,48 @@ substring_candidates(
 	int rc;
 	slap_mask_t mask;
 	struct berval prefix = {0};
-	struct berval **keys = NULL;
+	struct berval *keys = NULL;
 	MatchingRule *mr;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "filterindex", LDAP_LEVEL_ENTRY, "=> bdb_substring_candidates\n"));
+#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 (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_substring_candidates: index_param failed (%d)\n", rc ));
+#else
 		Debug( LDAP_DEBUG_ANY,
 			"<= bdb_substring_candidates: index_param failed (%d)\n",
 			rc, 0, 0 );
-		return 0;
+#endif
+		return rc;
 	}
 
 	if ( db == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_substring_candidates: not indexed\n"));
+#else
 		Debug( LDAP_DEBUG_ANY,
 			"<= bdb_substring_candidates not indexed\n",
 			0, 0, 0 );
-		return 0;
+#endif
+		return -1;
 	}
 
 	mr = sub->sa_desc->ad_type->sat_substr;
 
 	if( !mr ) {
-		return 0;
+		return -1;
 	}
 
 	if( !mr->smr_filter ) {
-		return 0;
+		return -1;
 	}
 
 	rc = (mr->smr_filter)(
@@ -507,31 +683,51 @@ substring_candidates(
 		&keys );
 
 	if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_substring_candidates: (%s) MR filter failed (%d)\n", sub->sa_desc->ad_cname.bv_val, rc ));
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"<= bdb_substring_candidates: (%s) MR filter failed (%d)\n",
 			sub->sa_desc->ad_cname.bv_val, rc, 0 );
-		return 0;
+#endif
+		return rc;
 	}
 
 	if( keys == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_substring_candidates: (%s) MR filter failed (%d)\n", mask, sub->sa_desc->ad_cname.bv_val ));
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"<= 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++ ) {
-		rc = bdb_key_read( be, db, NULL, 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 ) {
+		if( rc == DB_NOTFOUND ) {
+			BDB_IDL_ZERO( ids );
+			rc = 0;
+			break;
+		} else if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_substring_candidates: key read failed (%d)\n", rc));
+#else
 			Debug( LDAP_DEBUG_TRACE, "<= bdb_substring_candidates key read failed (%d)\n",
 				rc, 0, 0 );
+#endif
 			break;
 		}
 
 		if( BDB_IDL_IS_ZERO( tmp ) ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG (( "filterindex", LDAP_LEVEL_RESULTS, "<= bdb_substring_candidates: NULL \n" ));
+#else
 			Debug( LDAP_DEBUG_TRACE, "<= bdb_substring_candidates NULL\n",
 				0, 0, 0 );
+#endif
 			BDB_IDL_ZERO( ids );
 			break;
 		}
@@ -542,14 +738,16 @@ substring_candidates(
 			break;
 	}
 
-	ber_bvecfree( keys );
+	ber_bvarray_free( keys );
 
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "filterindex", LDAP_LEVEL_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