X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=servers%2Fslapd%2Fback-bdb%2Findex.c;h=950b52c27605863e266e7567c7fe201f997ae303;hb=190f161d741fb87417d743b64d0100dd6e2c0855;hp=aea035d4313b07a10dd9eba8673118cc5ee4cccd;hpb=aee598dba720783f20988d09c8804d199fcf807d;p=openldap

diff --git a/servers/slapd/back-bdb/index.c b/servers/slapd/back-bdb/index.c
index aea035d431..950b52c276 100644
--- a/servers/slapd/back-bdb/index.c
+++ b/servers/slapd/back-bdb/index.c
@@ -1,7 +1,7 @@
 /* index.c - routines for dealing with attribute indexes */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -14,90 +14,99 @@
 
 #include "slap.h"
 #include "back-bdb.h"
+#include "lutil_hash.h"
+
+static char presence_keyval[LUTIL_HASH_BYTES] = {0,0,0,1};
+static struct berval presence_key = {LUTIL_HASH_BYTES, presence_keyval};
 
 static slap_mask_t index_mask(
 	Backend *be,
 	AttributeDescription *desc,
-	char **dbname,
-	char **atname )
+	struct berval *atname )
 {
 	AttributeType *at;
 	slap_mask_t mask = 0;
 
-	bdb_attr_mask( be->be_private, desc->ad_cname.bv_val, &mask );
+	bdb_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;
 		return mask;
 	}
 
-	if( slap_ad_is_lang( desc ) ) {
-		/* has language tag */
-		bdb_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 */
+		bdb_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;
 			return mask;
 		}
 	}
 
 	/* see if supertype defined mask for its subtypes */
 	for( at = desc->ad_type; at != NULL ; at = at->sat_sup ) {
-		bdb_attr_mask( be->be_private, at->sat_cname, &mask );
+		/* If no AD, we've never indexed this type */
+		if ( !at->sat_ad ) continue;
 
-		if( mask & SLAP_INDEX_AUTO_SUBTYPES ) {
-			*atname = desc->ad_type->sat_cname;
-			*dbname = at->sat_cname;
-			return mask;
-		}
-		if( mask & SLAP_INDEX_SUBTYPES ) {
+		bdb_attr_mask( be->be_private, at->sat_ad, &mask );
+
+		if ( mask && ( mask ^ SLAP_INDEX_NOSUBTYPES ) ) {
 			*atname = at->sat_cname;
-			*dbname = at->sat_cname;
 			return mask;
 		}
-
-		if( mask ) break;
 	}
 
 	return 0;
 }
 
