/* index.c - routines for dealing with attribute indexes */
/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include "slap.h"
#include "back-ldbm.h"
-
-static int change_value(Backend *be,
- DBCache *db,
- char *type,
- int indextype,
- char *val,
- ID id,
- int
- (*idl_func)(Backend *, DBCache *, Datum, ID));
-static int index2prefix(int indextype);
-
-int
-index_add_entry(
- Backend *be,
- Entry *e
-)
+static slap_mask_t index_mask(
+ Backend *be,
+ AttributeDescription *desc,
+ char **dbname,
+ struct berval *atname )
{
- Attribute *ap;
- struct berval bv;
- struct berval *bvals[2];
+ AttributeType *at;
+ slap_mask_t mask = 0;
- Debug( LDAP_DEBUG_TRACE, "=> index_add( %ld, \"%s\" )\n", e->e_id,
- e->e_dn, 0 );
+ attr_mask( be->be_private, desc, &mask );
- /*
- * dn index entry - make it look like an attribute so it works
- * with index_change_values() call
- */
-
- bv.bv_val = ch_strdup( e->e_ndn );
- bv.bv_len = strlen( bv.bv_val );
- bvals[0] = &bv;
- bvals[1] = NULL;
-
- /* add the dn to the indexes */
- {
- char *dn = ch_strdup("dn");
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- /* not yet implemented */
-#else
- index_change_values( be, dn, bvals, e->e_id, SLAP_INDEX_ADD_OP );
-#endif
- free( dn );
+ if( mask ) {
+ *atname = desc->ad_cname;
+ *dbname = desc->ad_cname.bv_val;
+ return mask;
}
- free( bv.bv_val );
+ /* 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 && ( mask ^ SLAP_INDEX_NOTAGS ) ) {
+ *atname = desc->ad_type->sat_cname;
+ *dbname = desc->ad_type->sat_cname.bv_val;
+ return mask;
+ }
+ }
- /* add each attribute to the indexes */
- for ( ap = e->e_attrs; ap != NULL; ap = ap->a_next ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- /* index_change_values( be, SLAP_INDEX_ADD_OP, e->e_id, ap ); */
-#else
- index_change_values( be, ap->a_type, ap->a_vals, e->e_id,
- SLAP_INDEX_ADD_OP );
-#endif
+ /* see if supertype defined mask for its 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.bv_val;
+ return mask;
+ }
}
- Debug( LDAP_DEBUG_TRACE, "<= index_add( %ld, \"%s\" ) 0\n", e->e_id,
- e->e_ndn, 0 );
- return( 0 );
+ return 0;
}
-int
-index_add_mods(
- Backend *be,
- Modifications *ml,
- ID id
-)
+int index_is_indexed(
+ Backend *be,
+ AttributeDescription *desc )
{
- int rc;
+ slap_mask_t mask;
+ char *dbname;
+ struct berval prefix;
- for ( ; ml != NULL; ml = ml->ml_next ) {
- Modification *mod = &ml->ml_mod;
+ mask = index_mask( be, desc, &dbname, &prefix );
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- /* not yet implemented */
- rc = -1;
-#else
- switch ( mod->mod_op ) {
- case LDAP_MOD_REPLACE:
- /* XXX: Delete old index data==>problem when this
- * gets called we lost values already!
- */
- case LDAP_MOD_ADD:
- rc = index_change_values( be,
- mod->mod_type,
- mod->mod_bvalues,
- id,
- SLAP_INDEX_ADD_OP );
- break;
- case LDAP_MOD_DELETE:
- rc = index_change_values( be,
- mod->mod_type,
- mod->mod_bvalues,
- id,
- SLAP_INDEX_DELETE_OP );
- break;
- case SLAP_MOD_SOFTADD: /* SOFTADD means index was there */
- rc = 0;
- break;
-
- default:
- rc = -1;
- }
-#endif
-
- if ( rc != 0 ) {
- return( rc );
- }
+ if( mask == 0 ) {
+ return LDAP_INAPPROPRIATE_MATCHING;
}
- return( 0 );
+ return LDAP_SUCCESS;
}
-ID_BLOCK *
-index_read(
- Backend *be,
- char *type,
- int indextype,
- char *val
-)
+int index_param(
+ Backend *be,
+ AttributeDescription *desc,
+ int ftype,
+ char **dbnamep,
+ slap_mask_t *maskp,
+ struct berval *prefixp )
{
- DBCache *db;
- Datum key;
- ID_BLOCK *idl;
- int indexmask;
- char prefix;
- char *realval, *tmpval;
- char buf[BUFSIZ];
-
- char *at_cn;
-
- ldbm_datum_init( key );
-
- prefix = index2prefix( indextype );
- Debug( LDAP_DEBUG_TRACE, "=> index_read(\"%c%s\"->\"%s\")\n",
- prefix, type, val );
-
- attr_mask( be->be_private, type, &indexmask );
- if ( ! (indextype & indexmask) ) {
- idl = idl_allids( be );
- Debug( LDAP_DEBUG_TRACE,
- "<= index_read %ld candidates (allids - not indexed)\n",
- idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
- return( idl );
- }
+ slap_mask_t mask;
+ char *dbname;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- at_cn = at_canonical_name( at_find( type ) );
-#else
- attr_normalize( type );
- at_cn = at_canonical_name( type );
-#endif
+ mask = index_mask( be, desc, &dbname, prefixp );
- if ( at_cn == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "<= index_read no canonical name for type \"%s\"\n",
- type != NULL ? type : "(NULL)", 0, 0 );
- return( NULL );
+ if( mask == 0 ) {
+ return LDAP_INAPPROPRIATE_MATCHING;
}
- if ( (db = ldbm_cache_open( be, at_cn, LDBM_SUFFIX, LDBM_WRCREAT ))
- == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "<= index_read NULL (could not open %s%s)\n",
- at_cn, LDBM_SUFFIX, 0 );
- return( NULL );
- }
+ switch( ftype ) {
+ case LDAP_FILTER_PRESENT:
+ if( IS_SLAP_INDEX( mask, SLAP_INDEX_PRESENT ) ) {
+ goto done;
+ }
+ break;
- realval = val;
- tmpval = NULL;
- if ( prefix != UNKNOWN_PREFIX ) {
- unsigned int len = strlen( val );
-
- if ( (len + 2) < sizeof(buf) ) {
- realval = buf;
- } else {
- /* value + prefix + null */
- tmpval = (char *) ch_malloc( len + 2 );
- realval = tmpval;
+ case LDAP_FILTER_APPROX:
+ if( IS_SLAP_INDEX( mask, SLAP_INDEX_APPROX ) ) {
+ goto done;
}
+ /* fall thru */
- realval[0] = prefix;
- strcpy( &realval[1], val );
- }
+ case LDAP_FILTER_EQUALITY:
+ if( IS_SLAP_INDEX( mask, SLAP_INDEX_EQUALITY ) ) {
+ goto done;
+ }
+ break;
- key.dptr = realval;
- key.dsize = strlen( realval ) + 1;
+ case LDAP_FILTER_SUBSTRINGS:
+ if( IS_SLAP_INDEX( mask, SLAP_INDEX_SUBSTR ) ) {
+ goto done;
+ }
+ break;
- idl = idl_fetch( be, db, key );
- if ( tmpval != NULL ) {
- free( tmpval );
+ default:
+ return LDAP_OTHER;
}
- ldbm_cache_close( be, db );
+ return LDAP_INAPPROPRIATE_MATCHING;
- Debug( LDAP_DEBUG_TRACE, "<= index_read %ld candidates\n",
- idl ? ID_BLOCK_NIDS(idl) : 0, 0, 0 );
- return( idl );
+done:
+ *dbnamep = dbname;
+ *maskp = mask;
+ return LDAP_SUCCESS;
}
-/* Add or remove stuff from index files */
-
-static int
-change_value(
- Backend *be,
- DBCache *db,
- char *type,
- int indextype,
- char *val,
- ID id,
- int (*idl_func)(Backend *, DBCache *, Datum, ID)
-)
+static int indexer(
+ Backend *be,
+ char *dbname,
+ struct berval *atname,
+ BerVarray vals,
+ ID id,
+ int op,
+ slap_mask_t mask )
{
- int rc;
- Datum key;
- char *tmpval = NULL;
- char *realval = val;
- char buf[BUFSIZ];
-
- char prefix = index2prefix( indextype );
-
- ldbm_datum_init( key );
-
- Debug( LDAP_DEBUG_TRACE,
- "=> change_value( \"%c%s\", op=%s )\n",
- prefix, val, (idl_func == idl_insert_key ? "ADD":"DELETE") );
-
- if ( prefix != UNKNOWN_PREFIX ) {
- unsigned int len = strlen( val );
-
- if ( (len + 2) < sizeof(buf) ) {
- realval = buf;
- } else {
- /* value + prefix + null */
- tmpval = (char *) ch_malloc( len + 2 );
- realval = tmpval;
- }
- realval[0] = prefix;
- strcpy( &realval[1], val );
- }
+ int rc, i;
+ const char *text;
+ DBCache *db;
+ AttributeDescription *ad = NULL;
+ struct berval *keys;
- key.dptr = realval;
- key.dsize = strlen( realval ) + 1;
-
- rc = idl_func( be, db, key, id );
-
- if ( tmpval != NULL ) {
- free( tmpval );
- }
+ assert( mask );
- ldap_pvt_thread_yield();
+ rc = slap_bv2ad( atname, &ad, &text );
- Debug( LDAP_DEBUG_TRACE, "<= change_value %d\n", rc, 0, 0 );
-
- return( rc );
-
-}/* static int change_value() */
-
-
-int
-index_change_values(
- Backend *be,
- char *type,
- struct berval **vals,
- ID id,
- unsigned int op
-)
-{
- char *val, *p, *code, *w;
- unsigned i, j, len;
- int indexmask, syntax;
- char buf[SUBLEN + 1];
- char vbuf[BUFSIZ];
- char *bigbuf;
- DBCache *db;
-
- int (*idl_funct)(Backend *,
- DBCache *,
- Datum, ID);
- char *at_cn; /* Attribute canonical name */
- int mode;
-
- if( vals == NULL ) {
- Debug( LDAP_DEBUG_TRACE,
- "=> index_change_values( %s, NULL, %ld, op=%s )\n",
- type, id, ((op == SLAP_INDEX_ADD_OP) ? "ADD" : "DELETE" ) );
- return 0;
- }
-
- Debug( LDAP_DEBUG_TRACE,
- "=> index_change_values( \"%s\", %ld, op=%s )\n",
- type, id, ((op == SLAP_INDEX_ADD_OP) ? "ADD" : "DELETE" ) );
+ if( rc != LDAP_SUCCESS ) return rc;
+ db = ldbm_cache_open( be, dbname, LDBM_SUFFIX, LDBM_WRCREAT );
- if (op == SLAP_INDEX_ADD_OP) {
-
- /* Add values */
-
- idl_funct = idl_insert_key;
- mode = LDBM_WRCREAT;
-
- } else {
-
- /* Delete values */
-
- idl_funct = idl_delete_key;
- mode = LDBM_WRITER;
-
- }
-
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
- attr_normalize(type);
-#endif
- attr_mask( be->be_private, type, &indexmask );
-
- if ( indexmask == 0 ) {
- return( 0 );
- }
-
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- at_cn = at_canonical_name( at_find( type ) );
+ if ( db == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( INDEX, ERR,
+ "index_read: Could not open db %s%s\n", dbname, LDBM_SUFFIX, 0 );
#else
- syntax = attr_syntax( type );
- at_cn = at_canonical_name( type );
+ Debug( LDAP_DEBUG_ANY,
+ "<= index_read NULL (could not open %s%s)\n",
+ dbname, LDBM_SUFFIX, 0 );
#endif
- if ( at_cn == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "<= index_change_values no canonical name for type \"%s\"\n",
- type != NULL ? type : "(NULL)", 0, 0 );
- return( -1 );
+ return LDAP_OTHER;
}
- if ( (db = ldbm_cache_open( be, at_cn, LDBM_SUFFIX, mode ))
- == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "<= index_change_values (couldn't open(%s%s),md=%s)\n",
- at_cn, LDBM_SUFFIX,
- ((mode==LDBM_WRCREAT)?"LDBM_WRCREAT":"LDBM_WRITER") );
- return( -1 );
+ if( IS_SLAP_INDEX( mask, SLAP_INDEX_PRESENT ) ) {
+ key_change( be, db, atname, id, op );
}
-
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- /* not yet implemented */
-#else
- for ( i = 0; vals[i] != NULL; i++ ) {
- /*
- * presence index entry
- */
- if ( indexmask & SLAP_INDEX_PRESENCE ) {
-
- change_value( be, db, at_cn, SLAP_INDEX_PRESENCE,
- "*", id, idl_funct );
-
+ if( IS_SLAP_INDEX( mask, SLAP_INDEX_EQUALITY ) ) {
+ rc = ad->ad_type->sat_equality->smr_indexer(
+ LDAP_FILTER_EQUALITY,
+ mask,
+ ad->ad_type->sat_syntax,
+ ad->ad_type->sat_equality,
+ atname, vals, &keys );
+
+ if( rc == LDAP_SUCCESS && keys != NULL ) {
+ for( i=0; keys[i].bv_val != NULL; i++ ) {
+ key_change( be, db, &keys[i], id, op );
+ }
+ ber_bvarray_free( keys );
}
+ }
- Debug( LDAP_DEBUG_TRACE,
- "index_change_values syntax 0x%x syntax bin 0x%x\n",
- syntax, SYNTAX_BIN, 0 );
-
- if ( syntax & SYNTAX_BIN ) {
-
- ldbm_cache_close( be, db );
- return( 0 );
-
+ if( IS_SLAP_INDEX( mask, SLAP_INDEX_APPROX ) ) {
+ rc = ad->ad_type->sat_approx->smr_indexer(
+ LDAP_FILTER_APPROX,
+ mask,
+ ad->ad_type->sat_syntax,
+ ad->ad_type->sat_approx,
+ atname, vals, &keys );
+
+ if( rc == LDAP_SUCCESS && keys != NULL ) {
+ for( i=0; keys[i].bv_val != NULL; i++ ) {
+ key_change( be, db, &keys[i], id, op );
+ }
+ ber_bvarray_free( keys );
}
+ }
- bigbuf = NULL;
- len = vals[i]->bv_len;
-
- /* value + null */
- if ( len + 2 > sizeof(vbuf) ) {
- bigbuf = (char *) ch_malloc( len + 1 );
- val = bigbuf;
- } else {
- val = vbuf;
+ if( IS_SLAP_INDEX( mask, SLAP_INDEX_SUBSTR ) ) {
+ rc = ad->ad_type->sat_substr->smr_indexer(
+ LDAP_FILTER_SUBSTRINGS,
+ mask,
+ ad->ad_type->sat_syntax,
+ ad->ad_type->sat_substr,
+ atname, vals, &keys );
+
+ if( rc == LDAP_SUCCESS && keys != NULL ) {
+ for( i=0; keys[i].bv_val != NULL; i++ ) {
+ key_change( be, db, &keys[i], id, op );
+ }
+ ber_bvarray_free( keys );
}
- (void) memcpy( val, vals[i]->bv_val, len );
- val[len] = '\0';
+ }
- value_normalize( val, syntax );
+ ldbm_cache_close( be, db );
+ return LDAP_SUCCESS;
+}
- /* value_normalize could change the length of val */
- len = strlen( val );
+static int index_at_values(
+ Backend *be,
+ AttributeType *type,
+ struct berval *tags,
+ BerVarray vals,
+ ID id,
+ int op )
+{
+ slap_mask_t mask = 0;
- /*
- * equality index entry
- */
- if ( indexmask & SLAP_INDEX_EQUALITY ) {
-
- change_value( be, db, at_cn, SLAP_INDEX_EQUALITY,
- val, id, idl_funct);
+ if( type->sat_sup ) {
+ /* recurse */
+ (void) index_at_values( be,
+ type->sat_sup, tags,
+ vals, id, op );
+ }
- }
+ /* 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 );
+ }
- /*
- * approximate index entry
- */
- if ( indexmask & SLAP_INDEX_APPROX ) {
- for ( w = first_word( val ); w != NULL;
- w = next_word( w ) ) {
- if ( (code = phonetic( w )) != NULL ) {
- change_value( be,
- db,
- at_cn,
- SLAP_INDEX_APPROX,
- code,
- id,
- idl_funct );
- free( code );
- }
- }
- }
+ if( mask ) {
+ indexer( be, type->sat_cname.bv_val,
+ &type->sat_cname,
+ vals, id, op,
+ mask );
+ }
- /*
- * substrings index entry
- */
- if ( indexmask & SLAP_INDEX_SUB ) {
- /* leading and trailing */
- if ( len > SUBLEN - 2 ) {
- buf[0] = '^';
- for ( j = 0; j < SUBLEN - 1; j++ ) {
- buf[j + 1] = val[j];
- }
- buf[SUBLEN] = '\0';
-
- change_value( be, db, at_cn, SLAP_INDEX_SUB,
- buf, id, idl_funct );
-
- p = val + len - SUBLEN + 1;
- for ( j = 0; j < SUBLEN - 1; j++ ) {
- buf[j] = p[j];
- }
- buf[SUBLEN - 1] = '$';
- buf[SUBLEN] = '\0';
-
- change_value( be, db, at_cn, SLAP_INDEX_SUB,
- buf, id, idl_funct );
- }
+ if( tags->bv_len ) {
+ AttributeDescription *desc;
- /* any */
- for ( p = val; p < (val + len - SUBLEN + 1); p++ ) {
- for ( j = 0; j < SUBLEN; j++ ) {
- buf[j] = p[j];
- }
- buf[SUBLEN] = '\0';
+ mask = 0;
- change_value( be, db, at_cn, SLAP_INDEX_SUB,
- buf, id, idl_funct );
- }
+ desc = ad_find_tags(type, tags);
+ if( desc ) {
+ attr_mask( be->be_private, desc, &mask );
}
- if ( bigbuf != NULL ) {
- free( bigbuf );
+ if( mask ) {
+ indexer( be, desc->ad_cname.bv_val, &desc->ad_cname,
+ vals, id, op,
+ mask );
}
}
-#endif
- ldbm_cache_close( be, db );
+ return LDAP_SUCCESS;
+}
+
+int index_values(
+ Backend *be,
+ AttributeDescription *desc,
+ BerVarray vals,
+ ID id,
+ int op )
+{
+ (void) index_at_values( be,
+ desc->ad_type, &desc->ad_tags,
+ vals, id, op );
- return( 0 );
+ return LDAP_SUCCESS;
}
-static int
-index2prefix( int indextype )
+int
+index_entry(
+ Backend *be,
+ int op,
+ Entry *e )
{
- int prefix;
+ 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, e->e_id );
+#else
+ Debug( LDAP_DEBUG_TRACE, "=> index_entry_%s( %ld, \"%s\" )\n",
+ op == SLAP_INDEX_ADD_OP ? "add" : "del",
+ e->e_id, e->e_dn );
+#endif
- switch ( indextype ) {
- case SLAP_INDEX_EQUALITY:
- prefix = EQ_PREFIX;
- break;
- case SLAP_INDEX_APPROX:
- prefix = APPROX_PREFIX;
- break;
- case SLAP_INDEX_SUB:
- prefix = SUB_PREFIX;
- break;
- default:
- prefix = UNKNOWN_PREFIX;
- break;
+ /* add each attribute to the indexes */
+ for ( ; ap != NULL; ap = ap->a_next ) {
+ index_values( be, ap->a_desc,
+ ap->a_nvals,
+ e->e_id, op );
}
- return( prefix );
+#ifdef NEW_LOGGING
+ 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",
+ e->e_id, e->e_dn );
+#endif
+
+ return LDAP_SUCCESS;
}
+
projects / openldap / blobdiff