X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Ffilterindex.c;h=53289e7ffaf3ddf3356d583456b8853e933a1d68;hb=5d9479a3e82cc1ed5260f26878bf710a3b65faec;hp=97d597d7af663ef12860b915288a4e6ce70c2fae;hpb=ac1332cdb868b6a30f545796aca8e0bbf13fe939;p=openldap diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c index 97d597d7af..53289e7ffa 100644 --- a/servers/slapd/back-bdb/filterindex.c +++ b/servers/slapd/back-bdb/filterindex.c @@ -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,152 @@ 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 ( 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 ); +#endif rc = presence_candidates( be, f->f_desc, ids ); break; 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 ); +#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 ); +#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 ); +#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 = 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 ( INDEX, ARGS, "=> bdb_filter_candidates: \tLE\n", 0, 0, 0 ); +#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 ( 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 ); +#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 ( 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, - 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 ( 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", (long) ids[0], (long) BDB_IDL_FIRST( ids ), (long) BDB_IDL_LAST( ids ) ); +#endif return rc; } @@ -133,21 +195,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 ( INDEX, ARGS, "=> bdb_list_candidates: 0x%x\n", ftype, 0 , 0 ); #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 +216,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 +236,32 @@ 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 ( 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 - 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 ( 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 + } + + return rc; } static int @@ -197,7 +276,11 @@ presence_candidates( slap_mask_t mask; 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 ); +#endif if( desc == slap_schema.si_ad_objectClass ) { BDB_IDL_ALL( bdb, ids ); @@ -208,24 +291,39 @@ presence_candidates( &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 ); +#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_presence_candidates: not indexed\n", 0, 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 ); +#else Debug( LDAP_DEBUG_TRACE, "<= bdb_presence_candidates: no prefix\n", 0, 0, 0 ); +#endif return 0; } @@ -235,17 +333,28 @@ presence_candidates( 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", (long) ids[0], (long) BDB_IDL_FIRST(ids), (long) BDB_IDL_LAST(ids) ); +#endif done: return rc; @@ -266,21 +375,35 @@ equality_candidates( 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 ); +#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, "<= bdb_equality_candidates: index_param failed (%d)\n", rc, 0, 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; } @@ -303,16 +426,26 @@ equality_candidates( &keys ); 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: 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\n", 0, 0, 0 ); +#endif return 0; } @@ -323,16 +456,25 @@ equality_candidates( 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( 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; } @@ -345,11 +487,18 @@ equality_candidates( 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 id=%ld, first=%ld, last=%ld\n", (long) ids[0], (long) BDB_IDL_FIRST(ids), (long) BDB_IDL_LAST(ids) ); +#endif return( rc ); } @@ -369,21 +518,35 @@ approx_candidates( struct berval *keys = NULL; MatchingRule *mr; +#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, "<= bdb_approx_candidates: index_param failed (%d)\n", rc, 0, 0 ); +#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; } @@ -411,16 +574,26 @@ approx_candidates( &keys ); 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, "<= 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, "<= bdb_approx_candidates: no keys (%s)\n", prefix.bv_val, 0, 0 ); +#endif return 0; } @@ -432,14 +605,24 @@ approx_candidates( 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( 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; } @@ -452,11 +635,17 @@ approx_candidates( 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 ); } @@ -475,33 +664,47 @@ substring_candidates( struct berval *keys = NULL; MatchingRule *mr; +#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, "<= bdb_substring_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_substring_candidates: not indexed\n", 0, 0, 0 ); +#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)( @@ -514,16 +717,28 @@ substring_candidates( &keys ); 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, "<= 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 ( 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, "<= bdb_substring_candidates: (0x%04lx) no keys (%s)\n", mask, sub->sa_desc->ad_cname.bv_val, 0 ); +#endif return 0; } @@ -535,14 +750,24 @@ substring_candidates( 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( 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; } @@ -555,12 +780,17 @@ substring_candidates( 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