+int bdb_index_is_indexed(
+	Backend *be,
+	AttributeDescription *desc )
+{
+	slap_mask_t mask;
+	struct berval prefix;
+
+	mask = index_mask( be, desc, &prefix );
+
+	if( mask == 0 ) {
+		return LDAP_INAPPROPRIATE_MATCHING;
+	}
+
+	return LDAP_SUCCESS;
+}
+
 int bdb_index_param(
 	Backend *be,
 	AttributeDescription *desc,
 	int ftype,
 	DB **dbp,
 	slap_mask_t *maskp,
-	struct berval **prefixp )
+	struct berval *prefixp )
 {
 	int rc;
 	slap_mask_t mask;
 	DB *db;
-	char *dbname;
-	char *atname;
 
-	mask = index_mask( be, desc, &dbname, &atname );
+	mask = index_mask( be, desc, prefixp );
 
 	if( mask == 0 ) {
 		return LDAP_INAPPROPRIATE_MATCHING;
 	}
 
-	rc = bdb_db_cache( be, dbname, &db );
+	rc = bdb_db_cache( be, NULL, prefixp->bv_val, &db );
 
 	if( rc != LDAP_SUCCESS ) {
 		return rc;
 	}
 
-	switch(ftype) {
+	switch( ftype ) {
 	case LDAP_FILTER_PRESENT:
 		if( IS_SLAP_INDEX( mask, SLAP_INDEX_PRESENT ) ) {
+			*prefixp = presence_key;
 			goto done;
 		}
 		break;
@@ -128,52 +137,47 @@ int bdb_index_param(
 
 done:
 	*dbp = db;
-	*prefixp = ber_bvstrdup( atname );
 	*maskp = mask;
 	return LDAP_SUCCESS;
 }
 
 static int indexer(
-	Backend *be,
+	Operation *op,
 	DB_TXN *txn,
-	char *dbname,
-	char *atname,
-	struct berval **vals,
+	AttributeDescription *ad,
+	struct berval *atname,
+	BerVarray vals,
 	ID id,
-	int op,
+	int opid,
 	slap_mask_t mask )
 {
 	int rc, i;
 	const char *text;
 	DB *db;
-	AttributeDescription *ad = NULL;
-	struct berval **keys;
-	struct berval prefix;
+	struct berval *keys;
+	void *mark;
 
 	assert( mask );
 
-	rc = bdb_db_cache( be, dbname, &db );
+	rc = bdb_db_cache( op->o_bd, txn, atname->bv_val, &db );
 	
 	if ( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "index", LDAP_LEVEL_ERR,
-			"bdb_index_read: Could not open DB %s\n", dbname));
+		LDAP_LOG( INDEX, ERR, 
+			"bdb_index_read: Could not open DB %s\n",
+			atname->bv_val, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY,
-			"<= bdb_index_read NULL (could not open %s)\n",
-			dbname, 0, 0 );
+			"bdb_index_read: Could not open DB %s\n",
+			atname->bv_val, 0, 0 );
 #endif
 		return LDAP_OTHER;
 	}
 
-	rc = slap_str2ad( atname, &ad, &text );
-	if( rc != LDAP_SUCCESS ) return rc;
-
-	prefix.bv_val = atname;
-	prefix.bv_len = strlen( atname );
+	mark = sl_mark(op->o_tmpmemctx);
 
 	if( IS_SLAP_INDEX( mask, SLAP_INDEX_PRESENT ) ) {
-		rc = bdb_key_change( be, db, txn, &prefix, id, op );
+		rc = bdb_key_change( op->o_bd, db, txn, &presence_key, id, opid );
 		if( rc ) {
 			goto done;
 		}
@@ -185,17 +189,17 @@ 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++ ) {
-				rc = bdb_key_change( be, db, txn, keys[i], id, op );
+			for( i=0; keys[i].bv_val != NULL; i++ ) {
+				rc = bdb_key_change( op->o_bd, db, txn, &keys[i], id, opid );
 				if( rc ) {
-					ber_bvecfree( keys );
+					ber_bvarray_free_x( keys, op->o_tmpmemctx );
 					goto done;
 				}
 			}
-			ber_bvecfree( keys );
+			ber_bvarray_free_x( keys, op->o_tmpmemctx );
 		}
 		rc = LDAP_SUCCESS;
 	}
@@ -206,17 +210,17 @@ 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++ ) {
-				rc = bdb_key_change( be, db, txn, keys[i], id, op );
+			for( i=0; keys[i].bv_val != NULL; i++ ) {
+				rc = bdb_key_change( op->o_bd, db, txn, &keys[i], id, opid );
 				if( rc ) {
-					ber_bvecfree( keys );
+					ber_bvarray_free_x( keys, op->o_tmpmemctx );
 					goto done;
 				}
 			}
-			ber_bvecfree( keys );
+			ber_bvarray_free_x( keys, op->o_tmpmemctx );
 		}
 
 		rc = LDAP_SUCCESS;
@@ -228,157 +232,136 @@ 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++ ) {
-				bdb_key_change( be, db, txn, keys[i], id, op );
+			for( i=0; keys[i].bv_val != NULL; i++ ) {
+				bdb_key_change( op->o_bd, db, txn, &keys[i], id, opid );
 				if( rc ) {
-					ber_bvecfree( keys );
+					ber_bvarray_free_x( keys, op->o_tmpmemctx );
 					goto done;
 				}
 			}
-			ber_bvecfree( keys );
+			ber_bvarray_free_x( keys, op->o_tmpmemctx );
 		}
 
 		rc = LDAP_SUCCESS;
 	}
 
 done:
