/* 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 2000-2005 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"
#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,
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 & SLAP_INDEX_AUTO_LANG ) {
- *atname = desc->ad_cname;
- *dbname = desc->ad_type->sat_cname.bv_val;
- 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.bv_val;
return mask;
}
}
/* see if supertype defined mask for its subtypes */
for( at = desc->ad_type; at != NULL ; at = at->sat_sup ) {
/* If no AD, we've never indexed this type */
- if (!at->sat_ad)
- continue;
+ if ( !at->sat_ad ) continue;
bdb_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 & SLAP_INDEX_SUBTYPES ) {
+ if ( mask && ( mask ^ SLAP_INDEX_NOSUBTYPES ) ) {
*atname = at->sat_cname;
- *dbname = at->sat_cname.bv_val;
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 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, 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;
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:
}
static int indexer(
- Backend *be,
+ Operation *op,
DB_TXN *txn,
- char *dbname,
+ AttributeDescription *ad,
struct berval *atname,
- struct berval **vals,
+ 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 *keys;
assert( mask );
- rc = bdb_db_cache( be, dbname, &db );
+ rc = bdb_db_cache( op->o_bd, 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));
-#else
Debug( LDAP_DEBUG_ANY,
- "<= bdb_index_read NULL (could not open %s)\n",
- dbname, 0, 0 );
-#endif
+ "bdb_index_read: Could not open DB %s\n",
+ atname->bv_val, 0, 0 );
return LDAP_OTHER;
}
- rc = slap_bv2ad( atname, &ad, &text );
- if( rc != LDAP_SUCCESS ) return rc;
-
if( IS_SLAP_INDEX( mask, SLAP_INDEX_PRESENT ) ) {
- rc = bdb_key_change( be, db, txn, atname, 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] != 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;
}
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] != 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;
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] != 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;
}
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 = 0;
- slap_mask_t tmpmask = 0;
- int lindex = 0;
+#ifdef LDAP_COMP_MATCH
+ ComponentReference* cr_list, *cr;
+ AttributeDescription *comp_ad;
+#endif
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;
}
+#ifdef LDAP_COMP_MATCH
+ /* component indexing */
+ bdb_attr_comp_ref ( op->o_bd->be_private, type->sat_ad, &cr_list );
+ if ( cr_list ) {
+ for( cr = cr_list ; cr ; cr = cr->cr_next ) {
+ rc = indexer( op, txn, cr->cr_ad, &type->sat_cname,
+ cr->cr_nvals, id, opid,
+ cr->cr_indexmask );
+ }
+ }
+#endif
/* 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 );
-
- if( mask ) {
- *dbnamep = type->sat_cname.bv_val;
- } else if ( tmpmask & SLAP_INDEX_AUTO_SUBTYPES ) {
- mask = tmpmask;
+ 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;
- struct berval lname;
+ if( tags->bv_len ) {
AttributeDescription *desc;
- tmpmask = 0;
- lname.bv_val = NULL;
-
- desc = ad_find_lang( type, lang );
- if (desc)
- bdb_attr_mask( be->be_private, desc, &tmpmask );
-
- if( tmpmask ) {
- dbname = desc->ad_cname.bv_val;
- lname = desc->ad_cname;
- mask = tmpmask;
- } else if ( mask & SLAP_INDEX_AUTO_LANG ) {
- dbname = *dbnamep;
- lname.bv_len = type->sat_cname.bv_len+lang->bv_len + 1;
- lname.bv_val = ch_malloc( lname.bv_len + 1 );
- strcpy(lname.bv_val, type->sat_cname.bv_val);
- lname.bv_val[type->sat_cname.bv_len] = ';';
- strcpy(lname.bv_val+type->sat_cname.bv_len+1,
- lang->bv_val);
+ mask = 0;
+
+ 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,
+ if( mask ) {
+ rc = indexer( op, txn, desc, &desc->ad_cname,
+ vals, id, opid,
mask );
- if (!tmpmask)
- ch_free( lname.bv_val );
if( rc ) {
return rc;
}
}
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 LDAP_COMP_MATCH
+ ComponentReference *cr_list = NULL;
+ ComponentReference *cr = NULL, *dupped_cr = NULL;
+ void* decoded_comp, *extracted_comp;
+ ComponentSyntaxInfo* csi_attr;
+ Syntax* syn;
+ AttributeType* at;
+ int i, num_attr;
+ void* mem_op;
+ struct berval value = {0};
+#endif
-#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 ));
-#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 );
+#ifdef LDAP_COMP_MATCH
+ /* see if attribute has components to be indexed */
+ bdb_attr_comp_ref( op->o_bd->be_private, ap->a_desc->ad_type->sat_ad, &cr_list );
+ if ( attr_converter && cr_list ) {
+ syn = ap->a_desc->ad_type->sat_syntax;
+ ap->a_comp_data = op->o_tmpalloc( sizeof( ComponentData ), op->o_tmpmemctx );
+ /* Memory chunk(nibble) pre-allocation for decoders */
+ mem_op = nibble_mem_allocator ( 1024*16, 1024*4 );
+ ap->a_comp_data->cd_mem_op = mem_op;
+ for( cr = cr_list ; cr ; cr = cr->cr_next ) {
+ /* count how many values in an attribute */
+ for( num_attr=0; ap->a_vals[num_attr].bv_val != NULL; num_attr++ );
+ num_attr++;
+ cr->cr_nvals = (BerVarray)op->o_tmpalloc( sizeof( struct berval )*num_attr, op->o_tmpmemctx );
+ for( i=0; ap->a_vals[i].bv_val != NULL; i++ ) {
+ /* decoding attribute value */
+ decoded_comp = attr_converter ( ap, syn, &ap->a_vals[i] );
+ if ( !decoded_comp )
+ return LDAP_DECODING_ERROR;
+ /* extracting the referenced component */
+ dupped_cr = dup_comp_ref( op, cr );
+ csi_attr = ((ComponentSyntaxInfo*)decoded_comp)->csi_comp_desc->cd_extract_i( mem_op, dupped_cr, decoded_comp );
+ if ( !csi_attr )
+ return LDAP_DECODING_ERROR;
+ cr->cr_asn_type_id = csi_attr->csi_comp_desc->cd_type_id;
+ cr->cr_ad = (AttributeDescription*)get_component_description ( cr->cr_asn_type_id );
+ if ( !cr->cr_ad )
+ return LDAP_INVALID_SYNTAX;
+ at = cr->cr_ad->ad_type;
+ /* encoding the value of component in GSER */
+ rc = component_encoder( mem_op, csi_attr, &value );
+ if ( rc != LDAP_SUCCESS )
+ return LDAP_ENCODING_ERROR;
+ /* Normalize the encoded component values */
+ if ( at->sat_equality && at->sat_equality->smr_normalize ) {
+ rc = at->sat_equality->smr_normalize (
+ SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+ at->sat_syntax, at->sat_equality,
+ &value, &cr->cr_nvals[i], op->o_tmpmemctx );
+ } else {
+ cr->cr_nvals[i] = value;
+ }
+ }
+ /* The end of BerVarray */
+ cr->cr_nvals[num_attr-1].bv_val = NULL;
+ cr->cr_nvals[num_attr-1].bv_len = 0;
+ }
+ op->o_tmpfree( ap->a_comp_data, op->o_tmpmemctx );
+ nibble_mem_free ( mem_op );
+ ap->a_comp_data = NULL;
+ }
+#endif
+ 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" ));
-#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;
}
}
-#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",
(long) e->e_id, e->e_dn );
-#endif
return LDAP_SUCCESS;
}
projects / openldap / blobdiff