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

diff --git a/servers/slapd/back-ldbm/index.c b/servers/slapd/back-ldbm/index.c
index f24903003d..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-2000 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"
@@ -19,78 +28,86 @@ static slap_mask_t index_mask(
 	Backend *be,
 	AttributeDescription *desc,
 	char **dbname,
-	char **atname )
+	struct berval *atname )
 {
 	AttributeType *at;
 	slap_mask_t mask = 0;
 
-	/* we do not support indexing of binary attributes */
-	if( slap_ad_is_binary( desc ) ) return 0;
-
-	attr_mask( be->be_private, desc->ad_cname->bv_val, &mask );
+	attr_mask( be->be_private, desc, &mask );
 
 	if( mask ) {
-		*atname = desc->ad_cname->bv_val;
-		*dbname = desc->ad_cname->bv_val;
+		*atname = desc->ad_cname;
+		*dbname = desc->ad_cname.bv_val;
 		return mask;
 	}
 
-	if( slap_ad_is_lang( desc ) ) {
-		/* has language tag */
-		attr_mask( be->be_private, desc->ad_type->sat_cname, &mask );
+	/* 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_tagged( desc ) && desc != desc->ad_type->sat_ad ) {
+		/* has tagging option */
+		attr_mask( be->be_private, desc->ad_type->sat_ad, &mask );
 
-		if( mask & SLAP_INDEX_AUTO_LANG ) {
-			*atname = desc->ad_cname->bv_val;
-			*dbname = desc->ad_type->sat_cname;
-			return mask;
-		}
-		if( mask & SLAP_INDEX_LANG ) {
+		if( mask && ( mask ^ SLAP_INDEX_NOTAGS ) ) {
 			*atname = desc->ad_type->sat_cname;
-			*dbname = desc->ad_type->sat_cname;
+			*dbname = desc->ad_type->sat_cname.bv_val;
 			return mask;
 		}
 	}
 
 	/* see if supertype defined mask for its subtypes */
-	for( at = desc->ad_type; at != NULL ; at = at->sat_sup ) {
-		attr_mask( be->be_private, at->sat_cname, &mask );
-
-		if( mask & SLAP_INDEX_AUTO_SUBTYPES ) {
-			*atname = desc->ad_type->sat_cname;
-			*dbname = at->sat_cname;
-			return mask;
-		}
-		if( mask & SLAP_INDEX_SUBTYPES ) {
+	for( at = desc->ad_type->sat_sup; at != NULL ; at = at->sat_sup ) {
+		/* If no AD, we've never indexed this type */
+		if (!at->sat_ad)
+			continue;
+		
+		attr_mask( be->be_private, at->sat_ad, &mask );
+
+		if( mask && ( mask ^ SLAP_INDEX_NOSUBTYPES ) ) {
 			*atname = at->sat_cname;
-			*dbname = at->sat_cname;
+			*dbname = at->sat_cname.bv_val;
 			return mask;
 		}
-
-		if( mask ) break;
 	}
 
 	return 0;
 }
 
+int index_is_indexed(
+	Backend *be,
+	AttributeDescription *desc )
+{
+	slap_mask_t mask;
+	char *dbname;
+	struct berval prefix;
+
+	mask = index_mask( be, desc, &dbname, &prefix );
+
+	if( mask == 0 ) {
+		return LDAP_INAPPROPRIATE_MATCHING;
+	}
+
+	return LDAP_SUCCESS;
+}
+
 int index_param(
 	Backend *be,
 	AttributeDescription *desc,
 	int ftype,
 	char **dbnamep,
 	slap_mask_t *maskp,
-	struct berval **prefixp )
+	struct berval *prefixp )
 {
 	slap_mask_t mask;
 	char *dbname;
-	char *atname;
 
-	mask = index_mask( be, desc, &dbname, &atname );
+	mask = index_mask( be, desc, &dbname, prefixp );
 
 	if( mask == 0 ) {
 		return LDAP_INAPPROPRIATE_MATCHING;
 	}
 
-	switch(ftype) {
+	switch( ftype ) {
 	case LDAP_FILTER_PRESENT:
 		if( IS_SLAP_INDEX( mask, SLAP_INDEX_PRESENT ) ) {
 			goto done;
@@ -98,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:
@@ -123,55 +145,43 @@ int index_param(
 
 done:
 	*dbnamep = dbname;
-	*prefixp = ber_bvstrdup( atname );
 	*maskp = mask;
 	return LDAP_SUCCESS;
 }
 
 static int indexer(
-	Backend *be,
+	Operation *op,
 	char *dbname,
-	char *atname,
-	struct berval **vals,
+	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;
-	struct berval prefix;
+	struct berval *keys;
 
 	assert( mask );
 
-	rc = slap_str2ad( atname, &ad, &text );
+	rc = slap_bv2ad( atname, &ad, &text );
 
 	if( rc != LDAP_SUCCESS ) return rc;
 
-	prefix.bv_val = atname;
-	prefix.bv_len = strlen( atname );
-
-	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
 
-		ad_free( ad, 1 );
 		return LDAP_OTHER;
 	}
 
 	if( IS_SLAP_INDEX( mask, SLAP_INDEX_PRESENT ) ) {
-		key_change( be, db, &prefix, id, op );
+		key_change( op->o_bd, db, atname, id, opid );
 	}
 
 	if( IS_SLAP_INDEX( mask, SLAP_INDEX_EQUALITY ) ) {
@@ -180,13 +190,13 @@ static int indexer(
 			mask,
 			ad->ad_type->sat_syntax,
 			ad->ad_type->sat_equality,
-			&prefix, vals, &keys );
+			atname, vals, &keys, op->o_tmpmemctx );
 
 		if( rc == LDAP_SUCCESS && keys != NULL ) {
-			for( i=0; keys[i] != NULL; i++ ) {
-				key_change( be, db, keys[i], id, op );
+			for( i=0; keys[i].bv_val != NULL; i++ ) {
+				key_change( op->o_bd, db, &keys[i], id, opid );
 			}
-			ber_bvecfree( keys );
+			ber_bvarray_free_x( keys, op->o_tmpmemctx );
 		}
 	}
 
@@ -196,13 +206,13 @@ static int indexer(
 			mask,
 			ad->ad_type->sat_syntax,
 			ad->ad_type->sat_approx,
-			&prefix, vals, &keys );
+			atname, vals, &keys, op->o_tmpmemctx );
 
 		if( rc == LDAP_SUCCESS && keys != NULL ) {
-			for( i=0; keys[i] != NULL; i++ ) {
-				key_change( be, db, keys[i], id, op );
+			for( i=0; keys[i].bv_val != NULL; i++ ) {
+				key_change( op->o_bd, db, &keys[i], id, opid );
 			}
-			ber_bvecfree( keys );
+			ber_bvarray_free_x( keys, op->o_tmpmemctx );
 		}
 	}
 
@@ -212,145 +222,105 @@ static int indexer(
 			mask,
 			ad->ad_type->sat_syntax,
 			ad->ad_type->sat_substr,
-			&prefix, vals, &keys );
+			atname, vals, &keys, op->o_tmpmemctx );
 
 		if( rc == LDAP_SUCCESS && keys != NULL ) {
-			for( i=0; keys[i] != NULL; i++ ) {
-				key_change( be, db, keys[i], id, op );
+			for( i=0; keys[i].bv_val != NULL; i++ ) {
+				key_change( op->o_bd, db, &keys[i], id, opid );
 			}
-			ber_bvecfree( keys );
+			ber_bvarray_free_x( keys, op->o_tmpmemctx );
 		}
 	}
 
-	ldbm_cache_close( be, db );
-	ad_free( ad, 1 );
+	ldbm_cache_close( op->o_bd, db );
+
 	return LDAP_SUCCESS;
 }
 
 static int index_at_values(
-	Backend *be,
+	Operation *op,
 	AttributeType *type,
-	const char *lang,
-	struct berval **vals,
+	struct berval *tags,
+	BerVarray vals,
 	ID id,
-	int op,
-	char ** dbnamep,
-	slap_mask_t *maskp )
+	int opid )
 {
-	slap_mask_t mask;
-	slap_mask_t tmpmask = 0;
-	int lindex = 0;
+	slap_mask_t mask = 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 );
 	}
 
-	attr_mask( be->be_private, type->sat_cname, &mask );
-
-	if( mask ) {
-		*dbnamep = type->sat_cname;
-	} else if ( tmpmask & SLAP_INDEX_AUTO_SUBTYPES ) {
-		mask = tmpmask;
+	/* If this type has no AD, we've never used it before */
+	if( type->sat_ad ) {
+		attr_mask( op->o_bd->be_private, type->sat_ad, &mask );
 	}
 
 	if( mask ) {
-		indexer( be, *dbnamep,
-			type->sat_cname,
-			vals, id, op,
+		indexer( op, type->sat_cname.bv_val,
+			&type->sat_cname,
+			vals, id, opid,
 			mask );
 	}
 
-	if( lang ) {
-		char *dbname = NULL;
-		size_t tlen = strlen( type->sat_cname );
-		size_t llen = strlen( lang );
-		char *lname = ch_malloc( tlen + llen + sizeof(";") );
-
-		sprintf( lname, "%s;%s", type->sat_cname, lang );
+	if( tags->bv_len ) {
+		AttributeDescription *desc;
 
-		attr_mask( be->be_private, lname, &tmpmask );
+		mask = 0;
 
-		if( tmpmask ) {
-			dbname = lname;
-		} else if ( mask & SLAP_INDEX_AUTO_LANG ) {
-			dbname = *dbnamep;
-			tmpmask = mask;
+		desc = ad_find_tags(type, tags);
+		if( desc ) {
+			attr_mask( op->o_bd->be_private, desc, &mask );
 		}
 
-		if( dbname != NULL ) {
-			indexer( be, dbname, lname,
-				vals, id, op,
-				tmpmask );
+		if( mask ) {
+			indexer( op, desc->ad_cname.bv_val, &desc->ad_cname,
+				vals, id, opid,
+				mask );
 		}
-
-		ch_free( lname );
 	}
 
 	return LDAP_SUCCESS;
 }
 
 int index_values(
-	Backend *be,
+	Operation *op,
 	AttributeDescription *desc,
-	struct berval **vals,
+	BerVarray vals,
 	ID id,
-	int op )
+	int opid )
 {
-	char *dbname = NULL;
-	slap_mask_t mask;
-
-	if( slap_ad_is_binary( desc ) ) {
-		/* binary attributes have no index capabilities */
-		return LDAP_SUCCESS;
-	}
-
-	(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;
 }