--- servers/slapd/overlays/pcache.c 2004/12/03 15:49:23 1.41 +++ servers/slapd/overlays/pcache.c 2005/06/08 21:50:17 1.41.2.5 @@ -1,7 +1,7 @@ -/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/pcache.c,v 1.40 2004/11/26 23:57:38 hyc Exp $ */ +/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/pcache.c,v 1.54 2005/06/04 07:44:39 hyc Exp $ */ /* This work is part of OpenLDAP Software . * - * Copyright 2003-2004 The OpenLDAP Foundation. + * Copyright 2003-2005 The OpenLDAP Foundation. * Portions Copyright 2003 IBM Corporation. * Portions Copyright 2003 Symas Corporation. * All rights reserved. @@ -32,6 +32,8 @@ #include "lutil.h" #include "ldap_rq.h" +#include "config.h" + /* query cache structs */ /* query */ @@ -634,10 +636,12 @@ free_query (CachedQuery* qc) free(qc->q_uuid.bv_val); filter_free(q->filter); free (q->base.bv_val); - for (i=0; q->attrs[i].an_name.bv_val; i++) { - free(q->attrs[i].an_name.bv_val); + if ( q->attrs ) { + for (i=0; q->attrs[i].an_name.bv_val; i++) { + free(q->attrs[i].an_name.bv_val); + } + free(q->attrs); } - free(q->attrs); free(qc); } @@ -789,7 +793,11 @@ remove_query_data ( { struct query_info *qi, *qnext; char filter_str[64]; - AttributeAssertion ava; +#ifdef LDAP_COMP_MATCH + AttributeAssertion ava = { NULL, BER_BVNULL, NULL }; +#else + AttributeAssertion ava = { NULL, BER_BVNULL }; +#endif Filter filter = {LDAP_FILTER_EQUALITY}; SlapReply sreply = {REP_RESULT}; slap_callback cb = { NULL, remove_func, NULL, NULL }; @@ -846,6 +854,7 @@ remove_query_data ( vals[1].bv_val = NULL; vals[1].bv_len = 0; mod.sml_op = LDAP_MOD_DELETE; + mod.sml_flags = 0; mod.sml_desc = ad_queryid; mod.sml_type = ad_queryid->ad_cname; mod.sml_values = vals; @@ -978,8 +987,9 @@ filter2template( (*filter_attrs)[*filter_cnt].an_desc = ad; (*filter_attrs)[*filter_cnt].an_name = ad->ad_cname; - (*filter_attrs)[*filter_cnt+1].an_name.bv_val = NULL; - (*filter_attrs)[*filter_cnt+1].an_name.bv_len = 0; + (*filter_attrs)[*filter_cnt].an_oc = NULL; + (*filter_attrs)[*filter_cnt].an_oc_exclude = 0; + BER_BVZERO( &(*filter_attrs)[*filter_cnt+1].an_name ); (*filter_cnt)++; return 0; } @@ -1004,7 +1014,6 @@ cache_entries( slap_overinst *on = si->on; cache_manager *cm = on->on_bi.bi_private; query_manager* qm = cm->qm; - int i; int return_val = 0; Entry *e; struct berval crp_uuid; @@ -1160,10 +1169,11 @@ add_filter_attrs( *new_attrs = (AttributeName*)(op->o_tmpalloc((count+1)* sizeof(AttributeName), op->o_tmpmemctx)); if (attrs == NULL) { - (*new_attrs)[0].an_name.bv_val = "*"; - (*new_attrs)[0].an_name.bv_len = 1; - (*new_attrs)[1].an_name.bv_val = NULL; - (*new_attrs)[1].an_name.bv_len = 0; + BER_BVSTR( &(*new_attrs)[0].an_name, "*" ); + (*new_attrs)[0].an_desc = NULL; + (*new_attrs)[0].an_oc = NULL; + (*new_attrs)[0].an_oc_exclude = 0; + BER_BVZERO( &(*new_attrs)[1].an_name ); alluser = 1; allop = 0; } else { @@ -1171,8 +1181,7 @@ add_filter_attrs( (*new_attrs)[i].an_name = attrs[i].an_name; (*new_attrs)[i].an_desc = attrs[i].an_desc; } - (*new_attrs)[count].an_name.bv_val = NULL; - (*new_attrs)[count].an_name.bv_len = 0; + BER_BVZERO( &(*new_attrs)[count].an_name ); alluser = an_find(*new_attrs, &AllUser); allop = an_find(*new_attrs, &AllOper); } @@ -1189,9 +1198,10 @@ add_filter_attrs( (count+2)*sizeof(AttributeName), op->o_tmpmemctx)); (*new_attrs)[count].an_name = filter_attrs[i].an_name; (*new_attrs)[count].an_desc = filter_attrs[i].an_desc; + (*new_attrs)[count].an_oc = NULL; + (*new_attrs)[count].an_oc_exclude = 0; count++; - (*new_attrs)[count].an_name.bv_val = NULL; - (*new_attrs)[count].an_name.bv_len = 0; + BER_BVZERO( &(*new_attrs)[count].an_name ); } } @@ -1209,7 +1219,6 @@ proxy_cache_search( int i = -1; AttributeName *filter_attrs = NULL; - AttributeName *new_attrs = NULL; Query query; @@ -1306,15 +1315,18 @@ proxy_cache_search( for ( count = 0; !BER_BVISNULL( &op->ors_attrs[ count ].an_name ); count++ ) { ber_dupbv( &query.attrs[count].an_name, &op->ors_attrs[count].an_name ); query.attrs[count].an_desc = op->ors_attrs[count].an_desc; + query.attrs[count].an_oc = op->ors_attrs[count].an_oc; + query.attrs[count].an_oc_exclude = op->ors_attrs[count].an_oc_exclude; } if ( oc_attr_absent ) { query.attrs[ count ].an_desc = slap_schema.si_ad_objectClass; ber_dupbv( &query.attrs[count].an_name, &slap_schema.si_ad_objectClass->ad_cname ); + query.attrs[ count ].an_oc = NULL; + query.attrs[ count ].an_oc_exclude = 0; count++; } - query.attrs[ count ].an_name.bv_val = NULL; - query.attrs[ count ].an_name.bv_len = 0; + BER_BVZERO( &query.attrs[ count ].an_name ); } add_filter_attrs(op, &op->ors_attrs, query.attrs, filter_attrs); @@ -1480,67 +1492,296 @@ consistency_check( #define MAX_ATTR_SETS 500 -static void find_supersets( struct attr_set* attr_sets, int numsets ); -static int compare_sets( struct attr_set* setA, int, int ); + +/* + * compares two sets of attributes (indices i and j) + * returns 0: if neither set is contained in the other set + * 1: if set i is contained in set j + * 2: if set j is contained in set i + * 3: the sets are equivalent + */ static int -proxy_cache_config( - BackendDB *be, - const char *fname, - int lineno, - int argc, - char **argv -) +compare_sets(struct attr_set* set, int i, int j) { - slap_overinst *on = (slap_overinst *)be->bd_info; + int k,l,numI,numJ; + int common=0; + int result=0; + + if (( set[i].attrs == NULL ) && ( set[j].attrs == NULL )) + return 3; + + if ( set[i].attrs == NULL ) + return 2; + + if ( set[j].attrs == NULL ) + return 1; + + numI = set[i].count; + numJ = set[j].count; + + for ( l=0; l < numI; l++ ) { + for ( k = 0; k < numJ; k++ ) { + if ( strcmp( set[i].attrs[l].an_name.bv_val, + set[j].attrs[k].an_name.bv_val ) == 0 ) + common++; + } + } + + if ( common == numI ) + result = 1; + + if ( common == numJ ) + result += 2; + + return result; +} + +static void +find_supersets ( struct attr_set* attr_sets, int numsets ) +{ + int num[MAX_ATTR_SETS]; + int i, j, res; + int* id_array; + for ( i = 0; i < MAX_ATTR_SETS; i++ ) + num[i] = 0; + + for ( i = 0; i < numsets; i++ ) { + attr_sets[i].ID_array = (int*) ch_malloc( sizeof( int ) ); + attr_sets[i].ID_array[0] = -1; + } + + for ( i = 0; i < numsets; i++ ) { + for ( j=i+1; j < numsets; j++ ) { + res = compare_sets( attr_sets, i, j ); + switch ( res ) { + case 0: + break; + case 3: + case 1: + id_array = attr_sets[i].ID_array; + attr_sets[i].ID_array = (int *) ch_realloc( id_array, + ( num[i] + 2 ) * sizeof( int )); + attr_sets[i].ID_array[num[i]] = j; + attr_sets[i].ID_array[num[i]+1] = -1; + num[i]++; + if (res == 1) + break; + case 2: + id_array = attr_sets[j].ID_array; + attr_sets[j].ID_array = (int *) ch_realloc( id_array, + ( num[j] + 2 ) * sizeof( int )); + attr_sets[j].ID_array[num[j]] = i; + attr_sets[j].ID_array[num[j]+1] = -1; + num[j]++; + break; + } + } + } +} + +enum { + PC_MAIN = 1, + PC_ATTR, + PC_TEMP, + PC_RESP +}; + +static ConfigDriver pc_cf_gen; +static ConfigLDAPadd pc_ldadd; +static ConfigCfAdd pc_cfadd; + +static ConfigTable pccfg[] = { + { "proxycache", "backend> " + " ce_type != Cft_Overlay || !p->ce_bi || + p->ce_bi->bi_cf_ocs != pcocs ) + return LDAP_CONSTRAINT_VIOLATION; + + on = (slap_overinst *)p->ce_bi; + cm = on->on_bi.bi_private; + ca->be = &cm->db; + return LDAP_SUCCESS; +} + +static int +pc_cfadd( Operation *op, SlapReply *rs, Entry *p, ConfigArgs *ca ) +{ + CfEntryInfo *pe = p->e_private; + slap_overinst *on = (slap_overinst *)pe->ce_bi; + cache_manager *cm = on->on_bi.bi_private; + struct berval bv; + + /* FIXME: should not hardcode "olcDatabase" here */ + bv.bv_len = sprintf( ca->msg, "olcDatabase=%s", cm->db.bd_info->bi_type ); + bv.bv_val = ca->msg; + ca->be = &cm->db; + + /* We can only create this entry if the database is table-driven + */ + if ( cm->db.bd_info->bi_cf_ocs ) + config_build_entry( op, rs, pe, ca, &bv, cm->db.bd_info->bi_cf_ocs, + &pcocs[1] ); + + return 0; +} + +static int +pc_cf_gen( ConfigArgs *c ) +{ + slap_overinst *on = (slap_overinst *)c->bi; cache_manager* cm = on->on_bi.bi_private; query_manager* qm = cm->qm; QueryTemplate* temp; AttributeName* attr_name; AttributeName* attrarray; const char* text=NULL; - char *save_argv0 = NULL; + int i, num, rc = 0; + char *ptr; - int index, i; - int num; - int rc = 0; - - if ( strncasecmp( argv[0], "proxycache-", STRLENOF( "proxycache-" ) ) == 0 ) { - save_argv0 = argv[0]; - argv[0] += STRLENOF( "proxycache-" ); + if ( c->op == SLAP_CONFIG_EMIT ) { + struct berval bv; + switch( c->type ) { + case PC_MAIN: + bv.bv_len = sprintf( c->msg, "%s %d %d %d %d", + cm->db.bd_info->bi_type, cm->max_entries, cm->numattrsets, + cm->num_entries_limit, cm->cc_period ); + bv.bv_val = c->msg; + value_add_one( &c->rvalue_vals, &bv ); + break; + case PC_ATTR: + for (i=0; inumattrsets; i++) { + if ( !qm->attr_sets[i].count ) continue; + + bv.bv_len = sprintf( c->msg, "%d", i ); + + /* count the attr length */ + for ( attr_name = qm->attr_sets[i].attrs; + attr_name->an_name.bv_val; attr_name++ ) + bv.bv_len += attr_name->an_name.bv_len + 1; + + bv.bv_val = ch_malloc( bv.bv_len+1 ); + ptr = lutil_strcopy( bv.bv_val, c->msg ); + for ( attr_name = qm->attr_sets[i].attrs; + attr_name->an_name.bv_val; attr_name++ ) { + *ptr++ = ' '; + ptr = lutil_strcopy( ptr, attr_name->an_name.bv_val ); + } + ber_bvarray_add( &c->rvalue_vals, &bv ); + } + if ( !c->rvalue_vals ) + rc = 1; + break; + case PC_TEMP: + for (i=0; inumtemplates; i++) { + bv.bv_len = sprintf( c->msg, " %d %d", + qm->templates[i].attr_set_index, + qm->templates[i].ttl ); + bv.bv_len += qm->templates[i].querystr.bv_len + 2; + bv.bv_val = ch_malloc( bv.bv_len+1 ); + ptr = bv.bv_val; + *ptr++ = '"'; + ptr = lutil_strcopy( ptr, qm->templates[i].querystr.bv_val ); + *ptr++ = '"'; + strcpy( ptr, c->msg ); + ber_bvarray_add( &c->rvalue_vals, &bv ); + } + if ( !c->rvalue_vals ) + rc = 1; + break; + case PC_RESP: + if ( cm->response_cb == PCACHE_RESPONSE_CB_HEAD ) { + bv.bv_val = "head"; + bv.bv_len = STRLENOF("head"); + } else { + bv.bv_val = "tail"; + bv.bv_len = STRLENOF("tail"); + } + value_add_one( &c->rvalue_vals, &bv ); + break; + } + return rc; + } else if ( c->op == LDAP_MOD_DELETE ) { + return 1; /* FIXME */ +#if 0 + switch( c->type ) { + case PC_ATTR: + case PC_TEMP: + } + return rc; +#endif } - if ( strcasecmp( argv[0], "proxycache" ) == 0 ) { - if ( argc < 6 ) { - fprintf( stderr, "%s: line %d: missing arguments in \"proxycache" - " " - "\"\n", fname, lineno ); + switch( c->type ) { + case PC_MAIN: + cm->numattrsets = atoi( c->argv[3] ); + if ( cm->numattrsets > MAX_ATTR_SETS ) { + sprintf( c->msg, "numattrsets must be <= %d", MAX_ATTR_SETS ); + Debug( LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->msg, 0 ); return( 1 ); } - - cm->db.bd_info = backend_info( argv[1] ); + cm->db.bd_info = backend_info( c->argv[1] ); if ( !cm->db.bd_info ) { - fprintf( stderr, "%s: line %d: backend %s unknown\n", - fname, lineno, argv[1] ); + sprintf( c->msg, "unknown backend type" ); + Debug( LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->msg, 0 ); + return( 1 ); + } + if ( cm->db.bd_info->bi_db_init( &cm->db ) ) { + sprintf( c->msg, "backend %s init failed", c->argv[1] ); + Debug( LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->msg, 0 ); return( 1 ); } - if ( cm->db.bd_info->bi_db_init( &cm->db ) ) return( 1 ); /* This type is in use, needs to be opened */ cm->db.bd_info->bi_nDB++; - cm->max_entries = atoi( argv[2] ); + cm->max_entries = atoi( c->argv[2] ); - cm->numattrsets = atoi( argv[3] ); - if ( cm->numattrsets > MAX_ATTR_SETS ) { - fprintf( stderr, "%s: line %d: numattrsets must be <= %d\n", - fname, lineno, MAX_ATTR_SETS ); - return( 1 ); - } - - cm->num_entries_limit = atoi( argv[4] ); - cm->cc_period = atoi( argv[5] ); - Debug( LDAP_DEBUG_ANY, + cm->num_entries_limit = atoi( c->argv[4] ); + cm->cc_period = atoi( c->argv[5] ); + Debug( LDAP_DEBUG_TRACE, "Total # of attribute sets to be cached = %d\n", cm->numattrsets, 0, 0 ); qm->attr_sets = ( struct attr_set * )ch_malloc( cm->numattrsets * @@ -1548,50 +1789,42 @@ proxy_cache_config( for ( i = 0; i < cm->numattrsets; i++ ) { qm->attr_sets[i].attrs = NULL; } - - } else if ( strcasecmp( argv[0], "proxyattrset" ) == 0 ) { - if ( argc < 3 ) { - fprintf( stderr, "%s: line %d: missing arguments in \"proxyattrset " - " \"\n", fname, lineno ); - return( 1 ); - } - Debug( LDAP_DEBUG_ANY, "Attribute Set # %d\n", - atoi( argv[1] ), 0, 0 ); - if (atoi(argv[1]) >= cm->numattrsets) { - fprintf( stderr, "%s; line %d index out of bounds \n", - fname, lineno ); + break; + case PC_ATTR: + num = atoi( c->argv[1] ); + if (num >= cm->numattrsets) { + sprintf( c->msg, "attrset index out of bounds" ); + Debug( LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->msg, 0 ); return 1; } - index = atoi( argv[1] ); - if ( argv[2] && strcmp( argv[2], "*" ) ) { - qm->attr_sets[index].count = argc - 2; - qm->attr_sets[index].attrs = (AttributeName*)ch_malloc( - (argc-1) * sizeof( AttributeName )); - attr_name = qm->attr_sets[index].attrs; - for ( i = 2; i < argc; i++ ) { - Debug( LDAP_DEBUG_ANY, "\t %s\n", - argv[i], 0, 0 ); - ber_str2bv( argv[i], 0, 1, - &attr_name->an_name); + if ( c->argv[2] && strcmp( c->argv[2], "*" ) ) { + qm->attr_sets[num].count = c->argc - 2; + qm->attr_sets[num].attrs = (AttributeName*)ch_malloc( + (c->argc-1) * sizeof( AttributeName )); + attr_name = qm->attr_sets[num].attrs; + for ( i = 2; i < c->argc; i++ ) { + ber_str2bv( c->argv[i], 0, 1, &attr_name->an_name); attr_name->an_desc = NULL; - slap_bv2ad( &attr_name->an_name, - &attr_name->an_desc, &text ); + if ( slap_bv2ad( &attr_name->an_name, + &attr_name->an_desc, &text )) { + strcpy( c->msg, text ); + Debug( LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->msg, 0 ); + ch_free( qm->attr_sets[num].attrs ); + qm->attr_sets[num].attrs = NULL; + qm->attr_sets[num].count = 0; + return 1; + } + attr_name->an_oc = NULL; + attr_name->an_oc_exclude = 0; attr_name++; - attr_name->an_name.bv_val = NULL; - attr_name->an_name.bv_len = 0; + BER_BVZERO( &attr_name->an_name ); } } - } else if ( strcasecmp( argv[0], "proxytemplate" ) == 0 ) { - if ( argc != 4 ) { - fprintf( stderr, "%s: line %d: missing argument(s) in " - "\"proxytemplate \" line\n", - fname, lineno ); - return( 1 ); - } - if (( i = atoi( argv[2] )) >= cm->numattrsets ) { - Debug( LDAP_DEBUG_ANY, - "%s: line %d, template index invalid\n", - fname, lineno, 0 ); + break; + case PC_TEMP: + if (( i = atoi( c->argv[2] )) >= cm->numattrsets ) { + sprintf( c->msg, "template index invalid" ); + Debug( LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->msg, 0 ); return 1; } num = cm->numtemplates; @@ -1602,65 +1835,58 @@ proxy_cache_config( temp = qm->templates + num; ldap_pvt_thread_rdwr_init( &temp->t_rwlock ); temp->query = temp->query_last = NULL; - temp->ttl = atoi( argv[3] ); + temp->ttl = atoi( c->argv[3] ); temp->no_of_queries = 0; - if ( argv[1] == NULL ) { - Debug( LDAP_DEBUG_ANY, - "Templates string not specified " - "for template %d\n", num, 0, 0 ); - return 1; - } - ber_str2bv( argv[1], 0, 1, &temp->querystr ); - Debug( LDAP_DEBUG_ANY, "Template:\n", 0, 0, 0 ); - Debug( LDAP_DEBUG_ANY, " query template: %s\n", + + ber_str2bv( c->argv[1], 0, 1, &temp->querystr ); + Debug( LDAP_DEBUG_TRACE, "Template:\n", 0, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, " query template: %s\n", temp->querystr.bv_val, 0, 0 ); temp->attr_set_index = i; - Debug( LDAP_DEBUG_ANY, " attributes: \n", 0, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, " attributes: \n", 0, 0, 0 ); if ( ( attrarray = qm->attr_sets[i].attrs ) != NULL ) { for ( i=0; attrarray[i].an_name.bv_val; i++ ) - Debug( LDAP_DEBUG_ANY, "\t%s\n", + Debug( LDAP_DEBUG_TRACE, "\t%s\n", attrarray[i].an_name.bv_val, 0, 0 ); } temp++; temp->querystr.bv_val = NULL; cm->numtemplates++; - - } else if ( strcasecmp( argv[0], "response-callback" ) == 0 ) { - /* set to "tail" to put the response callback - * at the end of the callback list; this is required - * in case other overlays are present, so that the - * final entry is cached. */ - - if ( argc < 2 ) { - Debug( LDAP_DEBUG_ANY, - "missing specifier for \"response-callback {head(default)|tail}\" " - "callback position\n", 0, 0, 0 ); - return 1; - } - - if ( strcasecmp( argv[1], "head" ) == 0 ) { + break; + case PC_RESP: + if ( strcasecmp( c->argv[1], "head" ) == 0 ) { cm->response_cb = PCACHE_RESPONSE_CB_HEAD; - } else if ( strcasecmp( argv[1], "tail" ) == 0 ) { + } else if ( strcasecmp( c->argv[1], "tail" ) == 0 ) { cm->response_cb = PCACHE_RESPONSE_CB_TAIL; } else { - Debug( LDAP_DEBUG_ANY, - "unknown specifier %s for \"response-callback {head(default)|tail}\" " - "callback position\n", argv[1], 0, 0 ); + sprintf( c->msg, "unknown specifier" ); + Debug( LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->msg, 0 ); return 1; } + break; } - /* anything else */ - else { - rc = cm->db.bd_info->bi_db_config( &cm->db, fname, lineno, argc, argv ); - } + return rc; +} - if ( save_argv0 ) { - argv[0] = save_argv0; - } +static int +proxy_cache_config( + BackendDB *be, + const char *fname, + int lineno, + int argc, + char **argv +) +{ + slap_overinst *on = (slap_overinst *)be->bd_info; + cache_manager* cm = on->on_bi.bi_private; - return rc; + /* Something for the cache database? */ + if ( cm->db.bd_info && cm->db.bd_info->bi_db_config ) + return cm->db.bd_info->bi_db_config( &cm->db, fname, lineno, + argc, argv ); + return SLAP_CONF_UNKNOWN; } static int @@ -1716,17 +1942,6 @@ proxy_cache_open( slap_overinst *on = (slap_overinst *)be->bd_info; cache_manager *cm = on->on_bi.bi_private; int rc = 0; - int i; - - /* consistency check (add more...) */ - for ( i = 0; i < cm->numattrsets; i++ ) { - if ( cm->qm->attr_sets[i].attrs == NULL ) { - fprintf( stderr, "proxy_cache_open(): " - "attr set %d (of %d) missing\n", - i, cm->numattrsets ); - return 1; - } - } /* need to inherit something from the original database... */ cm->db.be_def_limit = be->be_def_limit; @@ -1740,19 +1955,20 @@ proxy_cache_open( if ( slapMode & SLAP_SERVER_MODE ) { ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex ); ldap_pvt_runqueue_insert( &slapd_rq, cm->cc_period, - consistency_check, on ); + consistency_check, on, + "pcache_consistency", be->be_suffix[0].bv_val ); ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex ); /* Cached database must have the rootdn */ if ( BER_BVISNULL( &cm->db.be_rootndn ) || BER_BVISEMPTY( &cm->db.be_rootndn ) ) { - fprintf( stderr, "proxy_cache_open(): " + Debug( LDAP_DEBUG_ANY, "proxy_cache_open(): " "underlying database of type \"%s\"\n" " serving naming context \"%s\"\n" " has no \"rootdn\", required by \"proxycache\".\n", on->on_info->oi_orig->bi_type, - cm->db.be_suffix[0].bv_val ); + cm->db.be_suffix[0].bv_val, 0 ); return 1; } } @@ -1823,93 +2039,6 @@ proxy_cache_destroy( return rc; } -static void -find_supersets ( struct attr_set* attr_sets, int numsets ) -{ - int num[MAX_ATTR_SETS]; - int i, j, res; - int* id_array; - for ( i = 0; i < MAX_ATTR_SETS; i++ ) - num[i] = 0; - - for ( i = 0; i < numsets; i++ ) { - attr_sets[i].ID_array = (int*) ch_malloc( sizeof( int ) ); - attr_sets[i].ID_array[0] = -1; - } - - for ( i = 0; i < numsets; i++ ) { - for ( j=i+1; j < numsets; j++ ) { - res = compare_sets( attr_sets, i, j ); - switch ( res ) { - case 0: - break; - case 3: - case 1: - id_array = attr_sets[i].ID_array; - attr_sets[i].ID_array = (int *) ch_realloc( id_array, - ( num[i] + 2 ) * sizeof( int )); - attr_sets[i].ID_array[num[i]] = j; - attr_sets[i].ID_array[num[i]+1] = -1; - num[i]++; - if (res == 1) - break; - case 2: - id_array = attr_sets[j].ID_array; - attr_sets[j].ID_array = (int *) ch_realloc( id_array, - ( num[j] + 2 ) * sizeof( int )); - attr_sets[j].ID_array[num[j]] = i; - attr_sets[j].ID_array[num[j]+1] = -1; - num[j]++; - break; - } - } - } -} - -/* - * compares two sets of attributes (indices i and j) - * returns 0: if neither set is contained in the other set - * 1: if set i is contained in set j - * 2: if set j is contained in set i - * 3: the sets are equivalent - */ - -static int -compare_sets(struct attr_set* set, int i, int j) -{ - int k,l,numI,numJ; - int common=0; - int result=0; - - if (( set[i].attrs == NULL ) && ( set[j].attrs == NULL )) - return 3; - - if ( set[i].attrs == NULL ) - return 2; - - if ( set[j].attrs == NULL ) - return 1; - - numI = set[i].count; - numJ = set[j].count; - - for ( l=0; l < numI; l++ ) { - for ( k = 0; k < numJ; k++ ) { - if ( strcmp( set[i].attrs[l].an_name.bv_val, - set[j].attrs[k].an_name.bv_val ) == 0 ) - common++; - } - } - - if ( common == numI ) - result = 1; - - if ( common == numJ ) - result += 2; - - return result; -} - static slap_overinst proxy_cache; int pcache_init() @@ -1921,22 +2050,24 @@ int pcache_init() at = ldap_str2attributetype( queryid_schema, &code, &err, LDAP_SCHEMA_ALLOW_ALL ); if ( !at ) { - fprintf( stderr, "AttributeType Load failed %s %s\n", - ldap_scherr2str(code), err ); + Debug( LDAP_DEBUG_ANY, + "pcache_init: ldap_str2attributetype failed %s %s\n", + ldap_scherr2str(code), err, 0 ); return code; } - code = at_add( at, &err ); + code = at_add( at, 0, NULL, &err ); if ( !code ) { slap_str2ad( at->at_names[0], &ad_queryid, &err ); } ldap_memfree( at ); if ( code ) { - fprintf( stderr, "AttributeType Load failed %s %s\n", - scherr2str(code), err ); + Debug( LDAP_DEBUG_ANY, + "pcache_init: at_add failed %s %s\n", + scherr2str(code), err, 0 ); return code; } - proxy_cache.on_bi.bi_type = "proxycache"; + proxy_cache.on_bi.bi_type = "pcache"; proxy_cache.on_bi.bi_db_init = proxy_cache_init; proxy_cache.on_bi.bi_db_config = proxy_cache_config; proxy_cache.on_bi.bi_db_open = proxy_cache_open; @@ -1944,6 +2075,11 @@ int pcache_init() proxy_cache.on_bi.bi_db_destroy = proxy_cache_destroy; proxy_cache.on_bi.bi_op_search = proxy_cache_search; + proxy_cache.on_bi.bi_cf_ocs = pcocs; + + code = config_register_schema( pccfg, pcocs ); + if ( code ) return code; + return overlay_register( &proxy_cache ); }