X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Findex.c;h=6cdec8db7ef9116ce0c61f6ef935fe55f7fda4db;hb=a4d161cff64c74e03e5898eae104d5d52cc54a91;hp=8abb05195e80710907e5933299623f24c792106e;hpb=6939c531700652491f4be4688c6a1f35a1ab8a18;p=openldap
diff --git a/servers/slapd/back-ldbm/index.c b/servers/slapd/back-ldbm/index.c
index 8abb05195e..6cdec8db7e 100644
--- a/servers/slapd/back-ldbm/index.c
+++ b/servers/slapd/back-ldbm/index.c
@@ -1,8 +1,17 @@
/* index.c - routines for dealing with attribute indexes */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2006 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"
@@ -106,9 +115,14 @@ int index_param(
break;
case LDAP_FILTER_APPROX:
- if( IS_SLAP_INDEX( mask, SLAP_INDEX_APPROX ) ) {
- goto done;
+ if ( desc->ad_type->sat_approx ) {
+ if( IS_SLAP_INDEX( mask, SLAP_INDEX_APPROX ) ) {
+ goto done;
+ }
+ break;
}
+
+ /* Use EQUALITY rule and index for approximate match */
/* fall thru */
case LDAP_FILTER_EQUALITY:
@@ -136,17 +150,17 @@ done:
}
static int indexer(
- Backend *be,
+ Operation *op,
char *dbname,
struct berval *atname,
BerVarray vals,
ID id,
- int op,
+ int opid,
slap_mask_t mask )
{
int rc, i;
const char *text;
- DBCache *db;
+ DBCache *db;
AttributeDescription *ad = NULL;
struct berval *keys;
@@ -156,23 +170,18 @@ static int indexer(
if( rc != LDAP_SUCCESS ) return rc;
- db = ldbm_cache_open( be, dbname, LDBM_SUFFIX, LDBM_WRCREAT );
+ db = ldbm_cache_open( op->o_bd, dbname, LDBM_SUFFIX, LDBM_WRCREAT );
if ( db == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( INDEX, ERR,
- "index_read: Could not open db %s%s\n", dbname, LDBM_SUFFIX, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
"<= index_read NULL (could not open %s%s)\n",
dbname, LDBM_SUFFIX, 0 );
-#endif
return LDAP_OTHER;
}
if( IS_SLAP_INDEX( mask, SLAP_INDEX_PRESENT ) ) {
- key_change( be, db, atname, id, op );
+ key_change( op->o_bd, db, atname, id, opid );
}
if( IS_SLAP_INDEX( mask, SLAP_INDEX_EQUALITY ) ) {
@@ -181,13 +190,13 @@ static int indexer(
mask,
ad->ad_type->sat_syntax,
ad->ad_type->sat_equality,
- atname, vals, &keys );
+ atname, vals, &keys, op->o_tmpmemctx );
if( rc == LDAP_SUCCESS && keys != NULL ) {
for( i=0; keys[i].bv_val != NULL; i++ ) {
- key_change( be, db, &keys[i], id, op );
+ key_change( op->o_bd, db, &keys[i], id, opid );
}
- ber_bvarray_free( keys );
+ ber_bvarray_free_x( keys, op->o_tmpmemctx );
}
}
@@ -197,13 +206,13 @@ static int indexer(
mask,
ad->ad_type->sat_syntax,
ad->ad_type->sat_approx,
- atname, vals, &keys );
+ atname, vals, &keys, op->o_tmpmemctx );
if( rc == LDAP_SUCCESS && keys != NULL ) {
for( i=0; keys[i].bv_val != NULL; i++ ) {
- key_change( be, db, &keys[i], id, op );
+ key_change( op->o_bd, db, &keys[i], id, opid );
}
- ber_bvarray_free( keys );
+ ber_bvarray_free_x( keys, op->o_tmpmemctx );
}
}
@@ -213,46 +222,47 @@ static int indexer(
mask,
ad->ad_type->sat_syntax,
ad->ad_type->sat_substr,
- atname, vals, &keys );
+ atname, vals, &keys, op->o_tmpmemctx );
if( rc == LDAP_SUCCESS && keys != NULL ) {
for( i=0; keys[i].bv_val != NULL; i++ ) {
- key_change( be, db, &keys[i], id, op );
+ key_change( op->o_bd, db, &keys[i], id, opid );
}
- ber_bvarray_free( keys );
+ ber_bvarray_free_x( keys, op->o_tmpmemctx );
}
}
- ldbm_cache_close( be, db );
+ ldbm_cache_close( op->o_bd, db );
+
return LDAP_SUCCESS;
}
static int index_at_values(
- Backend *be,
+ Operation *op,
AttributeType *type,
struct berval *tags,
BerVarray vals,
ID id,
- int op )
+ int opid )
{
slap_mask_t mask = 0;
if( type->sat_sup ) {
/* recurse */
- (void) index_at_values( be,
+ (void) index_at_values( op,
type->sat_sup, tags,
- vals, id, op );
+ vals, id, opid );
}
/* If this type has no AD, we've never used it before */
if( type->sat_ad ) {
- attr_mask( be->be_private, type->sat_ad, &mask );
+ attr_mask( op->o_bd->be_private, type->sat_ad, &mask );
}
if( mask ) {
- indexer( be, type->sat_cname.bv_val,
+ indexer( op, type->sat_cname.bv_val,
&type->sat_cname,
- vals, id, op,
+ vals, id, opid,
mask );
}
@@ -263,12 +273,12 @@ static int index_at_values(
desc = ad_find_tags(type, tags);
if( desc ) {
- attr_mask( be->be_private, desc, &mask );
+ attr_mask( op->o_bd->be_private, desc, &mask );
}
if( mask ) {
- indexer( be, desc->ad_cname.bv_val, &desc->ad_cname,
- vals, id, op,
+ indexer( op, desc->ad_cname.bv_val, &desc->ad_cname,
+ vals, id, opid,
mask );
}
}
@@ -277,48 +287,40 @@ static int index_at_values(
}
int index_values(
- Backend *be,
+ Operation *op,
AttributeDescription *desc,
BerVarray vals,
ID id,
- int op )
+ int opid )
{
- (void) index_at_values( be,
+ (void) index_at_values( op,
desc->ad_type, &desc->ad_tags,
- vals, id, op );
+ vals, id, opid );
return LDAP_SUCCESS;
}
int
index_entry(
- Backend *be,
- int op,
- Entry *e,
- Attribute *ap )
+ Operation *op,
+ int opid,
+ Entry *e )
{
-#ifdef NEW_LOGGING
- LDAP_LOG( INDEX, ENTRY,
- "index_entry: %s (%s)%ld\n", op == SLAP_INDEX_ADD_OP ? "add" : "del",
- e->e_dn, e->e_id );
-#else
+ Attribute *ap = e->e_attrs;
Debug( LDAP_DEBUG_TRACE, "=> index_entry_%s( %ld, \"%s\" )\n",
- op == SLAP_INDEX_ADD_OP ? "add" : "del",
+ opid == SLAP_INDEX_ADD_OP ? "add" : "del",
e->e_id, e->e_dn );
-#endif
/* add each attribute to the indexes */
for ( ; ap != NULL; ap = ap->a_next ) {
- index_values( be, ap->a_desc, ap->a_vals, e->e_id, op );
+ index_values( op, ap->a_desc,
+ ap->a_nvals,
+ e->e_id, opid );
}
-#ifdef NEW_LOGGING
- LDAP_LOG( INDEX, ENTRY, "index_entry: success\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "<= index_entry_%s( %ld, \"%s\" ) success\n",
- op == SLAP_INDEX_ADD_OP ? "add" : "del",
+ opid == SLAP_INDEX_ADD_OP ? "add" : "del",
e->e_id, e->e_dn );
-#endif
return LDAP_SUCCESS;
}