X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Ffilterindex.c;h=2dbb326e324c1ee5c63aa7233eefce292a47fa6d;hb=47c6701a2293fec249cdb84f69b37addfb4b36fc;hp=969329aa7e6cdf2460abdcd2407ef670aa1df442;hpb=c066e87e2cbfd0b2e4846b8e998f606cacd4c1df;p=openldap
diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c
index 969329aa7e..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 .
+ *
+ * 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
+ * .
*/
#include "portable.h"
@@ -56,10 +65,18 @@ bdb_filter_candidates(
#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;
@@ -67,14 +84,16 @@ 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;
-
+#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
@@ -86,19 +105,25 @@ bdb_filter_candidates(
}
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( 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
@@ -107,7 +132,8 @@ bdb_filter_candidates(
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
@@ -116,7 +142,8 @@ bdb_filter_candidates(
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
@@ -125,7 +152,8 @@ bdb_filter_candidates(
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
@@ -135,7 +163,8 @@ bdb_filter_candidates(
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
@@ -145,7 +174,8 @@ bdb_filter_candidates(
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
@@ -155,7 +185,8 @@ bdb_filter_candidates(
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
@@ -166,7 +197,8 @@ bdb_filter_candidates(
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
@@ -176,7 +208,8 @@ bdb_filter_candidates(
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
@@ -186,7 +219,8 @@ bdb_filter_candidates(
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 );
@@ -230,13 +264,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 +347,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 +395,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 +441,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 +458,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 +475,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 +488,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 +521,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 +608,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 +625,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 +642,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 +655,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 +665,11 @@ approx_candidates(
}
if( !mr ) {
- return -1;
+ return 0;
}
if( !mr->smr_filter ) {
- return -1;
+ return 0;
}
rc = (mr->smr_filter)(
@@ -652,7 +693,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 +778,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 +795,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 +812,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 +825,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 +859,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 +934,6 @@ substring_candidates(
(long) BDB_IDL_FIRST(ids),
(long) BDB_IDL_LAST(ids) );
#endif
- return( 0 );
+ return( rc );
}