/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2003-2008 The OpenLDAP Foundation.
+ * Copyright 2003-2009 The OpenLDAP Foundation.
* Portions Copyright 2003 IBM Corporation.
* Portions Copyright 2003 Symas Corporation.
* All rights reserved.
return len;
}
-/* compare the first value in each filter */
-static int pcache_filter_cmp( const void *v1, const void *v2 )
+/* compare the current value in each filter */
+static int pcache_filter_cmp( Filter *f1, Filter *f2 )
{
- const CachedQuery *q1 = v1, *q2 =v2;
int rc, weight1, weight2;
- switch( q1->first->f_choice ) {
+ switch( f1->f_choice ) {
case LDAP_FILTER_PRESENT:
weight1 = 0;
break;
default:
weight1 = 2;
}
- switch( q2->first->f_choice ) {
+ switch( f2->f_choice ) {
case LDAP_FILTER_PRESENT:
weight2 = 0;
break;
rc = weight1 - weight2;
if ( !rc ) {
switch( weight1 ) {
- case 0: return 0;
+ case 0:
+ break;
case 1:
- rc = lex_bvcmp( &q1->first->f_av_value, &q2->first->f_av_value );
+ rc = lex_bvcmp( &f1->f_av_value, &f2->f_av_value );
break;
case 2:
- if ( q1->first->f_choice == LDAP_FILTER_SUBSTRINGS ) {
+ if ( f1->f_choice == LDAP_FILTER_SUBSTRINGS ) {
rc = 0;
- if ( !BER_BVISNULL( &q1->first->f_sub_initial )) {
- if ( !BER_BVISNULL( &q2->first->f_sub_initial )) {
- rc = lex_bvcmp( &q1->first->f_sub_initial,
- &q2->first->f_sub_initial );
+ if ( !BER_BVISNULL( &f1->f_sub_initial )) {
+ if ( !BER_BVISNULL( &f2->f_sub_initial )) {
+ rc = lex_bvcmp( &f1->f_sub_initial,
+ &f2->f_sub_initial );
} else {
rc = 1;
}
- } else if ( !BER_BVISNULL( &q2->first->f_sub_initial )) {
+ } else if ( !BER_BVISNULL( &f2->f_sub_initial )) {
rc = -1;
}
if ( rc ) break;
- if ( q1->first->f_sub_any ) {
- if ( q2->first->f_sub_any ) {
- rc = lex_bvcmp( q1->first->f_sub_any,
- q2->first->f_sub_any );
+ if ( f1->f_sub_any ) {
+ if ( f2->f_sub_any ) {
+ rc = lex_bvcmp( f1->f_sub_any,
+ f2->f_sub_any );
} else {
rc = 1;
}
- } else if ( q2->first->f_sub_any ) {
+ } else if ( f2->f_sub_any ) {
rc = -1;
}
if ( rc ) break;
- if ( !BER_BVISNULL( &q1->first->f_sub_final )) {
- if ( !BER_BVISNULL( &q2->first->f_sub_final )) {
- rc = lex_bvcmp( &q1->first->f_sub_final,
- &q2->first->f_sub_final );
+ if ( !BER_BVISNULL( &f1->f_sub_final )) {
+ if ( !BER_BVISNULL( &f2->f_sub_final )) {
+ rc = lex_bvcmp( &f1->f_sub_final,
+ &f2->f_sub_final );
} else {
rc = 1;
}
- } else if ( !BER_BVISNULL( &q2->first->f_sub_final )) {
+ } else if ( !BER_BVISNULL( &f2->f_sub_final )) {
rc = -1;
}
} else {
- rc = lex_bvcmp( &q1->first->f_mr_value,
- &q2->first->f_mr_value );
+ rc = lex_bvcmp( &f1->f_mr_value,
+ &f2->f_mr_value );
}
break;
}
+ if ( !rc ) {
+ f1 = f1->f_next;
+ f2 = f2->f_next;
+ if ( f1 || f2 ) {
+ if ( !f1 )
+ rc = -1;
+ else if ( !f2 )
+ rc = 1;
+ else {
+ while ( f1->f_choice == LDAP_FILTER_AND || f1->f_choice == LDAP_FILTER_OR )
+ f1 = f1->f_and;
+ while ( f2->f_choice == LDAP_FILTER_AND || f2->f_choice == LDAP_FILTER_OR )
+ f2 = f2->f_and;
+ rc = pcache_filter_cmp( f1, f2 );
+ }
+ }
+ }
}
-
return rc;
}
+/* compare filters in each query */
+static int pcache_query_cmp( const void *v1, const void *v2 )
+{
+ const CachedQuery *q1 = v1, *q2 =v2;
+ return pcache_filter_cmp( q1->first, q2->first );
+}
+
/* add query on top of LRU list */
static void
add_query_on_top (query_manager* qm, CachedQuery* qc)
ptr = tavl_end( root, 1 );
dir = TAVL_DIR_LEFT;
} else {
- ptr = tavl_find3( root, &cq, pcache_filter_cmp, &ret );
+ ptr = tavl_find3( root, &cq, pcache_query_cmp, &ret );
dir = (first->f_choice == LDAP_FILTER_GE) ? TAVL_DIR_LEFT :
TAVL_DIR_RIGHT;
}
{
free(qc->q_uuid.bv_val);
filter_free(qc->filter);
+ ldap_pvt_thread_rdwr_destroy( &qc->rwlock );
+ memset(qc, 0, sizeof(*qc));
free(qc);
}
new_cached_query->prev = NULL;
new_cached_query->qbase = qbase;
rc = tavl_insert( &qbase->scopes[query->scope], new_cached_query,
- pcache_filter_cmp, avl_dup_error );
+ pcache_query_cmp, avl_dup_error );
if ( rc == 0 ) {
qbase->queries++;
if (templ->query == NULL)
new_cached_query = find_filter( op, qbase->scopes[query->scope],
query->filter, first );
filter_free( query->filter );
+ query->filter = NULL;
}
Debug( pcache_debug, "TEMPLATE %p QUERIES++ %d\n",
(void *) templ, templ->no_of_queries, 0 );
qc->next->prev = qc->prev;
qc->prev->next = qc->next;
}
- tavl_delete( &qc->qbase->scopes[qc->scope], qc, pcache_filter_cmp );
+ tavl_delete( &qc->qbase->scopes[qc->scope], qc, pcache_query_cmp );
qc->qbase->queries--;
if ( qc->qbase->queries == 0 ) {
avl_delete( &template->qbase, qc->qbase, pcache_dn_cmp );
(*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;
+ (*filter_attrs)[*filter_cnt].an_flags = 0;
BER_BVZERO( &(*filter_attrs)[*filter_cnt+1].an_name );
(*filter_cnt)++;
if ( ad == slap_schema.si_ad_objectClass )
Entry *e;
/* don't return more entries than requested by the client */
- if ( si->slimit && rs->sr_nentries >= si->slimit ) {
+ if ( si->slimit > 0 && rs->sr_nentries >= si->slimit ) {
si->slimit_exceeded = 1;
}
goto over;
}
+ /* check for malformed entries: attrs with no values */
+ {
+ Attribute *a = rs->sr_entry->e_attrs;
+ for (; a; a=a->a_next) {
+ if ( !a->a_numvals ) {
+ Debug( pcache_debug, "%s: query not cacheable because of attrs without values in DN \"%s\" (%s)\n",
+ op->o_log_prefix, rs->sr_entry->e_name.bv_val,
+ a->a_desc->ad_cname.bv_val );
+ goto over;
+ }
+ }
+ }
+
if ( si->count < si->max ) {
si->count++;
e = entry_dup( rs->sr_entry );
(*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);
+ alluser = an_find( *new_attrs, slap_bv_all_user_attrs );
+ allop = an_find( *new_attrs, slap_bv_all_operational_attrs );
j = i;
for ( i=0; i<fattr_cnt; i++ ) {
(*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;
+ (*new_attrs)[j].an_flags = 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;
+ (*new_attrs)[j].an_flags = 0;
j++;
}
BER_BVZERO( &(*new_attrs)[j].an_name );
return rs->sr_err;
}
+ /* pickup runtime ACL changes */
+ cm->db.be_acl = op->o_bd->be_acl;
+
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,
op->o_tmpfree( tempstr.bv_val, op->o_tmpmemctx );
if (answerable) {
- /* 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;
send_ldap_result( op, rs );
} else {
op->o_bd = &cm->db;
- op->o_callback = NULL;
+ if ( cm->response_cb == PCACHE_RESPONSE_CB_TAIL ) {
+ /* The cached entry was already processed by any
+ * other overlays, so don't let it get processed again.
+ */
+ op->o_callback = NULL;
+ }
i = cm->db.bd_info->bi_op_search( op, rs );
}
ldap_pvt_thread_rdwr_runlock(&answerable->rwlock);
si->slimit = 0;
si->slimit_exceeded = 0;
si->caching_reason = PC_IGNORE;
- if ( op->ors_slimit && op->ors_slimit < cm->num_entries_limit ) {
+ if ( op->ors_slimit > 0 && op->ors_slimit < cm->num_entries_limit ) {
si->slimit = op->ors_slimit;
op->ors_slimit = cm->num_entries_limit;
}
/* FIXME: should not hardcode "olcDatabase" here */
bv.bv_len = snprintf( ca->cr_msg, sizeof( ca->cr_msg ),
- "olcDatabase=%s", cm->db.bd_info->bi_type );
+ "olcDatabase=" SLAP_X_ORDERED_FMT "%s",
+ 0, cm->db.bd_info->bi_type );
if ( bv.bv_len >= sizeof( ca->cr_msg ) ) {
return -1;
}
attr_name->an_name = attr_name->an_desc->ad_cname;
}
attr_name->an_oc = NULL;
- attr_name->an_oc_exclude = 0;
+ attr_name->an_flags = 0;
if ( attr_name->an_desc == slap_schema.si_ad_objectClass )
qm->attr_sets[num].flags |= PC_GOT_OC;
attr_name++;
cm->db = *be;
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->db.bd_self = &cm->db;
cm->qm = qm;
cm->numattrsets = 0;
cm->num_entries_limit = 5;
projects / openldap / blobdiff