X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foverlays%2Fpcache.c;h=1a71cea0c876a17d76aa171d5f28c6fc15ceb34f;hb=f06e69dd130ffec77d106dd96453d0b8548264f0;hp=0ffb615d09860499eaaf60bf4b52bdb0e9e9be32;hpb=71c076dd5deb1068ad408ce7474437ba0e882ff0;p=openldap
diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 0ffb615d09..1a71cea0c8 100644
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 2003 The OpenLDAP Foundation.
+ * Copyright 2003-2007 The OpenLDAP Foundation.
* Portions Copyright 2003 IBM Corporation.
* Portions Copyright 2003 Symas Corporation.
* All rights reserved.
@@ -29,16 +29,18 @@
#include
#include "slap.h"
-#include "ldap_pvt.h"
#include "lutil.h"
#include "ldap_rq.h"
+#include "config.h"
+
/* query cache structs */
/* query */
typedef struct Query_s {
Filter* filter; /* Search Filter */
AttributeName* attrs; /* Projected attributes */
+ AttributeName* save_attrs; /* original attributes, saved for response */
struct berval base; /* Search Base */
int scope; /* Search scope */
} Query;
@@ -66,19 +68,22 @@ 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 */
- long ttl; /* TTL for the queries of this template */
+ time_t ttl; /* TTL for the queries of this template */
+ time_t negttl; /* TTL for negative results */
ldap_pvt_thread_rdwr_t t_rwlock; /* Rd/wr lock for accessing queries in the template */
} QueryTemplate;
/*
- * Represents a set of projected attributes and any
- * supersets among all specified sets of attributes.
+ * Represents a set of projected 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;
@@ -86,7 +91,7 @@ struct query_manager_s;
/* prototypes for functions for 1) query containment
* 2) query addition, 3) cache replacement
*/
-typedef int (QCfunc)(struct query_manager_s*, Query*, int );
+typedef CachedQuery * (QCfunc)(Operation *op, 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 * );
@@ -117,16 +122,22 @@ typedef struct cache_manager_s {
int max_entries; /* max number of entries cached */
int num_entries_limit; /* max # of entries in a cacheable query */
- int cc_period; /* interval between successive consistency checks (sec) */
+ char response_cb; /* install the response callback
+ * at the tail of the callback list */
+#define PCACHE_RESPONSE_CB_HEAD 0
+#define PCACHE_RESPONSE_CB_TAIL 1
+
+ time_t 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' "
@@ -179,7 +190,7 @@ merge_entry(
op->o_tag = LDAP_REQ_MODIFY;
op->orm_modlist = modlist;
op->o_bd->be_modify( op, &sreply );
- slap_mods_free( modlist );
+ slap_mods_free( modlist, 1 );
} else if ( rc == LDAP_REFERRAL ||
rc == LDAP_NO_SUCH_OBJECT ) {
syncrepl_add_glue( op, e );
@@ -205,7 +216,7 @@ static int base_scope_compare(
int scope_stored,
int scope_incoming )
{
- struct berval pdn_incoming = { 0, NULL };
+ struct berval pdn_incoming = BER_BVNULL;
if (scope_stored < scope_incoming)
return 0;
@@ -254,13 +265,8 @@ add_query_on_top (query_manager* qm, CachedQuery* qc)
qc->lru_down = top;
qc->lru_up = NULL;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "Base of added query = %s\n",
+ Debug( pcache_debug, "Base of added query = %s\n",
q->base.bv_val, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "Base of added query = %s\n",
- q->base.bv_val, 0, 0 );
-#endif
}
/* remove_query from LRU list */
@@ -292,69 +298,59 @@ remove_query (query_manager* qm, CachedQuery* qc)
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;
- char* arg1, *arg2;
- char* string1=ber1->bv_val;
- char* string2=ber2->bv_val;
-
- if (string2 == NULL)
+ if ( !ber2->bv_val )
return 1;
- if (string1 == NULL)
+ if ( !ber1->bv_val )
return 0;
- 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);
+ 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;
}
return ret;
}
static struct berval*
-merge_init_final(struct berval* init, struct berval* any, struct berval* final)
+merge_init_final(Operation *op, struct berval* init, struct berval* any,
+ struct berval* final)
{
struct berval* merged, *temp;
int i, any_count, count;
@@ -369,25 +365,30 @@ merge_init_final(struct berval* init, struct berval* any, struct berval* final)
if (final->bv_val)
count++;
- merged = (struct berval*)(ch_malloc((count+1)*sizeof(struct berval)));
+ merged = (struct berval*)op->o_tmpalloc( (count+1)*sizeof(struct berval),
+ op->o_tmpmemctx );
temp = merged;
if (init->bv_val) {
- *temp++ = *init;
+ ber_dupbv_x( temp, init, op->o_tmpmemctx );
+ temp++;
}
for (i=0; io_tmpmemctx );
+ temp++; any++;
}
if (final->bv_val){
- *temp++ = *final;
+ ber_dupbv_x( temp, final, op->o_tmpmemctx );
+ temp++;
}
- temp->bv_val = NULL;
- temp->bv_len = 0;
+ BER_BVZERO( temp );
return merged;
}
+/* Each element in stored must be found in incoming. Incoming is overwritten.
+ */
static int
strings_containment(struct berval* stored, struct berval* incoming)
{
@@ -414,39 +415,20 @@ strings_containment(struct berval* stored, struct berval* incoming)
}
static int
-substr_containment_substr(Filter* stored, Filter* incoming)
+substr_containment_substr(Operation *op, 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;
-
- 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;
- }
+ init_incoming = incoming->f_sub_initial;
+ final_incoming = incoming->f_sub_final;
if (find_and_remove(&init_incoming,
&(stored->f_sub_initial), 1) && find_and_remove(&final_incoming,
@@ -456,48 +438,44 @@ substr_containment_substr(Filter* stored, Filter* incoming)
rc = 1;
goto final;
}
- remaining_incoming = merge_init_final(&init_incoming,
- any_incoming, &final_incoming);
+ remaining_incoming = merge_init_final(op, &init_incoming,
+ incoming->f_sub_any, &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(Filter* stored, Filter* incoming)
+substr_containment_equality(Operation *op, Filter* stored, Filter* incoming)
{
struct berval incoming_val[2];
int rc = 0;
- ber_dupbv(incoming_val, &(incoming->f_av_value));
- incoming_val[1].bv_val = NULL;
- incoming_val[1].bv_len = 0;
+ incoming_val[1] = incoming->f_av_value;
- if (find_and_remove(incoming_val,
- &(stored->f_sub_initial), 1) && find_and_remove(incoming_val,
+ if (find_and_remove(incoming_val+1,
+ &(stored->f_sub_initial), 1) && find_and_remove(incoming_val+1,
&(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 int
-query_containment(query_manager *qm,
+static CachedQuery *
+query_containment(Operation *op, query_manager *qm,
Query *query,
int template_index)
{
@@ -515,13 +493,8 @@ query_containment(query_manager *qm,
MatchingRule* mrule = NULL;
if (inputf != NULL) {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "Lock QC index = %d\n",
- template_index, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "Lock QC index = %d\n",
+ Debug( pcache_debug, "Lock QC index = %d\n",
template_index, 0, 0 );
-#endif
ldap_pvt_thread_rdwr_rlock(&(templa[template_index].t_rwlock));
for(qc=templa[template_index].query; qc != NULL; qc= qc->next) {
q = (Query*)qc;
@@ -551,16 +524,10 @@ query_containment(query_manager *qm,
&(fs->f_ava->aa_value), &text);
if (rc != LDAP_SUCCESS) {
ldap_pvt_thread_rdwr_runlock(&(templa[template_index].t_rwlock));
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1,
+ Debug( pcache_debug,
"Unlock: Exiting QC index=%d\n",
template_index, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY,
- "Unlock: Exiting QC index=%d\n",
- template_index, 0, 0 );
-#endif
- return 0;
+ return NULL;
}
}
switch (fs->f_choice) {
@@ -574,13 +541,13 @@ query_containment(query_manager *qm,
/* check if the equality query can be
* answered with cached substring query */
if ((fi->f_choice == LDAP_FILTER_EQUALITY)
- && substr_containment_equality(
+ && substr_containment_equality( op,
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(
+ ) && substr_containment_substr( op,
fs, fi))
res= 1;
fs=fs->f_next;
@@ -624,36 +591,26 @@ query_containment(query_manager *qm,
add_query_on_top(qm, qc);
}
ldap_pvt_thread_mutex_unlock(&qm->lru_mutex);
- return 1;
+ return qc;
}
}
}
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1,
- "Not answerable: Unlock QC index=%d\n",
- template_index, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY,
+ Debug( pcache_debug,
"Not answerable: Unlock QC index=%d\n",
template_index, 0, 0 );
-#endif
ldap_pvt_thread_rdwr_runlock(&(templa[template_index].t_rwlock));
}
- return 0;
+ return NULL;
}
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);
}
@@ -670,17 +627,17 @@ static void add_query(
QueryTemplate* templ = (qm->templates)+template_index;
Query* new_query;
new_cached_query->template_id = template_index;
- new_cached_query->q_uuid = *uuid;
+ 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->lru_up = NULL;
new_cached_query->lru_down = NULL;
- new_cached_query->expiry_time = slap_get_time() + templ->ttl;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "Added query expires at %ld\n",
- (long) new_cached_query->expiry_time, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "Added query expires at %ld\n",
+ Debug( pcache_debug, "Added query expires at %ld\n",
(long) new_cached_query->expiry_time, 0, 0 );
-#endif
new_query = (Query*)new_cached_query;
ber_dupbv(&new_query->base, &query->base);
@@ -689,13 +646,8 @@ static void add_query(
new_query->attrs = query->attrs;
/* Adding a query */
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "Lock AQ index = %d\n",
+ Debug( pcache_debug, "Lock AQ index = %d\n",
template_index, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "Lock AQ index = %d\n",
- template_index, 0, 0 );
-#endif
ldap_pvt_thread_rdwr_wlock(&templ->t_rwlock);
if (templ->query == NULL)
templ->query_last = new_cached_query;
@@ -705,21 +657,11 @@ static void add_query(
new_cached_query->prev = NULL;
templ->query = new_cached_query;
templ->no_of_queries++;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "TEMPLATE %d QUERIES++ %d\n",
+ Debug( pcache_debug, "TEMPLATE %d QUERIES++ %d\n",
template_index, templ->no_of_queries, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "TEMPLATE %d QUERIES++ %d\n",
- template_index, templ->no_of_queries, 0 );
-#endif
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "Unlock AQ index = %d \n",
+ Debug( pcache_debug, "Unlock AQ index = %d \n",
template_index, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "Unlock AQ index = %d \n",
- template_index, 0, 0 );
-#endif
ldap_pvt_thread_rdwr_wunlock(&templ->t_rwlock);
/* Adding on top of LRU list */
@@ -760,15 +702,10 @@ static void cache_replacement(query_manager* qm, struct berval *result)
result->bv_len = 0;
if (!bottom) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( BACK_META, DETAIL1,
+ Debug ( pcache_debug,
"Cache replacement invoked without "
"any query in LRU list\n", 0, 0, 0 );
-#else
- Debug ( LDAP_DEBUG_ANY,
- "Cache replacement invoked without "
- "any query in LRU list\n", 0, 0, 0 );
-#endif
+ ldap_pvt_thread_mutex_unlock(&qm->lru_mutex);
return;
}
@@ -779,32 +716,20 @@ static void cache_replacement(query_manager* qm, struct berval *result)
*result = bottom->q_uuid;
bottom->q_uuid.bv_val = NULL;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "Lock CR index = %d\n", temp_id, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "Lock CR index = %d\n", temp_id, 0, 0 );
-#endif
+ Debug( pcache_debug, "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));
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "TEMPLATE %d QUERIES-- %d\n",
- temp_id, qm->templates[temp_id].no_of_queries, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "TEMPLATE %d QUERIES-- %d\n",
+ Debug( pcache_debug, "TEMPLATE %d QUERIES-- %d\n",
temp_id, qm->templates[temp_id].no_of_queries, 0 );
-#endif
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "Unlock CR index = %d\n", temp_id, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "Unlock CR index = %d\n", temp_id, 0, 0 );
-#endif
+ Debug( pcache_debug, "Unlock CR index = %d\n", temp_id, 0, 0 );
ldap_pvt_thread_rdwr_wunlock(&(qm->templates[temp_id].t_rwlock));
free_query(bottom);
}
struct query_info {
- struct berval* uuid;
- int deleted;
+ struct query_info *next;
+ struct berval xdn;
+ int del;
};
static int
@@ -813,18 +738,11 @@ remove_func (
SlapReply *rs
)
{
- struct query_info *info = op->o_callback->sc_private;
- int count = 0;
- Modifications mod;
- struct berval vals[2];
-
- Attribute *attr;
- Operation op_tmp = *op;
-
- SlapReply sreply = {REP_RESULT};
+ Attribute *attr;
+ struct query_info *qi;
+ int count = 0;
- if (rs->sr_type == REP_RESULT)
- return 0;
+ if ( rs->sr_type != REP_SEARCH ) return 0;
for (attr = rs->sr_entry->e_attrs; attr!= NULL; attr = attr->a_next) {
if (attr->a_desc == ad_queryid) {
@@ -833,51 +751,12 @@ remove_func (
break;
}
}
-
- if (count == 0) {
- return 0;
- }
- if (count == 1) {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1,
- "DELETING ENTRY TEMPLATE=%s\n",
- attr->a_vals[0].bv_val, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "DELETING ENTRY TEMPLATE=%s\n",
- attr->a_vals[0].bv_val, 0, 0 );
-#endif
-
- op_tmp.o_req_dn = rs->sr_entry->e_name;
- op_tmp.o_req_ndn = rs->sr_entry->e_nname;
-
- if (op->o_bd->be_delete(&op_tmp, rs) == LDAP_SUCCESS) {
- info->deleted++;
- }
- return 0;
- }
-
- vals[0] = *info->uuid;
- vals[1].bv_val = NULL;
- vals[1].bv_len = 0;
- mod.sml_op = LDAP_MOD_DELETE;
- mod.sml_desc = ad_queryid;
- mod.sml_type = ad_queryid->ad_cname;
- mod.sml_bvalues = vals;
- mod.sml_next = NULL;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1,
- "REMOVING TEMP ATTR : TEMPLATE=%s\n",
- attr->a_vals[0].bv_val, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "REMOVING TEMP ATTR : TEMPLATE=%s\n",
- attr->a_vals[0].bv_val, 0, 0 );
-#endif
-
- op_tmp.o_req_dn = rs->sr_entry->e_name;
- op_tmp.o_req_ndn = rs->sr_entry->e_nname;
- op_tmp.orm_modlist = &mod;
-
- op->o_bd->be_modify( &op_tmp, &sreply );
+ if ( count == 0 ) return 0;
+ qi = op->o_tmpalloc( sizeof( struct query_info ), op->o_tmpmemctx );
+ qi->next = op->o_callback->sc_private;
+ op->o_callback->sc_private = qi;
+ ber_dupbv_x( &qi->xdn, &rs->sr_entry->e_nname, op->o_tmpmemctx );
+ qi->del = ( count == 1 );
return 0;
}
@@ -888,21 +767,25 @@ remove_query_data (
SlapReply *rs,
struct berval* query_uuid)
{
- struct query_info info;
+ 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
Filter filter = {LDAP_FILTER_EQUALITY};
SlapReply sreply = {REP_RESULT};
slap_callback cb = { NULL, remove_func, NULL, NULL };
+ int deleted = 0;
sreply.sr_entry = NULL;
sreply.sr_nentries = 0;
op->ors_filterstr.bv_len = snprintf(filter_str, sizeof(filter_str),
"(%s=%s)", ad_queryid->ad_cname.bv_val, query_uuid->bv_val);
+ filter.f_ava = &ava;
filter.f_av_desc = ad_queryid;
filter.f_av_value = *query_uuid;
- info.uuid = query_uuid;
- info.deleted = 0;
- cb.sc_private = &info;
op->o_tag = LDAP_REQ_SEARCH;
op->o_protocol = LDAP_VERSION3;
@@ -914,8 +797,8 @@ remove_query_data (
op->o_req_ndn = op->o_bd->be_nsuffix[0];
op->ors_scope = LDAP_SCOPE_SUBTREE;
op->ors_deref = LDAP_DEREF_NEVER;
- op->ors_slimit = 0;
- op->ors_tlimit = 0;
+ op->ors_slimit = SLAP_NO_LIMIT;
+ op->ors_tlimit = SLAP_NO_LIMIT;
op->ors_filter = &filter;
op->ors_filterstr.bv_val = filter_str;
op->ors_filterstr.bv_len = strlen(filter_str);
@@ -924,52 +807,64 @@ remove_query_data (
op->o_bd->be_search( op, &sreply );
- return info.deleted;
-}
+ for ( qi=cb.sc_private; qi; qi=qnext ) {
+ qnext = qi->next;
-static int
-get_attr_set(
- AttributeName* attrs,
- query_manager* qm,
- int num
-);
+ op->o_req_dn = qi->xdn;
+ op->o_req_ndn = qi->xdn;
-static int
-attrscmp(
- AttributeName* attrs_in,
- AttributeName* attrs
-);
+ if ( qi->del) {
+ Debug( pcache_debug, "DELETING ENTRY TEMPLATE=%s\n",
+ query_uuid->bv_val, 0, 0 );
-static int
-is_temp_answerable(
- int attr_set,
- struct berval* tempstr,
- query_manager* qm,
- int template_id )
-{
- QueryTemplate *qt = qm->templates + template_id;
+ op->o_tag = LDAP_REQ_DELETE;
- if (attr_set != qt->attr_set_index) {
- int* id_array = qm->attr_sets[attr_set].ID_array;
+ if (op->o_bd->be_delete(op, &sreply) == LDAP_SUCCESS) {
+ deleted++;
+ }
+ } else {
+ Modifications mod;
+ struct berval vals[2];
+
+ vals[0] = *query_uuid;
+ 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,
+ "REMOVING TEMP ATTR : TEMPLATE=%s\n",
+ query_uuid->bv_val, 0, 0 );
+
+ op->orm_modlist = &mod;
- while (*id_array != -1) {
- if (*id_array == qt->attr_set_index)
- break;
- id_array++;
+ op->o_bd->be_modify( op, &sreply );
}
- if (*id_array == -1)
- return 0;
+ op->o_tmpfree( qi->xdn.bv_val, op->o_tmpmemctx );
+ op->o_tmpfree( qi, op->o_tmpmemctx );
}
- return (qt->querystr.bv_len == tempstr->bv_len &&
- strcasecmp(qt->querystr.bv_val, tempstr->bv_val) == 0);
+ return deleted;
}
+static int
+get_attr_set(
+ AttributeName* attrs,
+ query_manager* qm,
+ int num
+);
+
static int
filter2template(
+ Operation *op,
Filter *f,
struct berval *fstr,
AttributeName** filter_attrs,
- int* filter_cnt )
+ int* filter_cnt,
+ int* filter_got_oc )
{
AttributeDescription *ad;
@@ -1020,7 +915,8 @@ filter2template(
fstr->bv_len += sizeof("(%") - 1;
for ( f = f->f_list; f != NULL; f = f->f_next ) {
- rc = filter2template( f, fstr, filter_attrs, filter_cnt );
+ rc = filter2template( op, f, fstr, filter_attrs, filter_cnt,
+ filter_got_oc );
if ( rc ) break;
}
sprintf( fstr->bv_val+fstr->bv_len, ")" );
@@ -1035,14 +931,17 @@ filter2template(
return -1;
}
- *filter_attrs = (AttributeName *)ch_realloc(*filter_attrs,
- (*filter_cnt + 2)*sizeof(AttributeName));
+ *filter_attrs = (AttributeName *)op->o_tmprealloc(*filter_attrs,
+ (*filter_cnt + 2)*sizeof(AttributeName), op->o_tmpmemctx);
(*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)++;
+ if ( ad == slap_schema.si_ad_objectClass )
+ *filter_got_oc = 1;
return 0;
}
@@ -1066,8 +965,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;
+ int return_val = 0;
Entry *e;
struct berval crp_uuid;
char uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
@@ -1080,112 +978,66 @@ cache_entries(
op_tmp.o_dn = cm->db.be_rootdn;
op_tmp.o_ndn = cm->db.be_rootndn;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "UUID for query being added = %s\n",
- uuidbuf, 0, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY, "UUID for query being added = %s\n",
+ Debug( pcache_debug, "UUID for query being added = %s\n",
uuidbuf, 0, 0 );
-#endif /* !NEW_LOGGING */
for ( e=si->head; e; e=si->head ) {
si->head = e->e_private;
e->e_private = NULL;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL2, "LOCKING REMOVE MUTEX\n",
- 0, 0, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_NONE, "LOCKING REMOVE MUTEX\n", 0, 0, 0 );
-#endif /* !NEW_LOGGING */
- ldap_pvt_thread_mutex_lock(&cm->remove_mutex);
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL2, "LOCKED REMOVE MUTEX\n", 0, 0, 0);
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_NONE, "LOCKED REMOVE MUTEX\n", 0, 0, 0);
-#endif /* !NEW_LOGGING */
while ( cm->cur_entries > (cm->max_entries) ) {
qm->crfunc(qm, &crp_uuid);
if (crp_uuid.bv_val) {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1,
+ Debug( pcache_debug,
"Removing query UUID %s\n",
crp_uuid.bv_val, 0, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY,
- "Removing query UUID %s\n",
- crp_uuid.bv_val, 0, 0 );
-#endif /* !NEW_LOGGING */
return_val = remove_query_data(&op_tmp, rs, &crp_uuid);
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1,
- "QUERY REMOVED, SIZE=%d\n",
- return_val, 0, 0);
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY,
+ Debug( pcache_debug,
"QUERY REMOVED, SIZE=%d\n",
return_val, 0, 0);
-#endif /* !NEW_LOGGING */
ldap_pvt_thread_mutex_lock(
&cm->cache_mutex );
cm->cur_entries -= return_val;
cm->num_cached_queries--;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1,
- "STORED QUERIES = %lu\n",
- cm->num_cached_queries, 0, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY,
+ Debug( pcache_debug,
"STORED QUERIES = %lu\n",
cm->num_cached_queries, 0, 0 );
-#endif /* !NEW_LOGGING */
ldap_pvt_thread_mutex_unlock(
&cm->cache_mutex );
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1,
+ Debug( pcache_debug,
"QUERY REMOVED, CACHE ="
"%d entries\n",
cm->cur_entries, 0, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY,
- "QUERY REMOVED, CACHE ="
- "%d entries\n",
- cm->cur_entries, 0, 0 );
-#endif /* !NEW_LOGGING */
}
}
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;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1,
+ Debug( pcache_debug,
"ENTRY ADDED/MERGED, CACHED ENTRIES=%d\n",
cm->cur_entries, 0, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY,
- "ENTRY ADDED/MERGED, CACHED ENTRIES=%d\n",
- cm->cur_entries, 0, 0 );
-#endif /* !NEW_LOGGING */
return_val = 0;
ldap_pvt_thread_mutex_unlock(&cm->cache_mutex);
}
- ldap_pvt_thread_mutex_lock(&cm->cache_mutex);
- cm->num_cached_queries++;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "STORED QUERIES = %lu\n",
- cm->num_cached_queries, 0, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY, "STORED QUERIES = %lu\n",
- cm->num_cached_queries, 0, 0 );
-#endif /* !NEW_LOGGING */
- ldap_pvt_thread_mutex_unlock(&cm->cache_mutex);
return return_val;
}
static int
-proxy_cache_response(
+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(
Operation *op,
SlapReply *rs )
{
@@ -1195,6 +1047,12 @@ proxy_cache_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;
+ si->query.save_attrs = NULL;
+ }
+
if ( rs->sr_type == REP_SEARCH ) {
Entry *e;
/* If we haven't exceeded the limit for this query,
@@ -1219,21 +1077,38 @@ proxy_cache_response(
si->tail = NULL;
}
}
- } else if ( rs->sr_type == REP_RESULT && !si->over ) {
- if ( cache_entries( op, rs, &uuid ) == 0) {
- qm->addfunc(qm, &si->query, si->template_id, &uuid);
+
+ } 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 the consistency checker suspended itself,
* wake it back up
*/
if ( cm->cc_paused ) {
- ldap_pvt_thread_mutex_lock( &syncrepl_rq.rq_mutex );
+ ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
if ( cm->cc_paused ) {
cm->cc_paused = 0;
- ldap_pvt_runqueue_resched( &syncrepl_rq, cm->cc_arg, 0 );
+ ldap_pvt_runqueue_resched( &slapd_rq, cm->cc_arg, 0 );
}
- ldap_pvt_thread_mutex_unlock( &syncrepl_rq.rq_mutex );
+ 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;
}
return SLAP_CB_CONTINUE;
}
@@ -1242,42 +1117,36 @@ static void
add_filter_attrs(
Operation *op,
AttributeName** new_attrs,
- AttributeName* attrs,
- AttributeName* filter_attrs )
+ struct attr_set *attrs,
+ AttributeName* filter_attrs,
+ int fattr_cnt,
+ int fattr_got_oc)
{
int alluser = 0;
int allop = 0;
- int i;
+ int i, j;
int count;
+ int addoc = 0;
/* duplicate attrs */
- if (attrs == NULL) {
- count = 1;
- } else {
- for (count=0; attrs[count].an_name.bv_val; count++)
- ;
+ count = attrs->count + fattr_cnt;
+ if ( !fattr_got_oc && !(attrs->flags & PC_GOT_OC)) {
+ addoc = 1;
+ 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);
- for ( i=0; filter_attrs[i].an_name.bv_val; i++ ) {
+ j = i;
+ for ( i=0; iad_type) ) {
@@ -1285,18 +1154,60 @@ add_filter_attrs(
continue;
} else if (alluser)
continue;
- *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;
+ (*new_attrs)[j].an_name = filter_attrs[i].an_name;
+ (*new_attrs)[j].an_desc = filter_attrs[i].an_desc;
+ (*new_attrs)[j].an_oc = NULL;
+ (*new_attrs)[j].an_oc_exclude = 0;
+ 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;
+ (*new_attrs)[j].an_oc = NULL;
+ (*new_attrs)[j].an_oc_exclude = 0;
+ j++;
+ }
+ BER_BVZERO( &(*new_attrs)[j].an_name );
+}
+
+/* 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;
+ }
+
+ return rs->sr_err;
}
static int
-proxy_cache_search(
+pcache_op_search(
Operation *op,
SlapReply *rs )
{
@@ -1304,66 +1215,58 @@ proxy_cache_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;
- int answerable = 0;
+ CachedQuery *answerable = NULL;
int cacheable = 0;
int fattr_cnt=0;
- int oc_attr_absent = 1;
+ int fattr_got_oc = 0;
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->ors_filter, &tempstr, &filter_attrs, &fattr_cnt)) {
+ if ( filter2template( op, op->ors_filter, &tempstr, &filter_attrs,
+ &fattr_cnt, &fattr_got_oc )) {
op->o_tmpfree( tempstr.bv_val, op->o_tmpmemctx );
return SLAP_CB_CONTINUE;
}
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "query template of incoming query = %s\n",
- tempstr.bv_val, 0, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY, "query template of incoming query = %s\n",
+ Debug( pcache_debug, "query template of incoming query = %s\n",
tempstr.bv_val, 0, 0 );
-#endif /* !NEW_LOGGING */
+
+ /* FIXME: cannot cache/answer requests with pagedResults control */
+
/* find attr set */
attr_set = get_attr_set(op->ors_attrs, qm, cm->numattrsets);
query.filter = op->ors_filter;
query.attrs = op->ors_attrs;
+ query.save_attrs = NULL;
query.base = op->o_req_ndn;
query.scope = op->ors_scope;
/* check for query containment */
if (attr_set > -1) {
- for (i=0; inumtemplates; i++) {
+ QueryTemplate *qt = qm->templates;
+ for (i=0; inumtemplates; i++, qt++) {
/* find if template i can potentially answer tempstr */
- if (!is_temp_answerable(attr_set, &tempstr, qm, i))
+ if ( qt->attr_set_index != attr_set ||
+ qt->querystr.bv_len != tempstr.bv_len ||
+ strcasecmp( qt->querystr.bv_val, tempstr.bv_val ))
continue;
- if (attr_set == qm->templates[i].attr_set_index) {
- cacheable = 1;
- template_id = i;
- }
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL2,
- "Entering QC, querystr = %s\n",
- op->ors_filterstr.bv_val, 0, 0 );
-#else /* !NEW_LOGGING */
+ cacheable = 1;
+ template_id = i;
Debug( LDAP_DEBUG_NONE, "Entering QC, querystr = %s\n",
op->ors_filterstr.bv_val, 0, 0 );
-#endif /* !NEW_LOGGING */
- answerable = (*(qm->qcfunc))(qm, &query, i);
+ answerable = (*(qm->qcfunc))(op, qm, &query, i);
if (answerable)
break;
@@ -1371,27 +1274,33 @@ proxy_cache_search(
}
op->o_tmpfree( tempstr.bv_val, op->o_tmpmemctx );
+ query.save_attrs = op->ors_attrs;
+ query.attrs = NULL;
+
if (answerable) {
- BackendDB *be = op->o_bd;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "QUERY ANSWERABLE\n", 0, 0, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY, "QUERY ANSWERABLE\n", 0, 0, 0 );
-#endif /* !NEW_LOGGING */
- free(filter_attrs);
+ /* Need to clear the callbacks of the original operation,
+ * in case there are other overlays */
+ 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 );
ldap_pvt_thread_rdwr_runlock(&qm->templates[i].t_rwlock);
- op->o_bd = &cm->db;
- i = cm->db.bd_info->bi_op_search( op, rs );
- op->o_bd = be;
+ 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 = save_bd;
+ op->o_callback = save_cb;
return i;
}
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "QUERY NOT ANSWERABLE\n",
- 0, 0, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY, "QUERY NOT ANSWERABLE\n", 0, 0, 0 );
-#endif /* !NEW_LOGGING */
+ Debug( pcache_debug, "QUERY NOT ANSWERABLE\n", 0, 0, 0 );
ldap_pvt_thread_mutex_lock(&cm->cache_mutex);
if (cm->num_cached_queries >= cm->max_queries) {
@@ -1399,41 +1308,22 @@ proxy_cache_search(
}
ldap_pvt_thread_mutex_unlock(&cm->cache_mutex);
+ if (op->ors_attrsonly)
+ cacheable = 0;
+
if (cacheable) {
- slap_callback *cb;
- struct search_info *si;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1,
- "QUERY CACHEABLE\n", 0, 0, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY, "QUERY CACHEABLE\n", 0, 0, 0 );
-#endif /* !NEW_LOGGING */
- query.filter = str2filter(op->ors_filterstr.bv_val);
- if (op->ors_attrs) {
- for ( count=0; op->ors_attrs[ count ].an_name.bv_val; 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; op->ors_attrs[ count ].an_name.bv_val; 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;
- }
- op->o_tmpfree(op->ors_attrs, op->o_tmpmemctx);
- add_filter_attrs(op, &op->ors_attrs, query.attrs, filter_attrs);
+ 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;
+
cb = op->o_tmpalloc( sizeof(*cb) + sizeof(*si), op->o_tmpmemctx);
- cb->sc_next = op->o_callback;
- cb->sc_response = proxy_cache_response;
+ cb->sc_response = pcache_response;
cb->sc_cleanup = NULL;
cb->sc_private = (cb+1);
si = cb->sc_private;
@@ -1445,51 +1335,30 @@ proxy_cache_search(
si->count = 0;
si->head = NULL;
si->tail = NULL;
- op->o_callback = cb;
- } else {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1,
- "QUERY NOT CACHEABLE\n",
- 0, 0, 0);
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY, "QUERY NOT CACHEABLE\n",
- 0, 0, 0);
-#endif /* !NEW_LOGGING */
- }
- free(filter_attrs);
+ if ( cm->response_cb == PCACHE_RESPONSE_CB_HEAD ) {
+ cb->sc_next = op->o_callback;
+ op->o_callback = cb;
- return SLAP_CB_CONTINUE;
-}
+ } else {
+ slap_callback **pcb;
+
+ /* need to move the callback at the end, in case other
+ * overlays are present, so that the final entry is
+ * actually cached */
+ cb->sc_next = NULL;
+ for ( pcb = &op->o_callback; *pcb; pcb = &(*pcb)->sc_next );
+ *pcb = cb;
+ }
-static int
-attrscmp(
- AttributeName* attrs_in,
- AttributeName* attrs)
-{
- int i, count1, count2;
- if ( attrs_in == NULL ) {
- return (attrs ? 0 : 1);
+ } else {
+ Debug( pcache_debug, "QUERY NOT CACHEABLE\n",
+ 0, 0, 0);
}
- 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;
+ op->o_tmpfree( filter_attrs, op->o_tmpmemctx );
- for ( i=0; iattr_sets[i].attrs))
- return i;
+ AttributeName *a2;
+ int found = 1;
+
+ if ( count > 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;
}
- return -1;
+ if ( i == num )
+ i = -1;
+ return i;
}
static void*
@@ -1515,20 +1408,21 @@ consistency_check(
slap_overinst *on = rtask->arg;
cache_manager *cm = on->on_bi.bi_private;
query_manager *qm = cm->qm;
- Operation op = {0};
+ Connection conn = {0};
+ OperationBuffer opbuf;
+ Operation *op;
SlapReply rs = {REP_RESULT};
CachedQuery* query, *query_prev;
int i, return_val, pause = 1;
QueryTemplate* templ;
- op.o_bd = &cm->db;
- op.o_dn = cm->db.be_rootdn;
- op.o_ndn = cm->db.be_rootndn;
- op.o_threadctx = ctx;
+ op = (Operation *) &opbuf;
+ connection_fake_init( &conn, op, ctx );
- op.o_tmpmemctx = sl_mem_create( SLMALLOC_SLAB_SIZE, ctx );
- op.o_tmpmfuncs = &sl_mfuncs;
+ op->o_bd = &cm->db;
+ op->o_dn = cm->db.be_rootdn;
+ op->o_ndn = cm->db.be_rootndn;
cm->cc_arg = arg;
@@ -1536,279 +1430,476 @@ consistency_check(
templ = qm->templates + i;
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)) {
- ldap_pvt_thread_mutex_lock(&qm->lru_mutex);
- remove_query(qm, query);
- ldap_pvt_thread_mutex_unlock(&qm->lru_mutex);
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "Lock CR index = %d\n",
- i, 0, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY, "Lock CR index = %d\n",
+ op->o_time = slap_get_time();
+ while (query && (query->expiry_time < op->o_time)) {
+ Debug( pcache_debug, "Lock CR index = %d\n",
i, 0, 0 );
-#endif /* !NEW_LOGGING */
ldap_pvt_thread_rdwr_wlock(&templ->t_rwlock);
remove_from_template(query, templ);
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1,
- "TEMPLATE %d QUERIES-- %d\n",
+ Debug( pcache_debug, "TEMPLATE %d QUERIES-- %d\n",
i, templ->no_of_queries, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY, "TEMPLATE %d QUERIES-- %d\n",
- i, templ->no_of_queries, 0 );
-#endif /* !NEW_LOGGING */
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "Unlock CR index = %d\n",
- i, 0, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY, "Unlock CR index = %d\n",
+ Debug( pcache_debug, "Unlock CR index = %d\n",
i, 0, 0 );
-#endif /* !NEW_LOGGING */
ldap_pvt_thread_rdwr_wunlock(&templ->t_rwlock);
- return_val = remove_query_data(&op, &rs, &query->q_uuid);
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1,
- "STALE QUERY REMOVED, SIZE=%d\n",
- return_val, 0, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY, "STALE QUERY REMOVED, SIZE=%d\n",
+ 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, 0, 0 );
-#endif /* !NEW_LOGGING */
ldap_pvt_thread_mutex_lock(&cm->cache_mutex);
cm->cur_entries -= return_val;
cm->num_cached_queries--;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "STORED QUERIES = %lu\n",
- cm->num_cached_queries, 0, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY, "STORED QUERIES = %lu\n",
+ Debug( pcache_debug, "STORED QUERIES = %lu\n",
cm->num_cached_queries, 0, 0 );
-#endif /* !NEW_LOGGING */
ldap_pvt_thread_mutex_unlock(&cm->cache_mutex);
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1,
- "STALE QUERY REMOVED, CACHE ="
- "%d entries\n",
- cm->cur_entries, 0, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ANY,
+ Debug( pcache_debug,
"STALE QUERY REMOVED, CACHE ="
"%d entries\n",
cm->cur_entries, 0, 0 );
-#endif /* !NEW_LOGGING */
query_prev = query;
query = query->prev;
free_query(query_prev);
}
- ldap_pvt_thread_mutex_unlock(&cm->remove_mutex);
}
- /* If there were no queries, defer processing for a while */
- if ( pause ) {
- ldap_pvt_thread_mutex_lock( &syncrepl_rq.rq_mutex );
- cm->cc_paused = 1;
- if ( ldap_pvt_runqueue_isrunning( &syncrepl_rq, rtask )) {
- ldap_pvt_runqueue_stoptask( &syncrepl_rq, rtask );
- }
- ldap_pvt_runqueue_resched( &syncrepl_rq, rtask, 1 );
- ldap_pvt_thread_mutex_unlock( &syncrepl_rq.rq_mutex );
+ ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
+ if ( ldap_pvt_runqueue_isrunning( &slapd_rq, rtask )) {
+ ldap_pvt_runqueue_stoptask( &slapd_rq, rtask );
}
+ /* If there were no queries, defer processing for a while */
+ cm->cc_paused = pause;
+ ldap_pvt_runqueue_resched( &slapd_rq, rtask, pause );
+
+ ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
return NULL;
}
#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 );
+
+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> "
+ " bd_info;
+ slap_overinst *on;
+ cache_manager *cm;
+
+ if ( p->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;
+ 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
+ }
- int index, i;
- int num;
+ 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 );
+ return( 1 );
+ }
- if ( strcasecmp( argv[0], "proxycache" ) == 0 ) {
- if ( argc < 6 ) {
- fprintf( stderr, "%s: line %d: missing arguments in \"proxycache"
- " "
- "\"\n", fname, lineno );
+ 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 );
return( 1 );
}
- 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] );
+ 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 );
}
- if ( cm->db.bd_info->bi_db_init( &cm->db ) ) return( 1 );
- cm->max_entries = atoi( argv[2] );
+ 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->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 );
+ 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 );
return( 1 );
}
- cm->num_entries_limit = atoi( argv[4] );
- cm->cc_period = atoi( argv[5] );
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1,
- "Total # of attribute sets to be cached = %d\n",
- cm->numattrsets, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY,
- "Total # of attribute sets to be cached = %d\n",
+ 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->numattrsets, 0, 0 );
-#endif
- 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;
+ 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 );
}
-
- } else if ( strcasecmp( argv[0], "proxyattrset" ) == 0 ) {
- if ( argc < 3 ) {
- fprintf( stderr, "%s: line %d: missing arguments in \"proxyattrset "
- " \"\n", fname, lineno );
+ 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 );
return( 1 );
}
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "Attribute Set # %d\n",
- atoi( argv[1] ), 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "Attribute Set # %d\n",
- atoi( argv[1] ), 0, 0 );
-#endif
- if (atoi(argv[1]) >= cm->numattrsets) {
- fprintf( stderr, "%s; line %d index out of bounds \n",
- fname, lineno );
+
+ 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 );
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++ ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "\t %s\n",
- argv[i], 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "\t %s\n",
- argv[i], 0, 0 );
-#endif
- ber_str2bv( argv[i], 0, 1,
- &attr_name->an_name);
+ 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++ ) {
attr_name->an_desc = NULL;
- slap_bv2ad( &attr_name->an_name,
- &attr_name->an_desc, &text );
+ 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;
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 );
+ 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 );
+ 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 = atoi( argv[2] )) >= cm->numattrsets ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1,
- "%s: line %d, template index invalid\n",
- fname, lineno, 0 );
-#else
- Debug( LDAP_DEBUG_ANY,
- "%s: line %d, template index invalid\n",
- fname, lineno, 0 );
-#endif
+
+ 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 );
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;
- temp->ttl = atoi( argv[3] );
- temp->no_of_queries = 0;
- if ( argv[1] == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1,
- "Templates string not specified "
- "for template %d\n", num, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY,
- "Templates string not specified "
- "for template %d\n", num, 0, 0 );
-#endif
- return 1;
+ 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 );
}
- ber_str2bv( argv[1], 0, 1, &temp->querystr );
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "Template:\n", 0, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "Template:\n", 0, 0, 0 );
-#endif
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, " query template: %s\n",
- temp->querystr.bv_val, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, " query template: %s\n",
+ 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->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",
temp->querystr.bv_val, 0, 0 );
-#endif
temp->attr_set_index = i;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, " attributes: \n", 0, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, " attributes: \n", 0, 0, 0 );
-#endif
+ qm->attr_sets[i].flags |= PC_REFERENCED;
+ Debug( pcache_debug, " attributes: \n", 0, 0, 0 );
if ( ( attrarray = qm->attr_sets[i].attrs ) != NULL ) {
for ( i=0; attrarray[i].an_name.bv_val; i++ )
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1, "\t%s\n",
- attrarray[i].an_name.bv_val, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "\t%s\n",
+ Debug( pcache_debug, "\t%s\n",
attrarray[i].an_name.bv_val, 0, 0 );
-#endif
}
temp++;
temp->querystr.bv_val = NULL;
cm->numtemplates++;
+ break;
+ case PC_RESP:
+ if ( strcasecmp( c->argv[1], "head" ) == 0 ) {
+ cm->response_cb = PCACHE_RESPONSE_CB_HEAD;
+
+ } else if ( strcasecmp( c->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 );
+ 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;
}
- /* anything else */
- else {
- return cm->db.bd_info->bi_db_config( &cm->db, fname, lineno, argc, argv );
- }
- return 0;
+ return rc;
}
static int
-proxy_cache_init(
+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;
+
+ /* 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
+pcache_db_init(
BackendDB *be
)
{
@@ -1822,8 +1913,9 @@ proxy_cache_init(
qm = (query_manager*)ch_malloc(sizeof(query_manager));
cm->db = *be;
- cm->db.be_flags |= SLAP_BFLAG_NO_SCHEMA_CHECK;
+ SLAP_DBFLAGS(&cm->db) |= SLAP_DBFLAG_NO_SCHEMA_CHECK;
cm->db.be_private = NULL;
+ cm->db.be_pcl_mutexp = &cm->db.be_pcl_mutex;
cm->qm = qm;
cm->numattrsets = 0;
cm->numtemplates = 0;
@@ -1832,6 +1924,7 @@ proxy_cache_init(
cm->max_entries = 0;
cm->cur_entries = 0;
cm->max_queries = 10000;
+ cm->response_cb = PCACHE_RESPONSE_CB_TAIL;
cm->cc_period = 1000;
cm->cc_paused = 0;
@@ -1846,40 +1939,93 @@ proxy_cache_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
-proxy_cache_open(
+pcache_db_open(
BackendDB *be
)
{
- slap_overinst *on = (slap_overinst *)be->bd_info;
- cache_manager *cm = on->on_bi.bi_private;
- int rc = 0;
+ 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;
- if ( cm->db.bd_info->bi_db_open ) {
- rc = cm->db.bd_info->bi_db_open( &cm->db );
+ /* 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 ) {
+ return 1;
+ }
}
- ldap_pvt_thread_mutex_lock( &syncrepl_rq.rq_mutex );
- ldap_pvt_runqueue_insert( &syncrepl_rq, cm->cc_period,
- consistency_check, on );
- ldap_pvt_thread_mutex_unlock( &syncrepl_rq.rq_mutex );
+ /* need to inherit something from the original database... */
+ cm->db.be_def_limit = be->be_def_limit;
+ cm->db.be_limits = be->be_limits;
+ cm->db.be_acl = be->be_acl;
+ cm->db.be_dfltaccess = be->be_dfltaccess;
+
+ rc = backend_startup_one( &cm->db );
+
+ /* There is no runqueue in TOOL mode */
+ 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 );
+ 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(): "
+ "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 );
+ return 1;
+ }
+ }
return rc;
}
static int
-proxy_cache_close(
+pcache_db_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, j, rc = 0;
+ int i, rc = 0;
+
+ /* cleanup stuff inherited from the original database... */
+ cm->db.be_limits = NULL;
+ cm->db.be_acl = NULL;
if ( cm->db.bd_info->bi_db_close ) {
rc = cm->db.bd_info->bi_db_close( &cm->db );
@@ -1897,10 +2043,6 @@ proxy_cache_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 );
@@ -1910,153 +2052,88 @@ proxy_cache_close(
}
static int
-proxy_cache_destroy(
+pcache_db_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;
-
- 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(&cm->remove_mutex);
- free( qm );
- free( cm );
- 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;
+ /* 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... */
- 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 ( cm->db.be_private != NULL ) {
+ backend_destroy_one( &cm->db, 0 );
}
- if ( common == numI )
- result = 1;
-
- if ( common == numJ )
- result += 2;
+ ldap_pvt_thread_mutex_destroy( &qm->lru_mutex );
+ ldap_pvt_thread_mutex_destroy( &cm->cache_mutex );
+ free( qm );
+ free( cm );
- return result;
+ return 0;
}
-static slap_overinst proxy_cache;
+static slap_overinst pcache;
-int pcache_init()
+int pcache_initialize()
{
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 ) {
- fprintf( stderr, "AttributeType Load failed %s %s\n",
- ldap_scherr2str(code), err );
+ Debug( LDAP_DEBUG_ANY,
+ "pcache_initialize: 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_initialize: at_add failed %s %s\n",
+ scherr2str(code), err, 0 );
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;
+ 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;
- return overlay_register( &proxy_cache );
+ return overlay_register( &pcache );
}
#if SLAPD_OVER_PROXYCACHE == SLAPD_MOD_DYNAMIC
int init_module(int argc, char *argv[]) {
- return pcache_init();
+ return pcache_initialize();
}
#endif