X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Ffilterindex.c;h=2dbb326e324c1ee5c63aa7233eefce292a47fa6d;hb=47c6701a2293fec249cdb84f69b37addfb4b36fc;hp=3ea8a06cb1584d304b5667dfa5a222a0ffbd7301;hpb=f8611a129626de801949388b0a0b090907b9192b;p=openldap
diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c
index 3ea8a06cb1..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-2000 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"
@@ -13,289 +22,481 @@
#include "back-bdb.h"
#include "idl.h"
-#ifdef BDB_FILTER_INDICES
-
static int presence_candidates(
- Backend *be,
- ID *range,
+ Operation *op,
AttributeDescription *desc,
ID *ids );
+
static int equality_candidates(
- Backend *be,
- ID *range,
+ Operation *op,
AttributeAssertion *ava,
- ID *ids );
+ ID *ids,
+ ID *tmp );
static int approx_candidates(
- Backend *be,
- ID *range,
+ Operation *op,
AttributeAssertion *ava,
- ID *ids );
+ ID *ids,
+ ID *tmp );
static int substring_candidates(
- Backend *be,
- ID *range,
+ Operation *op,
SubstringsAssertion *sub,
- ID *ids );
+ ID *ids,
+ ID *tmp );
static int list_candidates(
- Backend *be,
- ID *range,
+ Operation *op,
Filter *flist,
int ftype,
- ID *ids );
-
+ ID *ids,
+ ID *tmp,
+ ID *stack );
int
bdb_filter_candidates(
- Backend *be,
- ID *range,
+ Operation *op,
Filter *f,
- ID *ids )
+ ID *ids,
+ ID *tmp,
+ ID *stack )
{
- int rc = -1;
+ int rc = 0;
+#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
+#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;
+ case LDAP_COMPARE_TRUE: {
+ struct bdb_info *bdb = (struct bdb_info *)op->o_bd->be_private;
+ BDB_IDL_ALL( bdb, ids );
+ } break;
+ 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 );
+#else
Debug( LDAP_DEBUG_FILTER, "\tDN ONE\n", 0, 0, 0 );
- rc = bdb_dn2idl( be, f->f_dn, DN_ONE_PREFIX, ids );
+#endif
+ rc = bdb_dn2idl( op->o_bd, f->f_dn, DN_ONE_PREFIX, ids,
+ stack, op->o_tmpmemctx );
+ if( rc == DB_NOTFOUND ) {
+ BDB_IDL_ZERO( ids );
+ rc = 0;
+ }
break;
+ case SLAPD_FILTER_DN_CHILDREN:
+ subtree="CHILDREN";
+ /* Fall Thru */
case SLAPD_FILTER_DN_SUBTREE:
- Debug( LDAP_DEBUG_FILTER, "\tDN SUBTREE\n", 0, 0, 0 );
- rc = bdb_dn2idl( be, f->f_dn, DN_SUBTREE_PREFIX, ids );
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, ARGS, "=> bdb_filter_candidates: \tDN %s\n",
+ subtree, 0, 0 );
+#else
+ 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 );
+#else
Debug( LDAP_DEBUG_FILTER, "\tPRESENT\n", 0, 0, 0 );
- rc = presence_candidates( be, range, f->f_desc, ids );
+#endif
+ rc = presence_candidates( op, 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( op, 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( op, 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 );
+#endif
+ rc = substring_candidates( op, 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, range, f->f_desc, ids );
+#endif
+ rc = presence_candidates( op, 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, range, f->f_desc, ids );
- break;
#endif
+ rc = presence_candidates( op, 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
+ { struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+ BDB_IDL_ALL( bdb, ids );
+ }
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( op,
+ 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( op,
+ 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
+ /* Must not return NULL, otherwise extended filters break */
+ { struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+ BDB_IDL_ALL( bdb, ids );
+ }
}
+#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 0;
+ return rc;
}
static int
list_candidates(
- Backend *be,
- ID *range,
+ Operation *op,
Filter *flist,
int ftype,
- ID *ids )
+ ID *ids,
+ ID *tmp,
+ ID *save )
{
+ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->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 );
-
- if( ftype == LDAP_FILTER_AND ) {
- BDB_IDL_CPY( ids, range );
- } else {
- BDB_IDL_ZERO( ids );
- }
-
+#endif
for ( f = flist; f != NULL; f = f->f_next ) {
- ID tmp[BDB_IDL_UM_SIZE];
- ID result[BDB_IDL_UM_SIZE];
- rc = bdb_filter_candidates( be, range, f, tmp );
+ /* ignore precomputed scopes */
+ if ( f->f_choice == SLAPD_FILTER_COMPUTED &&
+ f->f_result == LDAP_SUCCESS ) {
+ continue;
+ }
+ BDB_IDL_ZERO( save );
+ rc = bdb_filter_candidates( op, 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 );
- break;
+ if ( f == flist ) {
+ BDB_IDL_CPY( ids, save );
+ } else {
+ bdb_idl_intersection( ids, save );
}
- } else {
- bdb_idl_union( tmp, ids, result );
- if( BDB_IDL_IS_ALL( range, result ) ) {
- BDB_IDL_CPY( ids, range );
+ if( BDB_IDL_IS_ZERO( ids ) )
break;
+ } else {
+ if ( f == flist ) {
+ BDB_IDL_CPY( ids, save );
+ } else {
+ bdb_idl_union( ids, save );
}
}
+ }
+
+ if( rc == LDAP_SUCCESS ) {
+#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
- BDB_IDL_CPY( ids, result );
+ } 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",
- (long) ids[0],
- (long) BDB_IDL_FIRST(ids),
- (long) BDB_IDL_LAST(ids) );
- return 0;
+ return rc;
}
static int
presence_candidates(
- Backend *be,
- ID *range,
+ Operation *op,
AttributeDescription *desc,
ID *ids )
{
+ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
DB *db;
int rc;
slap_mask_t mask;
- struct berval *prefix;
+ struct berval prefix = {0, NULL};
+
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, ENTRY, "=> bdb_presence_candidates (%s)\n",
+ desc->ad_cname.bv_val, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, "=> bdb_presence_candidates (%s)\n",
+ desc->ad_cname.bv_val, 0, 0 );
+#endif
- Debug( LDAP_DEBUG_TRACE, "=> bdb_presence_candidates\n", 0, 0, 0 );
- BDB_IDL_ZERO( ids );
+ BDB_IDL_ALL( bdb, ids );
+
+ if( desc == slap_schema.si_ad_objectClass ) {
+ return 0;
+ }
- rc = bdb_index_param( be, desc, LDAP_FILTER_PRESENT,
+ rc = bdb_index_param( op->o_bd, desc, LDAP_FILTER_PRESENT,
&db, &mask, &prefix );
if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, RESULTS,
+ "<= bdb_presence_candidates: (%s) index_param "
+ "returned=%d\n",
+ desc->ad_cname.bv_val, rc, 0 );
+#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_presence_candidates: index_param returned=%d\n",
- rc, 0, 0 );
- return rc;
+ "<= bdb_presence_candidates: (%s) index_param "
+ "returned=%d\n",
+ desc->ad_cname.bv_val, rc, 0 );
+#endif
+ return 0;
}
if( db == NULL ) {
/* not indexed */
+#ifdef NEW_LOGGING
+ LDAP_LOG(INDEX, RESULTS,
+ "<= bdb_presence_candidates: (%s) not indexed\n",
+ desc->ad_cname.bv_val, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_presense_candidates: not indexed\n",
- 0, 0, 0 );
- rc = -1;
- goto done;
+ "<= bdb_presence_candidates: (%s) not indexed\n",
+ desc->ad_cname.bv_val, 0, 0 );
+#endif
+ return 0;
}
- if( prefix == NULL ) {
+ if( prefix.bv_val == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(INDEX, RESULTS,
+ "<= bdb_presence_candidates: (%s) no prefix\n",
+ desc->ad_cname.bv_val, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_presense_candidates: no prefix\n",
- 0, 0, 0 );
- rc = -1;
- goto done;
+ "<= bdb_presence_candidates: (%s) no prefix\n",
+ desc->ad_cname.bv_val, 0, 0 );
+#endif
+ return -1;
}
- rc = bdb_key_read( be, db, prefix, ids );
+ rc = bdb_key_read( op->o_bd, 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: (%s) "
+ "key read failed (%d)\n",
+ desc->ad_cname.bv_val, rc, 0 );
+#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_presense_candidates: key read failed (%d)\n",
- rc, 0, 0 );
+ "<= bdb_presense_candidates: (%s) "
+ "key read failed (%d)\n",
+ desc->ad_cname.bv_val, rc, 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:
- ber_bvfree( prefix );
return rc;
}
static int
equality_candidates(
- Backend *be,
- ID *range,
+ Operation *op,
AttributeAssertion *ava,
- ID *ids )
+ ID *ids,
+ ID *tmp )
{
+ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
DB *db;
int i;
int rc;
- char *dbname;
slap_mask_t mask;
- struct berval *prefix;
- struct berval **keys = NULL;
+ struct berval prefix = {0, NULL};
+ struct berval *keys = NULL;
MatchingRule *mr;
- Debug( LDAP_DEBUG_TRACE, "=> bdb_equality_candidates\n", 0, 0, 0 );
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, ENTRY, "=> bdb_equality_candidates (%s)\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, "=> bdb_equality_candidates (%s)\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
+#endif
- BDB_IDL_RANGE_CPY( range, ids );
+ BDB_IDL_ALL( bdb, ids );
- rc = bdb_index_param( be, ava->aa_desc, LDAP_FILTER_EQUALITY,
+ rc = bdb_index_param( op->o_bd, ava->aa_desc, LDAP_FILTER_EQUALITY,
&db, &mask, &prefix );
if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, RESULTS,
+ "<= bdb_equality_candidates: (%s) "
+ "index_param failed (%d)\n",
+ ava->aa_desc->ad_cname.bv_val, rc, 0);
+#else
Debug( LDAP_DEBUG_ANY,
- "<= equality_candidates: index_param failed (%d)\n",
- rc, 0, 0 );
+ "<= bdb_equality_candidates: (%s) "
+ "index_param failed (%d)\n",
+ ava->aa_desc->ad_cname.bv_val, rc, 0 );
+#endif
+ return 0;
+ }
+
+ if ( db == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(INDEX, RESULTS,
+ "<= bdb_equality_candidates: (%s) not indexed\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "<= bdb_equality_candidates: (%s) not indexed\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
+#endif
return 0;
}
mr = ava->aa_desc->ad_type->sat_equality;
if( !mr ) {
- ber_bvfree( prefix );
return 0;
}
if( !mr->smr_filter ) {
- ber_bvfree( prefix );
return 0;
}
@@ -304,92 +505,157 @@ equality_candidates(
mask,
ava->aa_desc->ad_type->sat_syntax,
mr,
- prefix,
- ava->aa_value,
- &keys );
-
- ber_bvfree( prefix );
+ &prefix,
+ &ava->aa_value,
+ &keys, op->o_tmpmemctx );
if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, RESULTS,
+ "<= bdb_equality_candidates: (%s, %s) "
+ "MR filter failed (%d)\n",
+ prefix.bv_val, ava->aa_desc->ad_cname.bv_val, rc );
+#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_equality_candidates: MR filter failed (%d)\n",
- rc, 0, 0 );
+ "<= bdb_equality_candidates: (%s, %s) "
+ "MR filter failed (%d)\n",
+ prefix.bv_val, ava->aa_desc->ad_cname.bv_val, rc );
+#endif
return 0;
}
if( keys == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, RESULTS,
+ "<= bdb_equality_candidates: (%s) no keys\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_equality_candidates: no keys\n",
- 0, 0, 0 );
+ "<= bdb_equality_candidates: (%s) no keys\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
+#endif
return 0;
}
- for ( i= 0; keys[i] != NULL; i++ ) {
- ID save[BDB_IDL_UM_SIZE];
- ID tmp[BDB_IDL_UM_SIZE];
-
- rc = bdb_key_read( be, db, keys[i], tmp );
+ for ( i= 0; keys[i].bv_val != NULL; i++ ) {
+ rc = bdb_key_read( op->o_bd, 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 ( INDEX, RESULTS,
+ "<= bdb_equality_candidates: (%s) "
+ "key read failed (%d)\n",
+ ava->aa_desc->ad_cname.bv_val, rc, 0 );
+#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_equality_candidates key read failed (%d)\n",
- rc, 0, 0 );
+ "<= bdb_equality_candidates: (%s) "
+ "key read failed (%d)\n",
+ ava->aa_desc->ad_cname.bv_val, rc, 0 );
+#endif
break;
}
- if( tmp == NULL ) {
+ if( BDB_IDL_IS_ZERO( tmp ) ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, RESULTS,
+ "<= bdb_equality_candidates: (%s) NULL\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0);
+#else
Debug( LDAP_DEBUG_TRACE,
- "<= bdb_equality_candidates NULL\n",
- 0, 0, 0 );
+ "<= bdb_equality_candidates: (%s) NULL\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
+#endif
+ BDB_IDL_ZERO( ids );
break;
}
- save = idl;
- idl = idl_intersection( be, idl, tmp );
- idl_free( save );
- idl_free( tmp );
+ if ( i == 0 ) {
+ BDB_IDL_CPY( ids, tmp );
+ } else {
+ bdb_idl_intersection( ids, tmp );
+ }
- if( idl == NULL ) break;
+ if( BDB_IDL_IS_ZERO( ids ) )
+ break;
}
- ber_bvecfree( keys );
+ ber_bvarray_free_x( keys, op->o_tmpmemctx );
+#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",
+ "<= bdb_equality_candidates: id=%ld, first=%ld, last=%ld\n",
(long) ids[0],
(long) BDB_IDL_FIRST(ids),
(long) BDB_IDL_LAST(ids) );
- return( idl );
+#endif
+ return( rc );
}
static int
approx_candidates(
- Backend *be,
- ID *range,
+ Operation *op,
AttributeAssertion *ava,
- ID *ids )
+ ID *ids,
+ ID *tmp )
{
- ID_BLOCK *idl;
- DBCache *db;
+ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+ DB *db;
int i;
int rc;
- char *dbname;
slap_mask_t mask;
- struct berval *prefix;
- struct berval **keys = NULL;
+ struct berval prefix = {0, NULL};
+ 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 (%s)\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, "=> bdb_approx_candidates (%s)\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
+#endif
+
+ BDB_IDL_ALL( bdb, ids );
- rc = bdb_index_param( be, ava->aa_desc, LDAP_FILTER_APPROX,
+ rc = bdb_index_param( op->o_bd, ava->aa_desc, LDAP_FILTER_APPROX,
&db, &mask, &prefix );
if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, RESULTS,
+ "<= bdb_approx_candidates: (%s) "
+ "index_param failed (%d)\n",
+ ava->aa_desc->ad_cname.bv_val, rc, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
- "<= approx_candidates: index_param failed (%d)\n",
- rc, 0, 0 );
- return idl;
+ "<= bdb_approx_candidates: (%s) "
+ "index_param failed (%d)\n",
+ ava->aa_desc->ad_cname.bv_val, rc, 0 );
+#endif
+ return 0;
+ }
+
+ if ( db == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(INDEX, RESULTS,
+ "<= bdb_approx_candidates: (%s) not indexed\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "<= bdb_approx_candidates: (%s) not indexed\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
+#endif
+ return 0;
}
mr = ava->aa_desc->ad_type->sat_approx;
@@ -399,13 +665,11 @@ approx_candidates(
}
if( !mr ) {
- ber_bvfree( prefix );
- return idl;
+ return 0;
}
if( !mr->smr_filter ) {
- ber_bvfree( prefix );
- return idl;
+ return 0;
}
rc = (mr->smr_filter)(
@@ -413,121 +677,165 @@ approx_candidates(
mask,
ava->aa_desc->ad_type->sat_syntax,
mr,
- prefix,
- ava->aa_value,
- &keys );
-
- ber_bvfree( prefix );
+ &prefix,
+ &ava->aa_value,
+ &keys, op->o_tmpmemctx );
if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, RESULTS,
+ "<= bdb_approx_candidates: (%s, %s) "
+ "MR filter failed (%d)\n",
+ prefix.bv_val, ava->aa_desc->ad_cname.bv_val, rc );
+#else
Debug( LDAP_DEBUG_TRACE,
- "<= approx_candidates: (%s) MR filter failed (%d)\n",
- dbname, rc, 0 );
- return idl;
+ "<= bdb_approx_candidates: (%s, %s) "
+ "MR filter failed (%d)\n",
+ prefix.bv_val, ava->aa_desc->ad_cname.bv_val, rc );
+#endif
+ return 0;
}
if( keys == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, RESULTS,
+ "<= bdb_approx_candidates: (%s) no keys (%s)\n",
+ prefix.bv_val, ava->aa_desc->ad_cname.bv_val, 0 );
+#else
Debug( LDAP_DEBUG_TRACE,
- "<= approx_candidates: no keys (%s)\n",
- dbname, 0, 0 );
- return idl;
- }
-
- if ( db == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "<= approx_candidates db open failed (%s)\n",
- dbname, 0, 0 );
- return idl;
+ "<= bdb_approx_candidates: (%s) no keys (%s)\n",
+ prefix.bv_val, ava->aa_desc->ad_cname.bv_val, 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( op->o_bd, db, NULL, &keys[i], tmp );
- rc = bdb_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",
- rc, 0, 0 );
+ 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: (%s) "
+ "key read failed (%d)\n",
+ ava->aa_desc->ad_cname.bv_val, rc, 0);
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "<= bdb_approx_candidates: (%s) "
+ "key read failed (%d)\n",
+ ava->aa_desc->ad_cname.bv_val, rc, 0 );
+#endif
break;
}
- if( tmp == NULL ) {
- idl_free( idl );
- idl = NULL;
- Debug( LDAP_DEBUG_TRACE, "<= approx_candidates NULL\n",
- 0, 0, 0 );
+ if( BDB_IDL_IS_ZERO( tmp ) ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, RESULTS,
+ "<= bdb_approx_candidates: (%s) NULL\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "<= bdb_approx_candidates: (%s) NULL\n",
+ ava->aa_desc->ad_cname.bv_val, 0, 0 );
+#endif
+ BDB_IDL_ZERO( ids );
break;
}
- save = idl;
- idl = idl_intersection( be, idl, tmp );
- idl_free( save );
+ if ( i == 0 ) {
+ BDB_IDL_CPY( ids, tmp );
+ } else {
+ bdb_idl_intersection( ids, tmp );
+ }
- if( idl == NULL ) break;
+ if( BDB_IDL_IS_ZERO( ids ) )
+ break;
}
- ber_bvecfree( keys );
+ ber_bvarray_free_x( keys, op->o_tmpmemctx );
- Debug( LDAP_DEBUG_TRACE, "<= approx_candidates %ld, first=%ld, last=%ld\n",
+#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) );
-
- return( idl );
+#endif
+ return( rc );
}
static int
substring_candidates(
- Backend *be,
- ID *range,
+ Operation *op,
SubstringsAssertion *sub,
- ID *ids )
+ ID *ids,
+ ID *tmp )
{
- ID_BLOCK *idl;
- DBCache *db;
+ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+ DB *db;
int i;
int rc;
slap_mask_t mask;
- struct berval *prefix;
- struct berval **keys = NULL;
+ struct berval prefix = {0, NULL};
+ struct berval *keys = NULL;
MatchingRule *mr;
- Debug( LDAP_DEBUG_TRACE, "=> substrings_candidates\n", 0, 0, 0 );
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, ENTRY, "=> bdb_substring_candidates (%s)\n",
+ sub->sa_desc->ad_cname.bv_val, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, "=> bdb_substring_candidates (%s)\n",
+ sub->sa_desc->ad_cname.bv_val, 0, 0 );
+#endif
- idl = idl_allids( be );
+ BDB_IDL_ALL( bdb, ids );
- rc = bdb_index_param( be, sub->sa_desc, LDAP_FILTER_SUBSTRINGS,
+ rc = bdb_index_param( op->o_bd, sub->sa_desc, LDAP_FILTER_SUBSTRINGS,
&db, &mask, &prefix );
if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, RESULTS,
+ "<= bdb_substring_candidates: (%s) "
+ "index_param failed (%d)\n",
+ sub->sa_desc->ad_cname.bv_val, rc, 0);
+#else
Debug( LDAP_DEBUG_ANY,
- "<= substrings_candidates: index_param failed (%d)\n",
- rc, 0, 0 );
- return idl;
+ "<= bdb_substring_candidates: (%s) "
+ "index_param failed (%d)\n",
+ sub->sa_desc->ad_cname.bv_val, rc, 0 );
+#endif
+ return 0;
}
- if( dbname == NULL ) {
- /* not indexed */
+ if ( db == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, RESULTS,
+ "<= bdb_substring_candidates: (%s) not indexed\n",
+ sub->sa_desc->ad_cname.bv_val, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
- "<= substrings_candidates: not indexed\n",
- 0, 0, 0 );
- ber_bvfree( prefix );
- return idl;
+ "<= bdb_substring_candidates: (%s) not indexed\n",
+ sub->sa_desc->ad_cname.bv_val, 0, 0 );
+#endif
+ return 0;
}
mr = sub->sa_desc->ad_type->sat_substr;
if( !mr ) {
- ber_bvfree( prefix );
- return idl;
+ return 0;
}
if( !mr->smr_filter ) {
- ber_bvfree( prefix );
- return idl;
+ return 0;
}
rc = (mr->smr_filter)(
@@ -535,72 +843,97 @@ substring_candidates(
mask,
sub->sa_desc->ad_type->sat_syntax,
mr,
- prefix,
+ &prefix,
sub,
- &keys );
-
- ber_bvfree( prefix );
+ &keys, op->o_tmpmemctx );
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) MR filter failed (%d)\n",
- dbname, rc, 0 );
- return idl;
+ "<= bdb_substring_candidates: (%s) "
+ "MR filter failed (%d)\n",
+ sub->sa_desc->ad_cname.bv_val, rc, 0 );
+#endif
+ return 0;
}
if( keys == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, RESULTS,
+ "<= bdb_substring_candidates: (0x%04lx) no keys (%s)\n",
+ mask, sub->sa_desc->ad_cname.bv_val, 0 );
+#else
Debug( LDAP_DEBUG_TRACE,
- "<= substrings_candidates: (0x%04lx) no keys (%s)\n",
- mask, dbname, 0 );
- return idl;
- }
-
- rc = bdb_db_cache( be, dbname, &db );
-
- if ( db == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "<= substrings_candidates db open failed (%s)\n",
- dbname, 0, 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 = bdb_key_read( be, db, keys[i], &tmp );
+ for ( i= 0; keys[i].bv_val != NULL; i++ ) {
+ rc = bdb_key_read( op->o_bd, 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",
- rc, 0, 0 );
+ 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: (%s) "
+ "key read failed (%d)\n",
+ sub->sa_desc->ad_cname.bv_val, rc, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "<= bdb_substring_candidates: (%s) "
+ "key read failed (%d)\n",
+ sub->sa_desc->ad_cname.bv_val, rc, 0 );
+#endif
break;
}
- if( tmp == NULL ) {
- idl_free( idl );
- idl = NULL;
- Debug( LDAP_DEBUG_TRACE, "<= substrings_candidates NULL\n",
- 0, 0, 0 );
+ if( BDB_IDL_IS_ZERO( tmp ) ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( INDEX, RESULTS,
+ "<= bdb_substring_candidates: (%s) NULL\n",
+ sub->sa_desc->ad_cname.bv_val, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "<= bdb_substring_candidates: (%s) NULL\n",
+ sub->sa_desc->ad_cname.bv_val, 0, 0 );
+#endif
+ BDB_IDL_ZERO( ids );
break;
}
- save = idl;
- idl = idl_intersection( be, idl, tmp );
- idl_free( save );
+ if ( i == 0 ) {
+ BDB_IDL_CPY( ids, tmp );
+ } else {
+ bdb_idl_intersection( ids, tmp );
+ }
- if( idl == NULL ) break;
+ if( BDB_IDL_IS_ZERO( ids ) )
+ break;
}
- ber_bvecfree( keys );
+ ber_bvarray_free_x( keys, op->o_tmpmemctx );
- Debug( LDAP_DEBUG_TRACE, "<= substrings_candidates %ld, first=%ld, last=%ld\n",
+#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) );
-
- return( idl );
+#endif
+ return( rc );
}
-#endif