+	sl_release( mark, op->o_tmpmemctx );
 	return rc;
 }
 
 static int index_at_values(
-	Backend *be,
+	Operation *op,
 	DB_TXN *txn,
+	AttributeDescription *ad,
 	AttributeType *type,
-	struct berval *lang,
-	struct berval **vals,
+	struct berval *tags,
+	BerVarray vals,
 	ID id,
-	int op,
-	char ** dbnamep,
-	slap_mask_t *maskp )
+	int opid )
 {
 	int rc;
-	slap_mask_t mask;
-	slap_mask_t tmpmask = 0;
-	int lindex = 0;
+	slap_mask_t mask = 0;
 
 	if( type->sat_sup ) {
 		/* recurse */
-		rc = index_at_values( be, txn,
-			type->sat_sup, lang,
-			vals, id, op,
-			dbnamep, &tmpmask );
+		rc = index_at_values( op, txn, NULL,
+			type->sat_sup, tags,
+			vals, id, opid );
 
 		if( rc ) return rc;
 	}
 
-	bdb_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 ) {
+		bdb_attr_mask( op->o_bd->be_private, type->sat_ad, &mask );
+		ad = type->sat_ad;
 	}
 
 	if( mask ) {
-		rc = indexer( be, txn, *dbnamep,
-			type->sat_cname,
-			vals, id, op,
+		rc = indexer( op, txn, ad, &type->sat_cname,
+			vals, id, opid,
 			mask );
 
 		if( rc ) return rc;
 	}
 
-	if( lang->bv_len ) {
-		char *dbname = NULL;
-		size_t tlen = strlen( type->sat_cname );
-		size_t llen = lang->bv_len;
-		char *lname = ch_malloc( tlen + llen + sizeof(";") );
+	if( tags->bv_len ) {
+		AttributeDescription *desc;
 
-		sprintf( lname, "%s;%s", type->sat_cname, lang->bv_val );
+		mask = 0;
 
-		bdb_attr_mask( be->be_private, lname, &tmpmask );
-
-		if( tmpmask ) {
-			dbname = lname;
-		} else if ( mask & SLAP_INDEX_AUTO_LANG ) {
-			dbname = *dbnamep;
-			tmpmask = mask;
+		desc = ad_find_tags( type, tags );
+		if( desc ) {
+			bdb_attr_mask( op->o_bd->be_private, desc, &mask );
 		}
 
-		if( dbname != NULL ) {
-			rc = indexer( be, txn, dbname, lname,
-				vals, id, op,
-				tmpmask );
+		if( mask ) {
+			rc = indexer( op, txn, desc, &desc->ad_cname,
+				vals, id, opid,
+				mask );
 
 			if( rc ) {
-				ch_free( lname );
 				return rc;
 			}
 		}
-
-		ch_free( lname );
 	}
 
 	return LDAP_SUCCESS;
 }
 
 int bdb_index_values(
-	Backend *be,
+	Operation *op,
 	DB_TXN *txn,
 	AttributeDescription *desc,
-	struct berval **vals,
+	BerVarray vals,
 	ID id,
-	int op )
+	int opid )
 {
 	int rc;
-	char *dbname = NULL;
-	slap_mask_t mask;
 
-	rc = index_at_values( be, txn,
-		desc->ad_type, &desc->ad_lang,
-		vals, id, op,
-		&dbname, &mask );
+	rc = index_at_values( op, txn, desc,
+		desc->ad_type, &desc->ad_tags,
+		vals, id, opid );
 
 	return rc;
 }
 
 int
 bdb_index_entry(
-	Backend	*be,
+	Operation *op,
 	DB_TXN *txn,
-	int op,
-	Entry	*e,
-	Attribute *ap )
+	int opid,
+	Entry	*e )
 {
 	int rc;
+	Attribute *ap = e->e_attrs;
 
 #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, (long) e->e_id ));
+	LDAP_LOG( INDEX, ENTRY, "index_entry: %s (%s) %ld\n",
+		opid == SLAP_INDEX_ADD_OP ? "add" : "del", e->e_dn, (long) e->e_id );
 #else
 	Debug( LDAP_DEBUG_TRACE, "=> index_entry_%s( %ld, \"%s\" )\n",
-		op == SLAP_INDEX_ADD_OP ? "add" : "del",
+		opid == SLAP_INDEX_ADD_OP ? "add" : "del",
 		(long) e->e_id, e->e_dn );
 #endif
 
 	/* add each attribute to the indexes */
 	for ( ; ap != NULL; ap = ap->a_next ) {
-		rc = bdb_index_values( be, txn,
-			ap->a_desc, ap->a_vals, e->e_id, op );
+		rc = bdb_index_values( op, txn, ap->a_desc,
+			ap->a_nvals, e->e_id, opid );
 
 		if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
-			   "index_entry: success\n" ));
+			LDAP_LOG( INDEX, ENTRY, 
+				"index_entry: failure (%d)\n", rc, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_TRACE,
-				"<= index_entry_%s( %ld, \"%s\" ) success\n",
-				op == SLAP_INDEX_ADD_OP ? "add" : "del",
+				"<= index_entry_%s( %ld, \"%s\" ) failure\n",
+				opid == SLAP_INDEX_ADD_OP ? "add" : "del",
 				(long) e->e_id, e->e_dn );
 #endif
 			return rc;
@@ -386,11 +369,10 @@ bdb_index_entry(
 	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "index", LDAP_LEVEL_ENTRY,
-		"index_entry: success\n" ));
+	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",
 		(long) e->e_id, e->e_dn );
 #endif