Sync with HEAD as of 14-March-2004

[openldap] / servers / slapd / back-bdb / filterindex.c

diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c
index 50be97d332d925988ddb9d010ab5ddd53a34c426..47e5728fbd817cfd4bb2eb36043ee6dbfb011463 100644 (file)
--- 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"
@@ -60,6 +69,11 @@ bdb_filter_candidates(
        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.
+                */
+               /* FALLTHRU */
                case LDAP_COMPARE_FALSE:
                        BDB_IDL_ZERO( ids );
                        break;
@@ -67,7 +81,8 @@ bdb_filter_candidates(
                        struct bdb_info *bdb = (struct bdb_info *)op->o_bd->be_private;
                        BDB_IDL_ALL( bdb, ids );
                        } break;
-               case SLAPD_COMPARE_UNDEFINED:
+               case LDAP_SUCCESS:
+               /* this is a pre-computed scope, leave it alone */
                        break;
                }
                break;
@@ -230,13 +245,13 @@ list_candidates(
 #else
        Debug( LDAP_DEBUG_FILTER, "=> bdb_list_candidates 0x%x\n", ftype, 0, 0 );
 #endif
-
        for ( f = flist; f != NULL; f = f->f_next ) {
-               /* Ignore undefined filters */
+               /* ignore precomputed scopes */
                if ( f->f_choice == SLAPD_FILTER_COMPUTED &&
-                    f->f_result == SLAPD_COMPARE_UNDEFINED ) {
-                       continue;
+                    f->f_result == LDAP_SUCCESS ) {
+                       continue;
                }
+               BDB_IDL_ZERO( save );
                rc = bdb_filter_candidates( op, f, save, tmp,
                        save+BDB_IDL_UM_SIZE );
 
@@ -313,8 +328,9 @@ presence_candidates(
                        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;
        }
 
@@ -360,7 +376,7 @@ presence_candidates(
                        "<= bdb_presence_candidates: (%s) no prefix\n",
                        desc->ad_cname.bv_val, 0, 0 );
 #endif
-               return 0;
+               return -1;
        }
 
        rc = bdb_key_read( op->o_bd, db, NULL, &prefix, ids );
@@ -406,6 +422,7 @@ equality_candidates(
        ID *ids,
        ID *tmp )
 {
+       struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
        DB      *db;
        int i;
        int rc;
@@ -422,6 +439,8 @@ equality_candidates(
                        ava->aa_desc->ad_cname.bv_val, 0, 0 );
 #endif
 
+       BDB_IDL_ALL( bdb, ids );
+
        rc = bdb_index_param( op->o_bd, ava->aa_desc, LDAP_FILTER_EQUALITY,
                &db, &mask, &prefix );
 
@@ -437,7 +456,7 @@ equality_candidates(
                        "index_param failed (%d)\n",
                        ava->aa_desc->ad_cname.bv_val, rc, 0 );
 #endif
-               return rc;
+               return 0;
        }
 
        if ( db == NULL ) {
@@ -450,16 +469,16 @@ equality_candidates(
                        "<= 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)(
@@ -483,7 +502,7 @@ equality_candidates(
                        "MR filter failed (%d)\n",
                        prefix.bv_val, ava->aa_desc->ad_cname.bv_val, rc );
 #endif
-               return rc;
+               return 0;
        }
 
        if( keys == NULL ) {
@@ -570,6 +589,7 @@ approx_candidates(
        ID *ids,
        ID *tmp )
 {
+       struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
        DB      *db;
        int i;
        int rc;
@@ -586,6 +606,8 @@ approx_candidates(
                        ava->aa_desc->ad_cname.bv_val, 0, 0 );
 #endif
 
+       BDB_IDL_ALL( bdb, ids );
+
        rc = bdb_index_param( op->o_bd, ava->aa_desc, LDAP_FILTER_APPROX,
                &db, &mask, &prefix );
 
@@ -601,7 +623,7 @@ approx_candidates(
                        "index_param failed (%d)\n",
                        ava->aa_desc->ad_cname.bv_val, rc, 0 );
 #endif
-               return rc;
+               return 0;
        }
 
        if ( db == NULL ) {
@@ -614,7 +636,7 @@ approx_candidates(
                        "<= 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;
@@ -624,11 +646,11 @@ approx_candidates(
        }
 
        if( !mr ) {
-               return -1;
+               return 0;
        }
 
        if( !mr->smr_filter ) {
-               return -1;
+               return 0;
        }
 
        rc = (mr->smr_filter)(
@@ -652,7 +674,7 @@ approx_candidates(
                        "MR filter failed (%d)\n",
                        prefix.bv_val, ava->aa_desc->ad_cname.bv_val, rc );
 #endif
-               return rc;
+               return 0;
        }
 
        if( keys == NULL ) {
@@ -737,6 +759,7 @@ substring_candidates(
        ID *ids,
        ID *tmp )
 {
+       struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
        DB      *db;
        int i;
        int rc;
@@ -753,6 +776,8 @@ substring_candidates(
                        sub->sa_desc->ad_cname.bv_val, 0, 0 );
 #endif
 
+       BDB_IDL_ALL( bdb, ids );
+
        rc = bdb_index_param( op->o_bd, sub->sa_desc, LDAP_FILTER_SUBSTRINGS,
                &db, &mask, &prefix );
 
@@ -768,7 +793,7 @@ substring_candidates(
                        "index_param failed (%d)\n",
                        sub->sa_desc->ad_cname.bv_val, rc, 0 );
 #endif
-               return rc;
+               return 0;
        }
 
        if ( db == NULL ) {
@@ -781,17 +806,17 @@ substring_candidates(
                        "<= 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)(
@@ -815,7 +840,7 @@ substring_candidates(
                        "MR filter failed (%d)\n",
                        sub->sa_desc->ad_cname.bv_val, rc, 0 );
 #endif
-               return rc;
+               return 0;
        }
 
        if( keys == NULL ) {
@@ -890,6 +915,6 @@ substring_candidates(
                (long) BDB_IDL_FIRST(ids),
                (long) BDB_IDL_LAST(ids) );
 #endif
-       return( 0 );
+       return( rc );
 }