/* index.c - routines for dealing with attribute indexes */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
static slap_mask_t index_mask(
Backend *be,
AttributeDescription *desc,
- char **dbname,
struct berval *atname )
{
AttributeType *at;
if( mask ) {
*atname = desc->ad_cname;
- *dbname = desc->ad_cname.bv_val;
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 */
bdb_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;
}
}
if ( mask && ( mask ^ SLAP_INDEX_NOSUBTYPES ) ) {
*atname = at->sat_cname;
- *dbname = at->sat_cname.bv_val;
return mask;
}
}
AttributeDescription *desc )
{
slap_mask_t mask;
- char *dbname;
struct berval prefix;
- mask = index_mask( be, desc, &dbname, &prefix );
+ mask = index_mask( be, desc, &prefix );
if( mask == 0 ) {
return LDAP_INAPPROPRIATE_MATCHING;
int rc;
slap_mask_t mask;
DB *db;
- char *dbname;
- mask = index_mask( be, desc, &dbname, prefixp );
+ 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;
}
static int indexer(
- Backend *be,
+ Operation *op,
DB_TXN *txn,
- char *dbname,
+ 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;
+ 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, ERR,
- "bdb_index_read: Could not open DB %s\n", dbname, 0, 0 );
+ "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_bv2ad( atname, &ad, &text );
- if( rc != LDAP_SUCCESS ) return rc;
+ mark = sl_mark(op->o_tmpmemctx);
if( IS_SLAP_INDEX( mask, SLAP_INDEX_PRESENT ) ) {
- rc = bdb_key_change( be, db, txn, &presence_key, id, op );
+ rc = bdb_key_change( op->o_bd, db, txn, &presence_key, id, opid );
if( rc ) {
goto done;
}
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++ ) {
- rc = bdb_key_change( be, db, txn, &keys[i], id, op );
+ rc = bdb_key_change( op->o_bd, db, txn, &keys[i], id, opid );
if( rc ) {
- ber_bvarray_free( keys );
+ ber_bvarray_free_x( keys, op->o_tmpmemctx );
goto done;
}
}
- ber_bvarray_free( keys );
+ ber_bvarray_free_x( keys, op->o_tmpmemctx );
}
rc = LDAP_SUCCESS;
}
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++ ) {
- rc = bdb_key_change( be, db, txn, &keys[i], id, op );
+ rc = bdb_key_change( op->o_bd, db, txn, &keys[i], id, opid );
if( rc ) {
- ber_bvarray_free( keys );
+ ber_bvarray_free_x( keys, op->o_tmpmemctx );
goto done;
}
}
- ber_bvarray_free( keys );
+ ber_bvarray_free_x( keys, op->o_tmpmemctx );
}
rc = LDAP_SUCCESS;
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++ ) {
- bdb_key_change( be, db, txn, &keys[i], id, op );
+ bdb_key_change( op->o_bd, db, txn, &keys[i], id, opid );
if( rc ) {
- ber_bvarray_free( keys );
+ ber_bvarray_free_x( keys, op->o_tmpmemctx );
goto done;
}
}
- ber_bvarray_free( 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 *tags,
BerVarray vals,
ID id,
- int op )
+ int opid )
{
int rc;
slap_mask_t mask = 0;
if( type->sat_sup ) {
/* recurse */
- rc = index_at_values( be, txn,
- type->sat_sup, lang,
- vals, id, op );
+ rc = index_at_values( op, txn, NULL,
+ type->sat_sup, tags,
+ vals, id, opid );
if( rc ) return rc;
}
/* If this type has no AD, we've never used it before */
if( type->sat_ad ) {
- bdb_attr_mask( be->be_private, type->sat_ad, &mask );
+ bdb_attr_mask( op->o_bd->be_private, type->sat_ad, &mask );
+ ad = type->sat_ad;
}
if( mask ) {
- rc = indexer( be, txn, type->sat_cname.bv_val,
- &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 ) {
+ if( tags->bv_len ) {
AttributeDescription *desc;
mask = 0;
- desc = ad_find_lang( type, lang );
+ desc = ad_find_tags( type, tags );
if( desc ) {
- bdb_attr_mask( be->be_private, desc, &mask );
+ bdb_attr_mask( op->o_bd->be_private, desc, &mask );
}
if( mask ) {
- rc = indexer( be, txn, desc->ad_cname.bv_val,
- &desc->ad_cname,
- vals, id, op,
+ rc = indexer( op, txn, desc, &desc->ad_cname,
+ vals, id, opid,
mask );
if( rc ) {
}
int bdb_index_values(
- Backend *be,
+ Operation *op,
DB_TXN *txn,
AttributeDescription *desc,
BerVarray vals,
ID id,
- int op )
+ int opid )
{
int rc;
- rc = index_at_values( be, txn,
- desc->ad_type, &desc->ad_lang,
- vals, id, op );
+ 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, ENTRY, "index_entry: %s (%s) %ld\n",
- op == SLAP_INDEX_ADD_OP ? "add" : "del", e->e_dn, (long) e->e_id );
+ 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
#else
Debug( LDAP_DEBUG_TRACE,
"<= index_entry_%s( %ld, \"%s\" ) failure\n",
- op == SLAP_INDEX_ADD_OP ? "add" : "del",
+ opid == SLAP_INDEX_ADD_OP ? "add" : "del",
(long) e->e_id, e->e_dn );
#endif
return rc;
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
projects / openldap / blobdiff