/* 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
*/
#include "back-bdb.h"
#include "idl.h"
-#ifdef BDB_FILTER_INDICES
-
static int presence_candidates(
Backend *be,
AttributeDescription *desc,
ID *ids );
+
static int equality_candidates(
Backend *be,
AttributeAssertion *ava,
- ID *ids );
+ ID *ids,
+ ID *tmp );
static int approx_candidates(
Backend *be,
AttributeAssertion *ava,
- ID *ids );
+ ID *ids,
+ ID *tmp );
static int substring_candidates(
Backend *be,
SubstringsAssertion *sub,
- ID *ids );
+ ID *ids,
+ ID *tmp );
static int list_candidates(
Backend *be,
Filter *flist,
int ftype,
- ID *ids );
-
+ ID *ids,
+ ID *tmp,
+ ID *stack );
int
bdb_filter_candidates(
Backend *be,
Filter *f,
- ID *ids )
+ ID *ids,
+ 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 );
- rc = equality_candidates( be, f->f_ava, ids );
+#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 );
- rc = approx_candidates( be, f->f_ava, ids );
+#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 );
- rc = substring_candidates( be, f->f_sub, ids );
+#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 );
+ 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 );
+ 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;
}
Backend *be,
Filter *flist,
int ftype,
- ID *ids )
+ ID *ids,
+ ID *tmp,
+ ID *save )
{
+ struct bdb_info *bdb = (struct bdb_info *) be->be_private;
int rc = 0;
Filter *f;
- ID tmp[BDB_IDL_UM_SIZE];
- ID save[BDB_IDL_UM_SIZE];
- ID *i1, *i2, *i3, *t;
+#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 );
+#endif
- /* Swap i1/i2/i3 pointers around to avoid a bunch of BDB_IDL_CPYs
- * inside the loop
- */
- i1 = ids;
- i2 = save;
- i3 = tmp;
+ if ( ftype == LDAP_FILTER_OR ) {
+ BDB_IDL_ALL( bdb, save );
+ BDB_IDL_ZERO( ids );
+ } else {
+ BDB_IDL_CPY( save, ids );
+ }
for ( f = flist; f != NULL; f = f->f_next ) {
- BDB_IDL_ZERO( i1 );
- rc = bdb_filter_candidates( be, f, i2 );
+ 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 ( f == flist ) {
- /* We're just starting out... */
- t = i3;
- i3 = i2;
- i2 = t;
- continue;
- }
-
- t = i1;
- i1 = i3;
- i3 = t;
-
if ( ftype == LDAP_FILTER_AND ) {
- bdb_idl_intersection( i1, i2, i3 );
- if( BDB_IDL_IS_ZERO( i3 ) ) {
- if ( i3 != ids ) {
- BDB_IDL_ZERO( ids );
- i3 = ids;
- }
+ bdb_idl_intersection( ids, save );
+ if( BDB_IDL_IS_ZERO( ids ) )
break;
- }
} else {
- bdb_idl_union( i1, i2, i3 );
+ bdb_idl_union( ids, save );
+ BDB_IDL_ALL( bdb, save );
}
}
- if (i3 != ids)
- BDB_IDL_CPY(ids, i3);
- 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;
+ 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
+
+ } 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
AttributeDescription *desc,
ID *ids )
{
+ struct bdb_info *bdb = (struct bdb_info *) be->be_private;
DB *db;
int rc;
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 );
- BDB_IDL_ZERO( ids );
+#endif
+
+ if( desc == slap_schema.si_ad_objectClass ) {
+ BDB_IDL_ALL( bdb, ids );
+ return 0;
+ }
rc = bdb_index_param( be, desc, LDAP_FILTER_PRESENT,
&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 );
- return rc;
+#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 );
- rc = -1;
- goto done;
+#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 );
- rc = -1;
- goto done;
+#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 ( 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;
equality_candidates(
Backend *be,
AttributeAssertion *ava,
- ID *ids )
+ ID *ids,
+ ID *tmp )
{
DB *db;
int i;
int rc;
slap_mask_t mask;
struct berval prefix = {0};
- struct berval **keys = NULL;
+ struct berval *keys = NULL;
MatchingRule *mr;
- ID tmp[BDB_IDL_UM_SIZE];
- ID save[BDB_IDL_UM_SIZE];
- ID *i1, *i2, *i3, *t;
+#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 );
- BDB_IDL_ZERO( ids );
+#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;
}
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 ( 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;
}
- /* Swap i1/i2/i3 pointers around to avoid a bunch of BDB_IDL_CPYs
- * inside the loop
- */
- i1 = ids;
- i2 = save;
- i3 = tmp;
- for ( i= 0; keys[i] != NULL; i++ ) {
- rc = bdb_key_read( be, db, NULL, keys[i], i2 );
-
- if( rc != LDAP_SUCCESS ) {
+ for ( i= 0; keys[i].bv_val != NULL; i++ ) {
+ rc = bdb_key_read( be, db, NULL, &keys[i], tmp );
+
+ if( rc == DB_NOTFOUND ) {
+ 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( i2 ) ) {
+ 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 );
- if (i3 != ids)
- BDB_IDL_ZERO( ids );
- i3 = ids;
+#endif
+ BDB_IDL_ZERO( ids );
break;
}
- /* We've only gotten one set of IDs, nothing to intersect
- * with yet. Just go back and get another set of IDs.
- */
- if (i == 0)
- {
- t = i3;
- i3 = i2;
- i2 = t;
- continue;
- }
-
- /* Swap ids and save every time we get a new intersection.
- * This avoids multiple copies... The result is always
- * pointed to by i3.
- */
-
- t = i1;
- i1 = i3;
- i3 = t;
-
- bdb_idl_intersection( i1, i2, i3 );
+ bdb_idl_intersection( ids, tmp );
- if( BDB_IDL_IS_ZERO( i3 ) ) {
- if ( i3 != ids ) {
- BDB_IDL_ZERO( ids );
- i3 = ids;
- }
+ if( BDB_IDL_IS_ZERO( ids ) )
break;
- }
}
- /* If we didn't end up with the result in ids, copy it now. */
- if (i3 != ids)
- BDB_IDL_CPY(ids, i3);
- ber_bvecfree( keys );
+ 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 );
}
approx_candidates(
Backend *be,
AttributeAssertion *ava,
- ID *ids )
+ ID *ids,
+ ID *tmp )
{
DB *db;
int i;
int rc;
slap_mask_t mask;
struct berval prefix = {0};
- struct berval **keys = NULL;
+ struct berval *keys = NULL;
MatchingRule *mr;
- ID tmp[BDB_IDL_UM_SIZE];
- ID save[BDB_IDL_UM_SIZE];
- ID *i1, *i2, *i3, *t;
+#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 );
- BDB_IDL_ZERO( ids );
+#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;
}
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 ( 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;
}
- /* Swap i1/i2/i3 pointers around to avoid a bunch of BDB_IDL_CPYs
- * inside the loop
- */
- i1 = ids;
- i2 = save;
- i3 = tmp;
- for ( i= 0; keys[i] != NULL; i++ ) {
- rc = bdb_key_read( be, db, NULL, keys[i], i2 );
+ 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 ( 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( i2 ) ) {
+ 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 );
- if (i3 != ids)
- BDB_IDL_ZERO( ids );
- i3 = ids;
+#endif
+ BDB_IDL_ZERO( ids );
break;
}
- if (i == 0)
- {
- t = i3;
- i3 = i2;
- i2 = t;
- continue;
- }
-
- t = i1;
- i1 = i3;
- i3 = t;
-
- bdb_idl_intersection( i1, i2, i3 );
+ bdb_idl_intersection( ids, tmp );
- if( BDB_IDL_IS_ZERO( i3 ) ) {
- if ( i3 != ids ) {
- BDB_IDL_ZERO( ids );
- i3 = ids;
- }
+ if( BDB_IDL_IS_ZERO( ids ) )
break;
- }
}
- if (i3 != ids)
- BDB_IDL_CPY(ids, i3);
- ber_bvecfree( keys );
+ 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 );
}
substring_candidates(
Backend *be,
SubstringsAssertion *sub,
- ID *ids )
+ ID *ids,
+ ID *tmp )
{
DB *db;
int i;
int rc;
slap_mask_t mask;
struct berval prefix = {0};
- struct berval **keys = NULL;
+ struct berval *keys = NULL;
MatchingRule *mr;
- ID tmp[BDB_IDL_UM_SIZE];
- ID save[BDB_IDL_UM_SIZE];
- ID *i1, *i2, *i3, *t;
+#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 );
- BDB_IDL_ZERO( ids );
+#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)(
&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;
}
- /* Swap i1/i2/i3 pointers around to avoid a bunch of BDB_IDL_CPYs
- * inside the loop
- */
- i1 = ids;
- i2 = save;
- i3 = tmp;
- for ( i= 0; keys[i] != NULL; i++ ) {
- rc = bdb_key_read( be, db, NULL, keys[i], i2 );
+ 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 ( 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( i2 ) ) {
+ 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 );
- if (i3 != ids)
- BDB_IDL_ZERO( ids );
- i3 = ids;
+#endif
+ BDB_IDL_ZERO( ids );
break;
}
- if (i == 0)
- {
- t = i3;
- i3 = i2;
- i2 = t;
- continue;
- }
-
- t = i1;
- i1 = i3;
- i3 = t;
+ bdb_idl_intersection( ids, tmp );
- bdb_idl_intersection( i1, i2, i3 );
-
- if( BDB_IDL_IS_ZERO( i3 ) ) {
- if ( i3 != ids ) {
- BDB_IDL_ZERO( ids );
- i3 = ids;
- }
+ if( BDB_IDL_IS_ZERO( ids ) )
break;
- }
}
- if (i3 != ids)
- BDB_IDL_CPY(ids, i3);
- ber_bvecfree( keys );
+ 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
projects / openldap / blobdiff