X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Findex.c;h=6cdec8db7ef9116ce0c61f6ef935fe55f7fda4db;hb=a4d161cff64c74e03e5898eae104d5d52cc54a91;hp=3d715d71cf48462ee6456b6e62690af8ecfba11e;hpb=fde56a188c241ce5a61e0fee4b6339d58436ddfc;p=openldap

diff --git a/servers/slapd/back-ldbm/index.c b/servers/slapd/back-ldbm/index.c
index 3d715d71cf..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-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -32,14 +41,14 @@ static slap_mask_t index_mask(
 		return mask;
 	}
 
-	/* If there is a language tag, did we ever index the base
+	/* If there is a tagging option, did we ever index the base
 	 * type? If so, check for mask, otherwise it's not there.
 	 */
-	if( slap_ad_is_lang( desc ) && desc != desc->ad_type->sat_ad ) {
-		/* has language tag */
+	if( slap_ad_is_tagged( desc ) && desc != desc->ad_type->sat_ad ) {
+		/* has tagging option */
 		attr_mask( be->be_private, desc->ad_type->sat_ad, &mask );
 
-		if( mask && ( mask ^ SLAP_INDEX_NOLANG ) ) {
+		if( mask && ( mask ^ SLAP_INDEX_NOTAGS ) ) {
 			*atname = desc->ad_type->sat_cname;
 			*dbname = desc->ad_type->sat_cname.bv_val;
 			return mask;
@@ -54,12 +63,6 @@ static slap_mask_t index_mask(
 		
 		attr_mask( be->be_private, at->sat_ad, &mask );
 
-		if( mask & SLAP_INDEX_AUTO_SUBTYPES ) {
-			*atname = desc->ad_type->sat_cname;
-			*dbname = at->sat_cname.bv_val;
-			return mask;
-		}
-
 		if( mask && ( mask ^ SLAP_INDEX_NOSUBTYPES ) ) {
 			*atname = at->sat_cname;
 			*dbname = at->sat_cname.bv_val;
@@ -74,7 +77,6 @@ int index_is_indexed(
 	Backend *be,
 	AttributeDescription *desc )
 {
-	int rc;
 	slap_mask_t mask;
 	char *dbname;
 	struct berval prefix;
@@ -85,7 +87,7 @@ int index_is_indexed(
 		return LDAP_INAPPROPRIATE_MATCHING;
 	}
 
-    	return LDAP_SUCCESS;
+	return LDAP_SUCCESS;
 }
 
 int index_param(
@@ -113,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:
@@ -143,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;
 
@@ -163,24 +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", LDAP_LEVEL_ERR,
-			   "index_read: Could not open db %s%s\n",
-			   dbname, LDBM_SUFFIX ));
-#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 ) ) {
@@ -189,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 );
 		}
 	}
 
@@ -205,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 );
 		}
 	}
 
@@ -221,88 +222,64 @@ 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 *lang,
+	struct berval *tags,
 	BerVarray vals,
 	ID id,
-	int op,
-	char ** dbnamep,
-	slap_mask_t *maskp )
+	int opid )
 {
 	slap_mask_t mask = 0;
-	slap_mask_t tmpmask = 0;
 
 	if( type->sat_sup ) {
 		/* recurse */
-		(void) index_at_values( be,
-			type->sat_sup, lang,
-			vals, id, op,
-			dbnamep, &tmpmask );
+		(void) index_at_values( op,
+			type->sat_sup, tags,
+			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 );
-	}
-
-	if( mask ) {
-		*dbnamep = type->sat_cname.bv_val;
-	} else if ( tmpmask & SLAP_INDEX_AUTO_SUBTYPES ) {
-		mask = tmpmask;
+		attr_mask( op->o_bd->be_private, type->sat_ad, &mask );
 	}
 
 	if( mask ) {
-		indexer( be, *dbnamep,
+		indexer( op, type->sat_cname.bv_val,
 			&type->sat_cname,
-			vals, id, op,
+			vals, id, opid,
 			mask );
-		if ( mask & SLAP_INDEX_AUTO_SUBTYPES ) {
-			*maskp = mask;
-		}
 	}
 
-	if( lang->bv_len ) {
-		char *dbname = NULL;
-		struct berval lname;
+	if( tags->bv_len ) {
 		AttributeDescription *desc;
 
-		tmpmask = 0;
-		lname.bv_val = NULL;
+		mask = 0;
 
-		desc = ad_find_lang(type, lang);
+		desc = ad_find_tags(type, tags);
 		if( desc ) {
-			attr_mask( be->be_private, desc, &tmpmask );
+			attr_mask( op->o_bd->be_private, desc, &mask );
 		}
 
-		if( tmpmask ) {
-			dbname = desc->ad_cname.bv_val;
-			lname = desc->ad_cname;
-			mask = tmpmask;
-		}
-
-		if( dbname != NULL ) {
-			indexer( be, dbname, &lname,
-				vals, id, op,
+		if( mask ) {
+			indexer( op, desc->ad_cname.bv_val, &desc->ad_cname,
+				vals, id, opid,
 				mask );
-			if( !tmpmask ) {
-				ch_free( lname.bv_val );
-			}
 		}
 	}
 
@@ -310,54 +287,40 @@ static int index_at_values(
 }
 
 int index_values(
-	Backend *be,
+	Operation *op,
 	AttributeDescription *desc,
 	BerVarray vals,
 	ID id,
-	int op )
+	int opid )
 {
-	char *dbname = NULL;
-	slap_mask_t mask;
-
-	(void) index_at_values( be,
-		desc->ad_type, &desc->ad_lang,
-		vals, id, op,
-		&dbname, &mask );
+	(void) index_at_values( op,
+		desc->ad_type, &desc->ad_tags,
+		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", LDAP_LEVEL_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", LDAP_LEVEL_ENTRY,
-		   "index_entry: success\n" ));
-#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;
 }