--- servers/slapd/overlays/pcache.c 2008/02/11 23:24:25 1.41.2.23 +++ servers/slapd/overlays/pcache.c 2005/01/01 19:49:58 1.42 @@ -1,7 +1,7 @@ -/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/pcache.c,v 1.41.2.22 2007/10/23 23:26:19 hyc Exp $ */ +/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/pcache.c,v 1.41 2004/12/03 15:49:23 hyc Exp $ */ /* This work is part of OpenLDAP Software . * - * Copyright 2003-2008 The OpenLDAP Foundation. + * Copyright 2003-2005 The OpenLDAP Foundation. * Portions Copyright 2003 IBM Corporation. * Portions Copyright 2003 Symas Corporation. * All rights reserved. @@ -32,8 +32,6 @@ #include "lutil.h" #include "ldap_rq.h" -#include "config.h" - /* query cache structs */ /* query */ @@ -68,22 +66,19 @@ typedef struct query_template_s { CachedQuery* query_last; /* oldest query cached for the template */ int no_of_queries; /* Total number of queries in the template */ - time_t ttl; /* TTL for the queries of this template */ - time_t negttl; /* TTL for negative results */ + long ttl; /* TTL for the queries of this template */ ldap_pvt_thread_rdwr_t t_rwlock; /* Rd/wr lock for accessing queries in the template */ } QueryTemplate; /* - * Represents a set of projected attributes. + * Represents a set of projected attributes and any + * supersets among all specified sets of attributes. */ struct attr_set { - unsigned flags; -#define PC_CONFIGURED (0x1) -#define PC_REFERENCED (0x2) -#define PC_GOT_OC (0x4) AttributeName* attrs; /* specifies the set */ int count; /* number of attributes */ + int* ID_array; /* array of indices of supersets of 'attrs' */ }; struct query_manager_s; @@ -91,7 +86,7 @@ struct query_manager_s; /* prototypes for functions for 1) query containment * 2) query addition, 3) cache replacement */ -typedef CachedQuery * (QCfunc)(Operation *op, struct query_manager_s*, Query*, int ); +typedef int (QCfunc)(struct query_manager_s*, Query*, int ); typedef void (AddQueryfunc)(struct query_manager_s*, Query*, int, struct berval*); typedef void (CRfunc)(struct query_manager_s*, struct berval * ); @@ -127,17 +122,16 @@ typedef struct cache_manager_s { #define PCACHE_RESPONSE_CB_HEAD 0 #define PCACHE_RESPONSE_CB_TAIL 1 - time_t cc_period; /* interval between successive consistency checks (sec) */ + int cc_period; /* interval between successive consistency checks (sec) */ int cc_paused; void *cc_arg; ldap_pvt_thread_mutex_t cache_mutex; + ldap_pvt_thread_mutex_t remove_mutex; query_manager* qm; /* query cache managed by the cache manager */ } cache_manager; -static int pcache_debug; - static AttributeDescription *ad_queryid; static char *queryid_schema = "( 1.3.6.1.4.1.4203.666.1.12 NAME 'queryid' " "DESC 'list of queries the entry belongs to' " @@ -190,7 +184,7 @@ merge_entry( op->o_tag = LDAP_REQ_MODIFY; op->orm_modlist = modlist; op->o_bd->be_modify( op, &sreply ); - slap_mods_free( modlist, 1 ); + slap_mods_free( modlist ); } else if ( rc == LDAP_REFERRAL || rc == LDAP_NO_SUCH_OBJECT ) { syncrepl_add_glue( op, e ); @@ -265,7 +259,7 @@ add_query_on_top (query_manager* qm, Cac qc->lru_down = top; qc->lru_up = NULL; - Debug( pcache_debug, "Base of added query = %s\n", + Debug( LDAP_DEBUG_ANY, "Base of added query = %s\n", q->base.bv_val, 0, 0 ); } @@ -298,59 +292,69 @@ remove_query (query_manager* qm, CachedQ qc->lru_up = qc->lru_down = NULL; } +static void +invert_string( struct berval *bv ) +{ + int i; + char c; + + for (i=0; ibv_len/2; i++) { + c = bv->bv_val[i]; + bv->bv_val[i] = bv->bv_val[bv->bv_len-i-1]; + bv->bv_val[bv->bv_len-i-1] = c; + } +} + /* find and remove string2 from string1 * from start if position = 1, * from end if position = 3, * from anywhere if position = 2 - * string1 is overwritten if position = 2. */ static int find_and_remove(struct berval* ber1, struct berval* ber2, int position) { + char* temp; + int len; int ret=0; - if ( !ber2->bv_val ) + char* arg1, *arg2; + char* string1=ber1->bv_val; + char* string2=ber2->bv_val; + + if (string2 == NULL) return 1; - if ( !ber1->bv_val ) + if (string1 == NULL) return 0; - switch( position ) { - case 1: - if ( ber1->bv_len >= ber2->bv_len && !memcmp( ber1->bv_val, - ber2->bv_val, ber2->bv_len )) { - ret = 1; - ber1->bv_val += ber2->bv_len; - ber1->bv_len -= ber2->bv_len; - } - break; - case 2: { - char *temp; - ber1->bv_val[ber1->bv_len] = '\0'; - temp = strstr( ber1->bv_val, ber2->bv_val ); - if ( temp ) { - strcpy( temp, temp+ber2->bv_len ); - ber1->bv_len -= ber2->bv_len; - ret = 1; - } - break; - } - case 3: - if ( ber1->bv_len >= ber2->bv_len && - !memcmp( ber1->bv_val+ber1->bv_len-ber2->bv_len, ber2->bv_val, - ber2->bv_len )) { - ret = 1; - ber1->bv_len -= ber2->bv_len; - } - break; + if (position == 3) { + invert_string(ber1); + invert_string(ber2); + } + + arg1 = string1; + arg2 = string2; + + temp = strstr(arg1, arg2); + + len = ber2->bv_len; + + if ( temp && (position == 2 || temp == arg1) ) { + string1 = temp+len; + strcpy( arg1, string1 ); + ber1->bv_len -= len; + ret = 1; + } + if ( position == 3 ) { + invert_string(ber1); + invert_string(ber2); } return ret; } static struct berval* -merge_init_final(Operation *op, struct berval* init, struct berval* any, - struct berval* final) +merge_init_final(struct berval* init, struct berval* any, struct berval* final) { struct berval* merged, *temp; int i, any_count, count; @@ -365,30 +369,25 @@ merge_init_final(Operation *op, struct b if (final->bv_val) count++; - merged = (struct berval*)op->o_tmpalloc( (count+1)*sizeof(struct berval), - op->o_tmpmemctx ); + merged = (struct berval*)(ch_malloc((count+1)*sizeof(struct berval))); temp = merged; if (init->bv_val) { - ber_dupbv_x( temp, init, op->o_tmpmemctx ); - temp++; + *temp++ = *init; } for (i=0; io_tmpmemctx ); - temp++; any++; + *temp++ = *any++; } if (final->bv_val){ - ber_dupbv_x( temp, final, op->o_tmpmemctx ); - temp++; + *temp++ = *final; } - BER_BVZERO( temp ); + temp->bv_val = NULL; + temp->bv_len = 0; return merged; } -/* Each element in stored must be found in incoming. Incoming is overwritten. - */ static int strings_containment(struct berval* stored, struct berval* incoming) { @@ -415,20 +414,39 @@ strings_containment(struct berval* store } static int -substr_containment_substr(Operation *op, Filter* stored, Filter* incoming) +substr_containment_substr(Filter* stored, Filter* incoming) { + int i; int rc = 0; + int any_count = 0; struct berval init_incoming; struct berval final_incoming; + struct berval *any_incoming = NULL; struct berval *remaining_incoming = NULL; if ((!(incoming->f_sub_initial.bv_val) && (stored->f_sub_initial.bv_val)) || (!(incoming->f_sub_final.bv_val) && (stored->f_sub_final.bv_val))) return 0; - init_incoming = incoming->f_sub_initial; - final_incoming = incoming->f_sub_final; + + ber_dupbv(&init_incoming, &(incoming->f_sub_initial)); + ber_dupbv(&final_incoming, &(incoming->f_sub_final)); + + if (incoming->f_sub_any) { + for ( any_count=0; incoming->f_sub_any[any_count].bv_val != NULL; + any_count++ ) + ; + + any_incoming = (struct berval*)ch_malloc((any_count+1) * + sizeof(struct berval)); + + for (i=0; if_sub_any[i])); + } + any_incoming[any_count].bv_val = NULL; + any_incoming[any_count].bv_len = 0; + } if (find_and_remove(&init_incoming, &(stored->f_sub_initial), 1) && find_and_remove(&final_incoming, @@ -438,44 +456,48 @@ substr_containment_substr(Operation *op, rc = 1; goto final; } - remaining_incoming = merge_init_final(op, &init_incoming, - incoming->f_sub_any, &final_incoming); + remaining_incoming = merge_init_final(&init_incoming, + any_incoming, &final_incoming); rc = strings_containment(stored->f_sub_any, remaining_incoming); - ber_bvarray_free_x( remaining_incoming, op->o_tmpmemctx ); } final: + free(init_incoming.bv_val); + free(final_incoming.bv_val); + if (any_incoming) ber_bvarray_free( any_incoming ); + free(remaining_incoming); + return rc; } static int -substr_containment_equality(Operation *op, Filter* stored, Filter* incoming) +substr_containment_equality(Filter* stored, Filter* incoming) { struct berval incoming_val[2]; int rc = 0; - incoming_val[1] = incoming->f_av_value; + ber_dupbv(incoming_val, &(incoming->f_av_value)); + incoming_val[1].bv_val = NULL; + incoming_val[1].bv_len = 0; - if (find_and_remove(incoming_val+1, - &(stored->f_sub_initial), 1) && find_and_remove(incoming_val+1, + if (find_and_remove(incoming_val, + &(stored->f_sub_initial), 1) && find_and_remove(incoming_val, &(stored->f_sub_final), 3)) { if (stored->f_sub_any == NULL){ rc = 1; goto final; } - ber_dupbv_x( incoming_val, incoming_val+1, op->o_tmpmemctx ); - BER_BVZERO( incoming_val+1 ); rc = strings_containment(stored->f_sub_any, incoming_val); - op->o_tmpfree( incoming_val[0].bv_val, op->o_tmpmemctx ); } final: + free(incoming_val[0].bv_val); return rc; } /* check whether query is contained in any of * the cached queries in template template_index */ -static CachedQuery * -query_containment(Operation *op, query_manager *qm, +static int +query_containment(query_manager *qm, Query *query, int template_index) { @@ -493,7 +515,7 @@ query_containment(Operation *op, query_m MatchingRule* mrule = NULL; if (inputf != NULL) { - Debug( pcache_debug, "Lock QC index = %d\n", + Debug( LDAP_DEBUG_ANY, "Lock QC index = %d\n", template_index, 0, 0 ); ldap_pvt_thread_rdwr_rlock(&(templa[template_index].t_rwlock)); for(qc=templa[template_index].query; qc != NULL; qc= qc->next) { @@ -524,10 +546,10 @@ query_containment(Operation *op, query_m &(fs->f_ava->aa_value), &text); if (rc != LDAP_SUCCESS) { ldap_pvt_thread_rdwr_runlock(&(templa[template_index].t_rwlock)); - Debug( pcache_debug, + Debug( LDAP_DEBUG_ANY, "Unlock: Exiting QC index=%d\n", template_index, 0, 0 ); - return NULL; + return 0; } } switch (fs->f_choice) { @@ -541,13 +563,13 @@ query_containment(Operation *op, query_m /* check if the equality query can be * answered with cached substring query */ if ((fi->f_choice == LDAP_FILTER_EQUALITY) - && substr_containment_equality( op, + && substr_containment_equality( fs, fi)) res=1; /* check if the substring query can be * answered with cached substring query */ if ((fi->f_choice ==LDAP_FILTER_SUBSTRINGS - ) && substr_containment_substr( op, + ) && substr_containment_substr( fs, fi)) res= 1; fs=fs->f_next; @@ -591,26 +613,30 @@ query_containment(Operation *op, query_m add_query_on_top(qm, qc); } ldap_pvt_thread_mutex_unlock(&qm->lru_mutex); - return qc; + return 1; } } } - Debug( pcache_debug, + Debug( LDAP_DEBUG_ANY, "Not answerable: Unlock QC index=%d\n", template_index, 0, 0 ); ldap_pvt_thread_rdwr_runlock(&(templa[template_index].t_rwlock)); } - return NULL; + return 0; } static void free_query (CachedQuery* qc) { Query* q = (Query*)qc; + int i; 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); + } free(q->attrs); free(qc); } @@ -627,16 +653,11 @@ static void add_query( QueryTemplate* templ = (qm->templates)+template_index; Query* new_query; new_cached_query->template_id = template_index; - if ( uuid ) { - new_cached_query->q_uuid = *uuid; - new_cached_query->expiry_time = slap_get_time() + templ->ttl; - } else { - BER_BVZERO( &new_cached_query->q_uuid ); - new_cached_query->expiry_time = slap_get_time() + templ->negttl; - } + new_cached_query->q_uuid = *uuid; new_cached_query->lru_up = NULL; new_cached_query->lru_down = NULL; - Debug( pcache_debug, "Added query expires at %ld\n", + new_cached_query->expiry_time = slap_get_time() + templ->ttl; + Debug( LDAP_DEBUG_ANY, "Added query expires at %ld\n", (long) new_cached_query->expiry_time, 0, 0 ); new_query = (Query*)new_cached_query; @@ -646,7 +667,7 @@ static void add_query( new_query->attrs = query->attrs; /* Adding a query */ - Debug( pcache_debug, "Lock AQ index = %d\n", + Debug( LDAP_DEBUG_ANY, "Lock AQ index = %d\n", template_index, 0, 0 ); ldap_pvt_thread_rdwr_wlock(&templ->t_rwlock); if (templ->query == NULL) @@ -657,10 +678,10 @@ static void add_query( new_cached_query->prev = NULL; templ->query = new_cached_query; templ->no_of_queries++; - Debug( pcache_debug, "TEMPLATE %d QUERIES++ %d\n", + Debug( LDAP_DEBUG_ANY, "TEMPLATE %d QUERIES++ %d\n", template_index, templ->no_of_queries, 0 ); - Debug( pcache_debug, "Unlock AQ index = %d \n", + Debug( LDAP_DEBUG_ANY, "Unlock AQ index = %d \n", template_index, 0, 0 ); ldap_pvt_thread_rdwr_wunlock(&templ->t_rwlock); @@ -702,10 +723,9 @@ static void cache_replacement(query_mana result->bv_len = 0; if (!bottom) { - Debug ( pcache_debug, + Debug ( LDAP_DEBUG_ANY, "Cache replacement invoked without " "any query in LRU list\n", 0, 0, 0 ); - ldap_pvt_thread_mutex_unlock(&qm->lru_mutex); return; } @@ -716,12 +736,12 @@ static void cache_replacement(query_mana *result = bottom->q_uuid; bottom->q_uuid.bv_val = NULL; - Debug( pcache_debug, "Lock CR index = %d\n", temp_id, 0, 0 ); + Debug( LDAP_DEBUG_ANY, "Lock CR index = %d\n", temp_id, 0, 0 ); ldap_pvt_thread_rdwr_wlock(&(qm->templates[temp_id].t_rwlock)); remove_from_template(bottom, (qm->templates+temp_id)); - Debug( pcache_debug, "TEMPLATE %d QUERIES-- %d\n", + Debug( LDAP_DEBUG_ANY, "TEMPLATE %d QUERIES-- %d\n", temp_id, qm->templates[temp_id].no_of_queries, 0 ); - Debug( pcache_debug, "Unlock CR index = %d\n", temp_id, 0, 0 ); + Debug( LDAP_DEBUG_ANY, "Unlock CR index = %d\n", temp_id, 0, 0 ); ldap_pvt_thread_rdwr_wunlock(&(qm->templates[temp_id].t_rwlock)); free_query(bottom); } @@ -769,11 +789,7 @@ remove_query_data ( { struct query_info *qi, *qnext; char filter_str[64]; -#ifdef LDAP_COMP_MATCH - AttributeAssertion ava = { NULL, BER_BVNULL, NULL }; -#else - AttributeAssertion ava = { NULL, BER_BVNULL }; -#endif + AttributeAssertion ava; Filter filter = {LDAP_FILTER_EQUALITY}; SlapReply sreply = {REP_RESULT}; slap_callback cb = { NULL, remove_func, NULL, NULL }; @@ -814,7 +830,7 @@ remove_query_data ( op->o_req_ndn = qi->xdn; if ( qi->del) { - Debug( pcache_debug, "DELETING ENTRY TEMPLATE=%s\n", + Debug( LDAP_DEBUG_ANY, "DELETING ENTRY TEMPLATE=%s\n", query_uuid->bv_val, 0, 0 ); op->o_tag = LDAP_REQ_DELETE; @@ -830,13 +846,12 @@ 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; mod.sml_nvalues = NULL; mod.sml_next = NULL; - Debug( pcache_debug, + Debug( LDAP_DEBUG_ANY, "REMOVING TEMP ATTR : TEMPLATE=%s\n", query_uuid->bv_val, 0, 0 ); @@ -858,13 +873,41 @@ get_attr_set( ); static int +attrscmp( + AttributeName* attrs_in, + AttributeName* attrs +); + +static int +is_temp_answerable( + int attr_set, + struct berval* tempstr, + query_manager* qm, + int template_id ) +{ + QueryTemplate *qt = qm->templates + template_id; + + if (attr_set != qt->attr_set_index) { + int* id_array = qm->attr_sets[attr_set].ID_array; + + while (*id_array != -1) { + if (*id_array == qt->attr_set_index) + break; + id_array++; + } + if (*id_array == -1) + return 0; + } + return (qt->querystr.bv_len == tempstr->bv_len && + strcasecmp(qt->querystr.bv_val, tempstr->bv_val) == 0); +} + +static int filter2template( - Operation *op, Filter *f, struct berval *fstr, AttributeName** filter_attrs, - int* filter_cnt, - int* filter_got_oc ) + int* filter_cnt ) { AttributeDescription *ad; @@ -915,8 +958,7 @@ filter2template( fstr->bv_len += sizeof("(%") - 1; for ( f = f->f_list; f != NULL; f = f->f_next ) { - rc = filter2template( op, f, fstr, filter_attrs, filter_cnt, - filter_got_oc ); + rc = filter2template( f, fstr, filter_attrs, filter_cnt ); if ( rc ) break; } sprintf( fstr->bv_val+fstr->bv_len, ")" ); @@ -931,17 +973,14 @@ filter2template( return -1; } - *filter_attrs = (AttributeName *)op->o_tmprealloc(*filter_attrs, - (*filter_cnt + 2)*sizeof(AttributeName), op->o_tmpmemctx); + *filter_attrs = (AttributeName *)ch_realloc(*filter_attrs, + (*filter_cnt + 2)*sizeof(AttributeName)); (*filter_attrs)[*filter_cnt].an_desc = ad; (*filter_attrs)[*filter_cnt].an_name = ad->ad_cname; - (*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_attrs)[*filter_cnt+1].an_name.bv_val = NULL; + (*filter_attrs)[*filter_cnt+1].an_name.bv_len = 0; (*filter_cnt)++; - if ( ad == slap_schema.si_ad_objectClass ) - *filter_got_oc = 1; return 0; } @@ -965,6 +1004,7 @@ 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; @@ -978,32 +1018,35 @@ cache_entries( op_tmp.o_dn = cm->db.be_rootdn; op_tmp.o_ndn = cm->db.be_rootndn; - Debug( pcache_debug, "UUID for query being added = %s\n", + Debug( LDAP_DEBUG_ANY, "UUID for query being added = %s\n", uuidbuf, 0, 0 ); for ( e=si->head; e; e=si->head ) { si->head = e->e_private; e->e_private = NULL; + Debug( LDAP_DEBUG_NONE, "LOCKING REMOVE MUTEX\n", 0, 0, 0 ); + ldap_pvt_thread_mutex_lock(&cm->remove_mutex); + Debug( LDAP_DEBUG_NONE, "LOCKED REMOVE MUTEX\n", 0, 0, 0); while ( cm->cur_entries > (cm->max_entries) ) { qm->crfunc(qm, &crp_uuid); if (crp_uuid.bv_val) { - Debug( pcache_debug, + Debug( LDAP_DEBUG_ANY, "Removing query UUID %s\n", crp_uuid.bv_val, 0, 0 ); return_val = remove_query_data(&op_tmp, rs, &crp_uuid); - Debug( pcache_debug, + Debug( LDAP_DEBUG_ANY, "QUERY REMOVED, SIZE=%d\n", return_val, 0, 0); ldap_pvt_thread_mutex_lock( &cm->cache_mutex ); cm->cur_entries -= return_val; cm->num_cached_queries--; - Debug( pcache_debug, + Debug( LDAP_DEBUG_ANY, "STORED QUERIES = %lu\n", cm->num_cached_queries, 0, 0 ); ldap_pvt_thread_mutex_unlock( &cm->cache_mutex ); - Debug( pcache_debug, + Debug( LDAP_DEBUG_ANY, "QUERY REMOVED, CACHE =" "%d entries\n", cm->cur_entries, 0, 0 ); @@ -1011,33 +1054,26 @@ cache_entries( } return_val = merge_entry(&op_tmp, e, query_uuid); + ldap_pvt_thread_mutex_unlock(&cm->remove_mutex); ldap_pvt_thread_mutex_lock(&cm->cache_mutex); cm->cur_entries += return_val; - Debug( pcache_debug, + Debug( LDAP_DEBUG_ANY, "ENTRY ADDED/MERGED, CACHED ENTRIES=%d\n", cm->cur_entries, 0, 0 ); return_val = 0; ldap_pvt_thread_mutex_unlock(&cm->cache_mutex); } + ldap_pvt_thread_mutex_lock(&cm->cache_mutex); + cm->num_cached_queries++; + Debug( LDAP_DEBUG_ANY, "STORED QUERIES = %lu\n", + cm->num_cached_queries, 0, 0 ); + ldap_pvt_thread_mutex_unlock(&cm->cache_mutex); return return_val; } static int -pcache_op_cleanup( Operation *op, SlapReply *rs ) { - slap_callback *cb = op->o_callback; - struct search_info *si = cb->sc_private; - if ( si->query.save_attrs != NULL ) { - rs->sr_attrs = si->query.save_attrs; - op->ors_attrs = si->query.save_attrs; - } - op->o_callback = op->o_callback->sc_next; - op->o_tmpfree( cb, op->o_tmpmemctx ); - return SLAP_CB_CONTINUE; -} - -static int -pcache_response( +proxy_cache_response( Operation *op, SlapReply *rs ) { @@ -1047,11 +1083,6 @@ pcache_response( query_manager* qm = cm->qm; struct berval uuid; - if ( si->query.save_attrs != NULL ) { - rs->sr_attrs = si->query.save_attrs; - op->ors_attrs = si->query.save_attrs; - } - if ( rs->sr_type == REP_SEARCH ) { Entry *e; /* If we haven't exceeded the limit for this query, @@ -1077,20 +1108,17 @@ pcache_response( } } - } else if ( rs->sr_type == REP_RESULT ) { - QueryTemplate* templ = (qm->templates)+si->template_id; - if (( si->count && cache_entries( op, rs, &uuid ) == 0 ) || - ( templ->negttl && !si->count && !si->over && - rs->sr_err == LDAP_SUCCESS )) { - qm->addfunc(qm, &si->query, si->template_id, - si->count ? &uuid : NULL); - - ldap_pvt_thread_mutex_lock(&cm->cache_mutex); - cm->num_cached_queries++; - Debug( pcache_debug, "STORED QUERIES = %lu\n", - cm->num_cached_queries, 0, 0 ); - ldap_pvt_thread_mutex_unlock(&cm->cache_mutex); + if (rs->sr_attrs != op->ors_attrs ) { + op->o_tmpfree( rs->sr_attrs, op->o_tmpmemctx ); + } + rs->sr_attrs = si->query.save_attrs; + op->o_tmpfree( op->ors_attrs, op->o_tmpmemctx ); + op->ors_attrs = si->query.save_attrs; + si->query.save_attrs = NULL; + } else if ( rs->sr_type == REP_RESULT ) { + if ( si->count && cache_entries( op, rs, &uuid ) == 0 ) { + qm->addfunc(qm, &si->query, si->template_id, &uuid); /* If the consistency checker suspended itself, * wake it back up */ @@ -1102,12 +1130,10 @@ pcache_response( } ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex ); } - } else { - free( si->query.attrs ); - filter_free( si->query.filter ); } - op->o_callback->sc_cleanup = pcache_op_cleanup; + /* free self */ + op->o_callback->sc_cleanup = slap_freeself_cb; } return SLAP_CB_CONTINUE; } @@ -1116,36 +1142,42 @@ static void add_filter_attrs( Operation *op, AttributeName** new_attrs, - struct attr_set *attrs, - AttributeName* filter_attrs, - int fattr_cnt, - int fattr_got_oc) + AttributeName* attrs, + AttributeName* filter_attrs ) { int alluser = 0; int allop = 0; - int i, j; + int i; int count; - int addoc = 0; /* duplicate attrs */ - count = attrs->count + fattr_cnt; - if ( !fattr_got_oc && !(attrs->flags & PC_GOT_OC)) { - addoc = 1; - count++; + if (attrs == NULL) { + count = 1; + } else { + for (count=0; attrs[count].an_name.bv_val; count++) + ; + } + *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; + alluser = 1; + allop = 0; + } else { + for (i=0; icount; i++) { - (*new_attrs)[i].an_name = attrs->attrs[i].an_name; - (*new_attrs)[i].an_desc = attrs->attrs[i].an_desc; - } - BER_BVZERO( &(*new_attrs)[i].an_name ); - alluser = an_find(*new_attrs, &AllUser); - allop = an_find(*new_attrs, &AllOper); - - j = i; - for ( i=0; iad_type) ) { @@ -1153,55 +1185,18 @@ add_filter_attrs( continue; } else if (alluser) continue; - (*new_attrs)[j].an_name = filter_attrs[i].an_name; - (*new_attrs)[j].an_desc = filter_attrs[i].an_desc; - j++; - } - if ( addoc ) { - (*new_attrs)[j].an_name = slap_schema.si_ad_objectClass->ad_cname; - (*new_attrs)[j].an_desc = slap_schema.si_ad_objectClass; - j++; - } -} - -/* NOTE: this is a quick workaround to let pcache minimally interact - * with pagedResults. A more articulated solutions would be to - * perform the remote query without control and cache all results, - * performing the pagedResults search only within the client - * and the proxy. This requires pcache to understand pagedResults. */ -static int -pcache_chk_controls( - Operation *op, - SlapReply *rs ) -{ - const char *non = ""; - const char *stripped = ""; - - switch( op->o_pagedresults ) { - case SLAP_CONTROL_NONCRITICAL: - non = "non-"; - stripped = "; stripped"; - /* fallthru */ - - case SLAP_CONTROL_CRITICAL: - Debug( pcache_debug, "%s: " - "%scritical pagedResults control " - "disabled with proxy cache%s.\n", - op->o_log_prefix, non, stripped ); - - slap_remove_control( op, rs, slap_cids.sc_pagedResults, NULL ); - break; - - default: - rs->sr_err = SLAP_CB_CONTINUE; - break; + *new_attrs = (AttributeName*)(op->o_tmprealloc(*new_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; + count++; + (*new_attrs)[count].an_name.bv_val = NULL; + (*new_attrs)[count].an_name.bv_len = 0; } - - return rs->sr_err; } static int -pcache_op_search( +proxy_cache_search( Operation *op, SlapReply *rs ) { @@ -1209,35 +1204,34 @@ pcache_op_search( cache_manager *cm = on->on_bi.bi_private; query_manager* qm = cm->qm; + int count; + int i = -1; AttributeName *filter_attrs = NULL; + AttributeName *new_attrs = NULL; Query query; int attr_set = -1; int template_id = -1; - CachedQuery *answerable = NULL; + int answerable = 0; int cacheable = 0; int fattr_cnt=0; - int fattr_got_oc = 0; + int oc_attr_absent = 1; struct berval tempstr; tempstr.bv_val = op->o_tmpalloc( op->ors_filterstr.bv_len+1, op->o_tmpmemctx ); tempstr.bv_len = 0; - if ( filter2template( op, op->ors_filter, &tempstr, &filter_attrs, - &fattr_cnt, &fattr_got_oc )) { + if (filter2template(op->ors_filter, &tempstr, &filter_attrs, &fattr_cnt)) { op->o_tmpfree( tempstr.bv_val, op->o_tmpmemctx ); return SLAP_CB_CONTINUE; } - Debug( pcache_debug, "query template of incoming query = %s\n", + Debug( LDAP_DEBUG_ANY, "query template of incoming query = %s\n", tempstr.bv_val, 0, 0 ); - /* FIXME: cannot cache/answer requests with pagedResults control */ - - /* find attr set */ attr_set = get_attr_set(op->ors_attrs, qm, cm->numattrsets); @@ -1249,18 +1243,17 @@ pcache_op_search( /* check for query containment */ if (attr_set > -1) { - QueryTemplate *qt = qm->templates; - for (i=0; inumtemplates; i++, qt++) { + for (i=0; inumtemplates; i++) { /* find if template i can potentially answer tempstr */ - if ( qt->attr_set_index != attr_set || - qt->querystr.bv_len != tempstr.bv_len || - strcasecmp( qt->querystr.bv_val, tempstr.bv_val )) + if (!is_temp_answerable(attr_set, &tempstr, qm, i)) continue; - cacheable = 1; - template_id = i; - Debug( pcache_debug, "Entering QC, querystr = %s\n", + if (attr_set == qm->templates[i].attr_set_index) { + cacheable = 1; + template_id = i; + } + Debug( LDAP_DEBUG_NONE, "Entering QC, querystr = %s\n", op->ors_filterstr.bv_val, 0, 0 ); - answerable = (*(qm->qcfunc))(op, qm, &query, i); + answerable = (*(qm->qcfunc))(qm, &query, i); if (answerable) break; @@ -1277,24 +1270,18 @@ pcache_op_search( BackendDB *save_bd = op->o_bd; slap_callback *save_cb = op->o_callback; - Debug( pcache_debug, "QUERY ANSWERABLE\n", 0, 0, 0 ); - op->o_tmpfree( filter_attrs, op->o_tmpmemctx ); + Debug( LDAP_DEBUG_ANY, "QUERY ANSWERABLE\n", 0, 0, 0 ); + free(filter_attrs); ldap_pvt_thread_rdwr_runlock(&qm->templates[i].t_rwlock); - if ( BER_BVISNULL( &answerable->q_uuid )) { - /* No entries cached, just an empty result set */ - i = rs->sr_err = 0; - send_ldap_result( op, rs ); - } else { - op->o_bd = &cm->db; - op->o_callback = NULL; - i = cm->db.bd_info->bi_op_search( op, rs ); - } + op->o_bd = &cm->db; + op->o_callback = NULL; + i = cm->db.bd_info->bi_op_search( op, rs ); op->o_bd = save_bd; op->o_callback = save_cb; return i; } - Debug( pcache_debug, "QUERY NOT ANSWERABLE\n", 0, 0, 0 ); + Debug( LDAP_DEBUG_ANY, "QUERY NOT ANSWERABLE\n", 0, 0, 0 ); ldap_pvt_thread_mutex_lock(&cm->cache_mutex); if (cm->num_cached_queries >= cm->max_queries) { @@ -1302,22 +1289,37 @@ pcache_op_search( } ldap_pvt_thread_mutex_unlock(&cm->cache_mutex); - if (op->ors_attrsonly) - cacheable = 0; - if (cacheable) { slap_callback *cb; struct search_info *si; - Debug( pcache_debug, "QUERY CACHEABLE\n", 0, 0, 0 ); - query.filter = filter_dup(op->ors_filter, NULL); - add_filter_attrs(op, &query.attrs, &qm->attr_sets[attr_set], - filter_attrs, fattr_cnt, fattr_got_oc); - - op->ors_attrs = query.attrs; + Debug( LDAP_DEBUG_ANY, "QUERY CACHEABLE\n", 0, 0, 0 ); + query.filter = str2filter(op->ors_filterstr.bv_val); + if (op->ors_attrs) { + for ( count = 0; !BER_BVISNULL( &op->ors_attrs[ count ].an_name ); count++ ) { + if ( op->ors_attrs[count].an_desc == slap_schema.si_ad_objectClass ) { + oc_attr_absent = 0; + } + } + query.attrs = (AttributeName *)ch_malloc( ( count + 1 + oc_attr_absent ) + *sizeof(AttributeName) ); + 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; + } + 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 ); + count++; + } + query.attrs[ count ].an_name.bv_val = NULL; + query.attrs[ count ].an_name.bv_len = 0; + } + add_filter_attrs(op, &op->ors_attrs, query.attrs, filter_attrs); cb = op->o_tmpalloc( sizeof(*cb) + sizeof(*si), op->o_tmpmemctx); - cb->sc_response = pcache_response; + cb->sc_response = proxy_cache_response; cb->sc_cleanup = NULL; cb->sc_private = (cb+1); si = cb->sc_private; @@ -1346,51 +1348,57 @@ pcache_op_search( } } else { - Debug( pcache_debug, "QUERY NOT CACHEABLE\n", + Debug( LDAP_DEBUG_ANY, "QUERY NOT CACHEABLE\n", 0, 0, 0); } - op->o_tmpfree( filter_attrs, op->o_tmpmemctx ); + free(filter_attrs); return SLAP_CB_CONTINUE; } static int +attrscmp( + AttributeName* attrs_in, + AttributeName* attrs) +{ + int i, count1, count2; + if ( attrs_in == NULL ) { + return (attrs ? 0 : 1); + } + if ( attrs == NULL ) + return 0; + + for ( count1=0; + attrs_in && attrs_in[count1].an_name.bv_val != NULL; + count1++ ) + ; + for ( count2=0; + attrs && attrs[count2].an_name.bv_val != NULL; + count2++) + ; + if ( count1 != count2 ) + return 0; + + for ( i=0; i qm->attr_sets[i].count ) - continue; - if ( !count ) { - if ( !qm->attr_sets[i].count ) - break; - continue; - } - for ( a2 = attrs; a2->an_name.bv_val; a2++ ) { - if ( !an_find( qm->attr_sets[i].attrs, &a2->an_name )) { - found = 0; - break; - } - } - if ( found ) - break; + if (attrscmp(attrs, qm->attr_sets[i].attrs)) + return i; } - if ( i == num ) - i = -1; - return i; + return -1; } static void* @@ -1403,7 +1411,7 @@ consistency_check( cache_manager *cm = on->on_bi.bi_private; query_manager *qm = cm->qm; Connection conn = {0}; - OperationBuffer opbuf; + char opbuf[OPERATION_BUFFER_SIZE]; Operation *op; SlapReply rs = {REP_RESULT}; @@ -1411,7 +1419,7 @@ consistency_check( int i, return_val, pause = 1; QueryTemplate* templ; - op = (Operation *) &opbuf; + op = (Operation *)opbuf; connection_fake_init( &conn, op, ctx ); op->o_bd = &cm->db; @@ -1425,32 +1433,30 @@ consistency_check( query = templ->query_last; if ( query ) pause = 0; op->o_time = slap_get_time(); + ldap_pvt_thread_mutex_lock(&cm->remove_mutex); while (query && (query->expiry_time < op->o_time)) { - Debug( pcache_debug, "Lock CR index = %d\n", + ldap_pvt_thread_mutex_lock(&qm->lru_mutex); + remove_query(qm, query); + ldap_pvt_thread_mutex_unlock(&qm->lru_mutex); + Debug( LDAP_DEBUG_ANY, "Lock CR index = %d\n", i, 0, 0 ); ldap_pvt_thread_rdwr_wlock(&templ->t_rwlock); remove_from_template(query, templ); - Debug( pcache_debug, "TEMPLATE %d QUERIES-- %d\n", + Debug( LDAP_DEBUG_ANY, "TEMPLATE %d QUERIES-- %d\n", i, templ->no_of_queries, 0 ); - Debug( pcache_debug, "Unlock CR index = %d\n", + Debug( LDAP_DEBUG_ANY, "Unlock CR index = %d\n", i, 0, 0 ); ldap_pvt_thread_rdwr_wunlock(&templ->t_rwlock); - ldap_pvt_thread_mutex_lock(&qm->lru_mutex); - remove_query(qm, query); - ldap_pvt_thread_mutex_unlock(&qm->lru_mutex); - if ( BER_BVISNULL( &query->q_uuid )) - return_val = 0; - else - return_val = remove_query_data(op, &rs, &query->q_uuid); - Debug( pcache_debug, "STALE QUERY REMOVED, SIZE=%d\n", + return_val = remove_query_data(op, &rs, &query->q_uuid); + Debug( LDAP_DEBUG_ANY, "STALE QUERY REMOVED, SIZE=%d\n", return_val, 0, 0 ); ldap_pvt_thread_mutex_lock(&cm->cache_mutex); cm->cur_entries -= return_val; cm->num_cached_queries--; - Debug( pcache_debug, "STORED QUERIES = %lu\n", + Debug( LDAP_DEBUG_ANY, "STORED QUERIES = %lu\n", cm->num_cached_queries, 0, 0 ); ldap_pvt_thread_mutex_unlock(&cm->cache_mutex); - Debug( pcache_debug, + Debug( LDAP_DEBUG_ANY, "STALE QUERY REMOVED, CACHE =" "%d entries\n", cm->cur_entries, 0, 0 ); @@ -1458,6 +1464,7 @@ consistency_check( query = query->prev; free_query(query_prev); } + ldap_pvt_thread_mutex_unlock(&cm->remove_mutex); } ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex ); if ( ldap_pvt_runqueue_isrunning( &slapd_rq, rtask )) { @@ -1473,427 +1480,191 @@ consistency_check( #define MAX_ATTR_SETS 500 - -enum { - PC_MAIN = 1, - PC_ATTR, - PC_TEMP, - PC_RESP, - PC_QUERIES -}; - -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 void find_supersets( struct attr_set* attr_sets, int numsets ); +static int compare_sets( struct attr_set* setA, int, int ); static int -pc_cf_gen( ConfigArgs *c ) +proxy_cache_config( + BackendDB *be, + const char *fname, + int lineno, + int argc, + char **argv +) { - slap_overinst *on = (slap_overinst *)c->bi; + slap_overinst *on = (slap_overinst *)be->bd_info; cache_manager* cm = on->on_bi.bi_private; query_manager* qm = cm->qm; QueryTemplate* temp; AttributeName* attr_name; AttributeName* attrarray; const char* text=NULL; - int i, num, rc = 0; - char *ptr; - unsigned long t; - - if ( c->op == SLAP_CONFIG_EMIT ) { - struct berval bv; - switch( c->type ) { - case PC_MAIN: - bv.bv_len = snprintf( c->msg, sizeof( c->msg ), "%s %d %d %d %ld", - 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 = snprintf( c->msg, sizeof( 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++) { - if ( qm->templates[i].negttl ) { - bv.bv_len = snprintf( c->msg, sizeof( c->msg ), - " %d %ld %ld", - qm->templates[i].attr_set_index, - qm->templates[i].ttl, - qm->templates[i].negttl ); - } else { - bv.bv_len = snprintf( c->msg, sizeof( c->msg ), " %d %ld", - 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 ) { - BER_BVSTR( &bv, "head" ); - } else { - BER_BVSTR( &bv, "tail" ); - } - value_add_one( &c->rvalue_vals, &bv ); - break; - case PC_QUERIES: - c->value_int = cm->max_queries; - 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 - } + char *save_argv0 = NULL; - switch( c->type ) { - case PC_MAIN: - if ( cm->numattrsets > 0 ) { - snprintf( c->msg, sizeof( c->msg ), "\"proxycache\" directive already provided" ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); + 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 ( strcasecmp( argv[0], "proxycache" ) == 0 ) { + if ( argc < 6 ) { + fprintf( stderr, "%s: line %d: missing arguments in \"proxycache" + " " + "\"\n", fname, lineno ); return( 1 ); } - if ( lutil_atoi( &cm->numattrsets, c->argv[3] ) != 0 ) { - snprintf( c->msg, sizeof( c->msg ), "unable to parse num attrsets=\"%s\" (arg #3)", - c->argv[3] ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); - return( 1 ); - } - if ( cm->numattrsets <= 0 ) { - snprintf( c->msg, sizeof( c->msg ), "numattrsets (arg #3) must be positive" ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); - return( 1 ); - } - if ( cm->numattrsets > MAX_ATTR_SETS ) { - snprintf( c->msg, sizeof( c->msg ), "numattrsets (arg #3) must be <= %d", MAX_ATTR_SETS ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); + cm->db.bd_info = backend_info( argv[1] ); + if ( !cm->db.bd_info ) { + fprintf( stderr, "%s: line %d: backend %s unknown\n", + fname, lineno, argv[1] ); return( 1 ); } + if ( cm->db.bd_info->bi_db_init( &cm->db ) ) return( 1 ); - if ( !backend_db_init( c->argv[1], &cm->db )) { - snprintf( c->msg, sizeof( c->msg ), "unknown backend type (arg #1)" ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); - return( 1 ); - } + /* This type is in use, needs to be opened */ + cm->db.bd_info->bi_nDB++; - if ( lutil_atoi( &cm->max_entries, c->argv[2] ) != 0 ) { - snprintf( c->msg, sizeof( c->msg ), "unable to parse max entries=\"%s\" (arg #2)", - c->argv[2] ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); - return( 1 ); - } - if ( cm->max_entries <= 0 ) { - snprintf( c->msg, sizeof( c->msg ), "max entries (arg #2) must be positive.\n" ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s\n", c->log, c->msg, 0 ); - return( 1 ); - } + cm->max_entries = atoi( argv[2] ); - if ( lutil_atoi( &cm->num_entries_limit, c->argv[4] ) != 0 ) { - snprintf( c->msg, sizeof( c->msg ), "unable to parse entry limit=\"%s\" (arg #4)", - c->argv[4] ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); - return( 1 ); - } - if ( cm->num_entries_limit <= 0 ) { - snprintf( c->msg, sizeof( c->msg ), "entry limit (arg #4) must be positive" ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); - return( 1 ); - } - if ( cm->num_entries_limit > cm->max_entries ) { - snprintf( c->msg, sizeof( c->msg ), "entry limit (arg #4) must be less than max entries %d (arg #2)", cm->max_entries ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); + 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 ); } - if ( lutil_parse_time( c->argv[5], &t ) != 0 ) { - snprintf( c->msg, sizeof( c->msg ), "unable to parse period=\"%s\" (arg #5)", - c->argv[5] ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); - return( 1 ); - } - cm->cc_period = (time_t)t; - Debug( pcache_debug, - "Total # of attribute sets to be cached = %d.\n", + cm->num_entries_limit = atoi( argv[4] ); + cm->cc_period = atoi( argv[5] ); + Debug( LDAP_DEBUG_ANY, + "Total # of attribute sets to be cached = %d\n", cm->numattrsets, 0, 0 ); - qm->attr_sets = ( struct attr_set * )ch_calloc( cm->numattrsets, - sizeof( struct attr_set ) ); - break; - case PC_ATTR: - if ( cm->numattrsets == 0 ) { - snprintf( c->msg, sizeof( c->msg ), "\"proxycache\" directive not provided yet" ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); - return( 1 ); + qm->attr_sets = ( struct attr_set * )ch_malloc( cm->numattrsets * + sizeof( struct attr_set )); + for ( i = 0; i < cm->numattrsets; i++ ) { + qm->attr_sets[i].attrs = NULL; } - if ( lutil_atoi( &num, c->argv[1] ) != 0 ) { - snprintf( c->msg, sizeof( c->msg ), "unable to parse attrset #=\"%s\"", - c->argv[1] ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); + + } else if ( strcasecmp( argv[0], "proxyattrset" ) == 0 ) { + if ( argc < 3 ) { + fprintf( stderr, "%s: line %d: missing arguments in \"proxyattrset " + " \"\n", fname, lineno ); return( 1 ); } - - if ( num < 0 || num >= cm->numattrsets ) { - snprintf( c->msg, sizeof( c->msg ), "attrset index %d out of bounds (must be %s%d)", - num, cm->numattrsets > 1 ? "0->" : "", cm->numattrsets - 1 ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); + 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 ); return 1; } - qm->attr_sets[num].flags |= PC_CONFIGURED; - if ( c->argc > 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++ ) { + 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); attr_name->an_desc = NULL; - if ( slap_str2ad( c->argv[i], - &attr_name->an_desc, &text ) ) - { - strcpy( c->msg, text ); - Debug( LDAP_DEBUG_CONFIG, "%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_name = attr_name->an_desc->ad_cname; - attr_name->an_oc = NULL; - attr_name->an_oc_exclude = 0; - if ( attr_name->an_desc == slap_schema.si_ad_objectClass ) - qm->attr_sets[num].flags |= PC_GOT_OC; + slap_bv2ad( &attr_name->an_name, + &attr_name->an_desc, &text ); attr_name++; - BER_BVZERO( &attr_name->an_name ); + attr_name->an_name.bv_val = NULL; + attr_name->an_name.bv_len = 0; } } - break; - case PC_TEMP: - if ( cm->numattrsets == 0 ) { - snprintf( c->msg, sizeof( c->msg ), "\"proxycache\" directive not provided yet" ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); + } 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 ( lutil_atoi( &i, c->argv[2] ) != 0 ) { - snprintf( c->msg, sizeof( c->msg ), "unable to parse template #=\"%s\"", - c->argv[2] ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); - return( 1 ); - } - - if ( i < 0 || i >= cm->numattrsets ) { - snprintf( c->msg, sizeof( c->msg ), "template index %d invalid (%s%d)", - i, cm->numattrsets > 1 ? "0->" : "", cm->numattrsets - 1 ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); + if (( i = atoi( argv[2] )) >= cm->numattrsets ) { + Debug( LDAP_DEBUG_ANY, + "%s: line %d, template index invalid\n", + fname, lineno, 0 ); return 1; } num = cm->numtemplates; + if ( num == 0 ) + find_supersets( qm->attr_sets, cm->numattrsets ); qm->templates = ( QueryTemplate* )ch_realloc( qm->templates, ( num + 2 ) * sizeof( QueryTemplate )); temp = qm->templates + num; ldap_pvt_thread_rdwr_init( &temp->t_rwlock ); temp->query = temp->query_last = NULL; - if ( lutil_parse_time( c->argv[3], &t ) != 0 ) { - snprintf( c->msg, sizeof( c->msg ), "unable to parse template ttl=\"%s\"", - c->argv[3] ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); - return( 1 ); - } - temp->ttl = (time_t)t; - if ( c->argc == 5 ) { - if ( lutil_parse_time( c->argv[4], &t ) != 0 ) { - snprintf( c->msg, sizeof( c->msg ), - "unable to parse template negttl=\"%s\"", - c->argv[4] ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); - return( 1 ); - } - temp->negttl = (time_t)t; - } else { - temp->negttl = 0; - } - + temp->ttl = atoi( argv[3] ); temp->no_of_queries = 0; - - ber_str2bv( c->argv[1], 0, 1, &temp->querystr ); - Debug( pcache_debug, "Template:\n", 0, 0, 0 ); - Debug( pcache_debug, " query template: %s\n", + 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", temp->querystr.bv_val, 0, 0 ); temp->attr_set_index = i; - qm->attr_sets[i].flags |= PC_REFERENCED; - Debug( pcache_debug, " attributes: \n", 0, 0, 0 ); + Debug( LDAP_DEBUG_ANY, " attributes: \n", 0, 0, 0 ); if ( ( attrarray = qm->attr_sets[i].attrs ) != NULL ) { for ( i=0; attrarray[i].an_name.bv_val; i++ ) - Debug( pcache_debug, "\t%s\n", + Debug( LDAP_DEBUG_ANY, "\t%s\n", attrarray[i].an_name.bv_val, 0, 0 ); } temp++; temp->querystr.bv_val = NULL; cm->numtemplates++; - break; - case PC_RESP: - if ( strcasecmp( c->argv[1], "head" ) == 0 ) { + + } 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 ) { cm->response_cb = PCACHE_RESPONSE_CB_HEAD; - } else if ( strcasecmp( c->argv[1], "tail" ) == 0 ) { + } else if ( strcasecmp( argv[1], "tail" ) == 0 ) { cm->response_cb = PCACHE_RESPONSE_CB_TAIL; } else { - snprintf( c->msg, sizeof( c->msg ), "unknown specifier" ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); + Debug( LDAP_DEBUG_ANY, + "unknown specifier %s for \"response-callback {head(default)|tail}\" " + "callback position\n", argv[1], 0, 0 ); return 1; } - break; - case PC_QUERIES: - if ( c->value_int <= 0 ) { - snprintf( c->msg, sizeof( c->msg ), "max queries must be positive" ); - Debug( LDAP_DEBUG_CONFIG, "%s: %s.\n", c->log, c->msg, 0 ); - return( 1 ); - } - cm->max_queries = c->value_int; - break; } - return rc; -} + /* anything else */ + else { + rc = cm->db.bd_info->bi_db_config( &cm->db, fname, lineno, argc, argv ); + } -static int -pcache_db_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; + if ( save_argv0 ) { + argv[0] = save_argv0; + } - /* 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; + return rc; } static int -pcache_db_init( +proxy_cache_init( BackendDB *be ) { @@ -1933,43 +1704,26 @@ pcache_db_init( ldap_pvt_thread_mutex_init(&qm->lru_mutex); ldap_pvt_thread_mutex_init(&cm->cache_mutex); + ldap_pvt_thread_mutex_init(&cm->remove_mutex); return 0; } static int -pcache_db_open( +proxy_cache_open( BackendDB *be ) { slap_overinst *on = (slap_overinst *)be->bd_info; cache_manager *cm = on->on_bi.bi_private; - query_manager* qm = cm->qm; - int i, ncf = 0, rf = 0, nrf = 0, rc = 0; + int rc = 0; + int i; - /* check attr sets */ - for ( i = 0; i < cm->numattrsets; i++) { - if ( !( qm->attr_sets[i].flags & PC_CONFIGURED ) ) { - if ( qm->attr_sets[i].flags & PC_REFERENCED ) { - Debug( LDAP_DEBUG_CONFIG, "pcache: attr set #%d not configured but referenced.\n", i, 0, 0 ); - rf++; - - } else { - Debug( LDAP_DEBUG_CONFIG, "pcache: warning, attr set #%d not configured.\n", i, 0, 0 ); - } - ncf++; - - } else if ( !( qm->attr_sets[i].flags & PC_REFERENCED ) ) { - Debug( LDAP_DEBUG_CONFIG, "pcache: attr set #%d configured but not referenced.\n", i, 0, 0 ); - nrf++; - } - } - - if ( ncf || rf || nrf ) { - Debug( LDAP_DEBUG_CONFIG, "pcache: warning, %d attr sets configured but not referenced.\n", nrf, 0, 0 ); - Debug( LDAP_DEBUG_CONFIG, "pcache: warning, %d attr sets not configured.\n", ncf, 0, 0 ); - Debug( LDAP_DEBUG_CONFIG, "pcache: %d attr sets not configured but referenced.\n", rf, 0, 0 ); - - if ( rf > 0 ) { + /* 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; } } @@ -1986,20 +1740,19 @@ pcache_db_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, - "pcache_consistency", be->be_suffix[0].bv_val ); + consistency_check, on ); 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 ) ) { - Debug( LDAP_DEBUG_ANY, "pcache_db_open(): " + fprintf( stderr, "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, 0 ); + cm->db.be_suffix[0].bv_val ); return 1; } } @@ -2008,14 +1761,14 @@ pcache_db_open( } static int -pcache_db_close( +proxy_cache_close( BackendDB *be ) { slap_overinst *on = (slap_overinst *)be->bd_info; cache_manager *cm = on->on_bi.bi_private; query_manager *qm = cm->qm; - int i, rc = 0; + int i, j, rc = 0; /* cleanup stuff inherited from the original database... */ cm->db.be_limits = NULL; @@ -2037,6 +1790,10 @@ pcache_db_close( qm->templates = NULL; for ( i=0; inumattrsets; i++ ) { + free( qm->attr_sets[i].ID_array ); + for ( j=0; jattr_sets[i].count; j++ ) { + free( qm->attr_sets[i].attrs[j].an_name.bv_val ); + } free( qm->attr_sets[i].attrs ); } free( qm->attr_sets ); @@ -2046,88 +1803,153 @@ pcache_db_close( } static int -pcache_db_destroy( +proxy_cache_destroy( BackendDB *be ) { slap_overinst *on = (slap_overinst *)be->bd_info; cache_manager *cm = on->on_bi.bi_private; query_manager *qm = cm->qm; + int rc = 0; - /* cleanup stuff inherited from the original database... */ - cm->db.be_suffix = NULL; - cm->db.be_nsuffix = NULL; - BER_BVZERO( &cm->db.be_rootdn ); - BER_BVZERO( &cm->db.be_rootndn ); - BER_BVZERO( &cm->db.be_rootpw ); - /* FIXME: there might be more... */ - - if ( cm->db.be_private != NULL ) { - backend_destroy_one( &cm->db, 0 ); + if ( cm->db.bd_info->bi_db_destroy ) { + rc = cm->db.bd_info->bi_db_destroy( &cm->db ); } - - ldap_pvt_thread_mutex_destroy( &qm->lru_mutex ); - ldap_pvt_thread_mutex_destroy( &cm->cache_mutex ); + ldap_pvt_thread_mutex_destroy(&qm->lru_mutex); + ldap_pvt_thread_mutex_destroy(&cm->cache_mutex); + ldap_pvt_thread_mutex_destroy(&cm->remove_mutex); free( qm ); free( cm ); + return rc; +} - return 0; +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 pcache; +static slap_overinst proxy_cache; -int pcache_initialize() +int pcache_init() { LDAPAttributeType *at; int code; const char *err; - struct berval debugbv = BER_BVC("pcache"); - - if (( code = slap_loglevel_get( &debugbv, &pcache_debug ))) - return code; at = ldap_str2attributetype( queryid_schema, &code, &err, LDAP_SCHEMA_ALLOW_ALL ); if ( !at ) { - Debug( LDAP_DEBUG_ANY, - "pcache_initialize: ldap_str2attributetype failed %s %s\n", - ldap_scherr2str(code), err, 0 ); + fprintf( stderr, "AttributeType Load failed %s %s\n", + ldap_scherr2str(code), err ); return code; } - code = at_add( at, 0, NULL, &err ); + code = at_add( at, &err ); if ( !code ) { slap_str2ad( at->at_names[0], &ad_queryid, &err ); } ldap_memfree( at ); if ( code ) { - Debug( LDAP_DEBUG_ANY, - "pcache_initialize: at_add failed %s %s\n", - scherr2str(code), err, 0 ); + fprintf( stderr, "AttributeType Load failed %s %s\n", + scherr2str(code), err ); return code; } - pcache.on_bi.bi_type = "pcache"; - pcache.on_bi.bi_db_init = pcache_db_init; - pcache.on_bi.bi_db_config = pcache_db_config; - pcache.on_bi.bi_db_open = pcache_db_open; - pcache.on_bi.bi_db_close = pcache_db_close; - pcache.on_bi.bi_db_destroy = pcache_db_destroy; - - pcache.on_bi.bi_op_search = pcache_op_search; - - pcache.on_bi.bi_chk_controls = pcache_chk_controls; - - pcache.on_bi.bi_cf_ocs = pcocs; - - code = config_register_schema( pccfg, pcocs ); - if ( code ) return code; + proxy_cache.on_bi.bi_type = "proxycache"; + 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; + proxy_cache.on_bi.bi_db_close = proxy_cache_close; + proxy_cache.on_bi.bi_db_destroy = proxy_cache_destroy; + proxy_cache.on_bi.bi_op_search = proxy_cache_search; - return overlay_register( &pcache ); + return overlay_register( &proxy_cache ); } #if SLAPD_OVER_PROXYCACHE == SLAPD_MOD_DYNAMIC int init_module(int argc, char *argv[]) { - return pcache_initialize(); + return pcache_init(); } #endif