/* $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.
unsigned long num_cached_queries; /* total number of cached queries */
unsigned long max_queries; /* upper bound on # of cached queries */
int save_queries; /* save cached queries across restarts */
+ int check_cacheability; /* check whether a query is cacheable */
int numattrsets; /* number of attribute sets */
int cur_entries; /* current number of entries cached */
int max_entries; /* max number of entries cached */
{
struct berval bv_scope,
bv_filter;
- char attrset_buf[ 32 ],
- expiry_buf[ 32 ],
+ char attrset_buf[ LDAP_PVT_INTTYPE_CHARS( unsigned long ) ],
+ expiry_buf[ LDAP_PVT_INTTYPE_CHARS( unsigned long ) ],
*ptr;
ber_len_t attrset_len,
expiry_len;
ldap_pvt_scope2bv( q->scope, &bv_scope );
filter2bv_x( op, q->filter, &bv_filter );
- attrset_len = snprintf( attrset_buf, sizeof( attrset_buf ),
+ attrset_len = sprintf( attrset_buf,
"%lu", (unsigned long)q->qtemp->attr_set_index );
- expiry_len = snprintf( expiry_buf, sizeof( expiry_buf ),
+ expiry_len = sprintf( expiry_buf,
"%lu", (unsigned long)q->expiry_time );
urlbv->bv_len = STRLENOF( "ldap:///" )
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;
}
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)
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 f = { 0 };
char filtbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE + STRLENOF( "(entryUUID=)" ) ];
AttributeAssertion ava = ATTRIBUTEASSERTION_INIT;
- AttributeName attrs[ 2 ] = { 0 };
+ AttributeName attrs[ 2 ] = {{{ 0 }}};
int s, rc;
if ( op == NULL ) {
Filter f = { 0 };
char filter_str[ LDAP_LUTIL_UUIDSTR_BUFSIZE + STRLENOF( "(queryId=)" ) ];
AttributeAssertion ava = ATTRIBUTEASSERTION_INIT;
- AttributeName attrs[ 2 ] = { 0 };
+ AttributeName attrs[ 2 ] = {{{ 0 }}};
int rc;
BerVarray vals = NULL;
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;
}
* limit, empty the chain and ignore the rest.
*/
if ( !si->over ) {
+ /* check if the entry contains undefined
+ * attributes/objectClasses (ITS#5680) */
+ if ( cm->check_cacheability && test_filter( op, rs->sr_entry, si->query.filter ) != LDAP_COMPARE_TRUE ) {
+ Debug( pcache_debug, "%s: query not cacheable because of schema issues in DN \"%s\"\n",
+ op->o_log_prefix, rs->sr_entry->e_name.bv_val, 0 );
+ 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 );
si->tail = e;
} else {
+over:;
si->over = 1;
si->count = 0;
for (;si->head; si->head=e) {
(*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++ ) {
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,
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;
}
"( OLcfgOvAt:2.6 NAME 'olcProxySaveQueries' "
"DESC 'Save cached queries for hot restart' "
"SYNTAX OMsBoolean )", NULL, NULL },
+ { "proxyCheckCacheability", "TRUE|FALSE",
+ 2, 2, 0, ARG_ON_OFF|ARG_OFFSET, (void *)offsetof(cache_manager, check_cacheability),
+ "( OLcfgOvAt:2.7 NAME 'olcProxyCheckCacheability' "
+ "DESC 'Check whether the results of a query are cacheable, e.g. for schema issues' "
+ "SYNTAX OMsBoolean )", NULL, NULL },
{ NULL, NULL, 0, 0, 0, ARG_IGNORED }
};
-/* Need to no-op this keyword for dynamic config */
-static ConfigTable pcdummy[] = {
- { "", "", 0, 0, 0, ARG_IGNORED,
- NULL, "( OLcfgGlAt:13 NAME 'olcDatabase' "
- "DESC 'The backend type for a database instance' "
- "SUP olcBackend SINGLE-VALUE X-ORDERED 'SIBLINGS' )", NULL, NULL },
- { NULL, NULL, 0, 0, 0, ARG_IGNORED }
-};
-
static ConfigOCs pcocs[] = {
{ "( OLcfgOvOc:2.1 "
"NAME 'olcPcacheConfig' "
"DESC 'ProxyCache configuration' "
"SUP olcOverlayConfig "
"MUST ( olcProxyCache $ olcProxyAttrset $ olcProxyTemplate ) "
- "MAY ( olcProxyResponseCB $ olcProxyCacheQueries $ olcProxySaveQueries ) )",
+ "MAY ( olcProxyResponseCB $ olcProxyCacheQueries $ olcProxySaveQueries $ olcProxyCheckCacheability ) )",
Cft_Overlay, pccfg, NULL, pc_cfadd },
{ "( OLcfgOvOc:2.2 "
"NAME 'olcPcacheDatabase' "
"DESC 'Cache database configuration' "
- "AUXILIARY )", Cft_Misc, pcdummy, pc_ldadd },
+ "AUXILIARY )", Cft_Misc, olcDatabaseDummy, pc_ldadd },
{ NULL, 0, NULL }
};
/* 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 );
- if ( bv.bv_len < 0 || bv.bv_len >= sizeof( ca->cr_msg ) ) {
+ "olcDatabase=" SLAP_X_ORDERED_FMT "%s",
+ 0, cm->db.bd_info->bi_type );
+ if ( bv.bv_len >= sizeof( ca->cr_msg ) ) {
return -1;
}
bv.bv_val = ca->cr_msg;
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;
cm->cur_entries = 0;
cm->max_queries = 10000;
cm->save_queries = 0;
+ cm->check_cacheability = 0;
cm->response_cb = PCACHE_RESPONSE_CB_TAIL;
cm->defer_db_open = 1;
cm->cc_period = 1000;
BerVarray vals = NULL;
Filter f = { 0 }, f2 = { 0 };
AttributeAssertion ava = ATTRIBUTEASSERTION_INIT;
- AttributeName attrs[ 2 ] = { 0 };
+ AttributeName attrs[ 2 ] = {{{ 0 }}};
connection_fake_init( &conn, &opbuf, thrctx );
op = &opbuf.ob_op;
slap_callback cb = { 0 };
SlapReply rs = { REP_RESULT };
- Modifications mod = { 0 };
+ Modifications mod = {{ 0 }};
thrctx = ldap_pvt_thread_pool_context();
struct berval uuid = BER_BVNULL,
*uuidp = NULL;
- char buf[ SLAP_TEXT_BUFLEN ] = { '\0' };
- int len = 0;
+ char buf[ SLAP_TEXT_BUFLEN ];
+ unsigned len;
ber_tag_t tag = LBER_DEFAULT;
if ( LogTest( LDAP_DEBUG_STATS ) ) {
assert( !BER_BVISNULL( &op->o_req_ndn ) );
len = snprintf( buf, sizeof( buf ), " dn=\"%s\"", op->o_req_ndn.bv_val );
- if ( !BER_BVISNULL( &uuid ) ) {
+ if ( !BER_BVISNULL( &uuid ) && len < sizeof( buf ) ) {
snprintf( &buf[ len ], sizeof( buf ) - len, " queryId=\"%s\"", uuid.bv_val );
}
code = config_register_schema( pccfg, pcocs );
if ( code ) return code;
- {
- const char *text;
- code = slap_str2ad( "olcDatabase", &pcdummy[0].ad, &text );
- if ( code ) return code;
- }
return overlay_register( &pcache );
}