Fix prev commit

[openldap] / servers / slapd / overlays / pcache.c

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index b34a088bd7719df505ea4c458aba69adfdbc1b71..8c3829bb733ceb66ea1e44fdfb14cc52c7a2f44a 100644 (file)
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -70,7 +70,7 @@ typedef struct query_template_s {
        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 */
-        ldap_pvt_thread_rdwr_t t_rwlock; /* Rd/wr lock for accessing queries in the template */
+       ldap_pvt_thread_rdwr_t *t_rwlock; /* Rd/wr lock for accessing queries in the template */
 } QueryTemplate;
 
 /*
@@ -417,7 +417,6 @@ strings_containment(struct berval* stored, struct berval* incoming)
 static int
 substr_containment_substr(Operation *op, Filter* stored, Filter* incoming)
 {
-       int i;
        int rc = 0;
 
        struct berval init_incoming;
@@ -496,7 +495,7 @@ query_containment(Operation *op, query_manager *qm,
        if (inputf != NULL) {
                Debug( pcache_debug, "Lock QC index = %d\n",
                                template_index, 0, 0 );
-               ldap_pvt_thread_rdwr_rlock(&(templa[template_index].t_rwlock));
+               ldap_pvt_thread_rdwr_rlock(templa[template_index].t_rwlock);
                for(qc=templa[template_index].query; qc != NULL; qc= qc->next) {
                        q = (Query*)qc;
                        if(base_scope_compare(&(q->base), base, q->scope, scope)) {
@@ -524,7 +523,7 @@ query_containment(Operation *op, query_manager *qm,
                                                        &(fi->f_ava->aa_value),
                                                        &(fs->f_ava->aa_value), &text);
                                                if (rc != LDAP_SUCCESS) {
-                                                       ldap_pvt_thread_rdwr_runlock(&(templa[template_index].t_rwlock));
+                                                       ldap_pvt_thread_rdwr_runlock(templa[template_index].t_rwlock);
                                                        Debug( pcache_debug,
                                                        "Unlock: Exiting QC index=%d\n",
                                                        template_index, 0, 0 );
@@ -566,13 +565,13 @@ query_containment(Operation *op, query_manager *qm,
                                                fi=fi->f_next;
                                                break;
                                        case LDAP_FILTER_GE:
-                                               if (ret >= 0)
+                                               if (mrule && ret >= 0)
                                                        res = 1;
                                                fs=fs->f_next;
                                                fi=fi->f_next;
                                                break;
                                        case LDAP_FILTER_LE:
-                                               if (ret <= 0)
+                                               if (mrule && ret <= 0)
                                                        res = 1;
                                                fs=fs->f_next;
                                                fi=fi->f_next;
@@ -599,7 +598,7 @@ query_containment(Operation *op, query_manager *qm,
                Debug( pcache_debug,
                        "Not answerable: Unlock QC index=%d\n",
                        template_index, 0, 0 );
-               ldap_pvt_thread_rdwr_runlock(&(templa[template_index].t_rwlock));
+               ldap_pvt_thread_rdwr_runlock(templa[template_index].t_rwlock);
        }
        return NULL;
 }
@@ -608,7 +607,6 @@ static void
 free_query (CachedQuery* qc)
 {
        Query* q = (Query*)qc;
-       int i;
 
        free(qc->q_uuid.bv_val);
        filter_free(q->filter);
@@ -650,7 +648,7 @@ static void add_query(
        /* Adding a query    */
        Debug( pcache_debug, "Lock AQ index = %d\n",
                        template_index, 0, 0 );
-       ldap_pvt_thread_rdwr_wlock(&templ->t_rwlock);
+       ldap_pvt_thread_rdwr_wlock(templ->t_rwlock);
        if (templ->query == NULL)
                templ->query_last = new_cached_query;
        else
@@ -664,7 +662,7 @@ static void add_query(
 
        Debug( pcache_debug, "Unlock AQ index = %d \n",
                        template_index, 0, 0 );
-       ldap_pvt_thread_rdwr_wunlock(&templ->t_rwlock);
+       ldap_pvt_thread_rdwr_wunlock(templ->t_rwlock);
 
        /* Adding on top of LRU list  */
        ldap_pvt_thread_mutex_lock(&qm->lru_mutex);
@@ -719,12 +717,12 @@ static void cache_replacement(query_manager* qm, struct berval *result)
        bottom->q_uuid.bv_val = NULL;
 
        Debug( pcache_debug, "Lock CR index = %d\n", temp_id, 0, 0 );
-       ldap_pvt_thread_rdwr_wlock(&(qm->templates[temp_id].t_rwlock));
+       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",
                temp_id, qm->templates[temp_id].no_of_queries, 0 );
        Debug( pcache_debug, "Unlock CR index = %d\n", temp_id, 0, 0 );
-       ldap_pvt_thread_rdwr_wunlock(&(qm->templates[temp_id].t_rwlock));
+       ldap_pvt_thread_rdwr_wunlock(qm->templates[temp_id].t_rwlock);
        free_query(bottom);
 }
 
@@ -1205,8 +1203,6 @@ 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;
@@ -1219,7 +1215,6 @@ pcache_op_search(
        int             cacheable = 0;
        int             fattr_cnt=0;
        int             fattr_got_oc = 0;
-       int             oc_attr_absent = 1;
 
        struct berval tempstr;
 
@@ -1278,7 +1273,7 @@ pcache_op_search(
 
                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);
+               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;
@@ -1301,6 +1296,9 @@ 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;
@@ -1424,13 +1422,13 @@ consistency_check(
                while (query && (query->expiry_time < op->o_time)) {
                        Debug( pcache_debug, "Lock CR index = %d\n",
                                        i, 0, 0 );
-                       ldap_pvt_thread_rdwr_wlock(&templ->t_rwlock);
+                       ldap_pvt_thread_rdwr_wlock(templ->t_rwlock);
                        remove_from_template(query, templ);
                        Debug( pcache_debug, "TEMPLATE %d QUERIES-- %d\n",
                                        i, templ->no_of_queries, 0 );
                        Debug( pcache_debug, "Unlock CR index = %d\n",
                                        i, 0, 0 );
-                       ldap_pvt_thread_rdwr_wunlock(&templ->t_rwlock);
+                       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);
@@ -1804,7 +1802,8 @@ pc_cf_gen( ConfigArgs *c )
                qm->templates = ( QueryTemplate* )ch_realloc( qm->templates,
                                ( num + 2 ) * sizeof( QueryTemplate ));
                temp = qm->templates + num;
-               ldap_pvt_thread_rdwr_init( &temp->t_rwlock );
+               temp->t_rwlock = ch_malloc( sizeof( ldap_pvt_thread_rdwr_t ) );
+               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\"",
@@ -2011,7 +2010,7 @@ pcache_db_close(
        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;
@@ -2027,7 +2026,8 @@ pcache_db_close(
                        free_query( qc );
                }
                free( qm->templates[i].querystr.bv_val );
-               ldap_pvt_thread_rdwr_destroy( &qm->templates[i].t_rwlock );
+               ldap_pvt_thread_rdwr_destroy( qm->templates[i].t_rwlock );
+               ch_free( qm->templates[i].t_rwlock );
        }
        free( qm->templates );
        qm->templates = NULL;