ITS#2449, broken NOT filters

[openldap] / servers / slapd / back-bdb / id2entry.c

diff --git a/servers/slapd/back-bdb/id2entry.c b/servers/slapd/back-bdb/id2entry.c
index dbfe6102f31fcd21e3ad5a762c72d08e03e09653..e4bc3df9bc42c72ade5e1017f936d5c3ddd31b4a 100644 (file)
--- a/servers/slapd/back-bdb/id2entry.c
+++ b/servers/slapd/back-bdb/id2entry.c
@@ -76,14 +76,11 @@ int bdb_id2entry_update(
        return bdb_id2entry_put(be, tid, e, 0);
 }
 
-int bdb_id2entry_rw(
+int bdb_id2entry(
        BackendDB *be,
        DB_TXN *tid,
        ID id,
-       Entry **e,
-       int rw,
-       u_int32_t locker,
-       DB_LOCK *lock )
+       Entry **e )
 {
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
        DB *db = bdb->bi_id2entry->bdi_db;
@@ -100,12 +97,8 @@ int bdb_id2entry_rw(
        DBTzero( &data );
        data.flags = DB_DBT_MALLOC;
 
-       if ((*e = bdb_cache_find_entry_id(bdb->bi_dbenv, &bdb->bi_cache, id, rw, locker, lock)) != NULL) {
-               return 0;
-       }
-
        /* fetch it */
-       rc = db->get( db, tid, &key, &data, bdb->bi_db_opflags | ( rw ? DB_RMW : 0 ));
+       rc = db->get( db, tid, &key, &data, bdb->bi_db_opflags );
 
        if( rc != 0 ) {
                return rc;
@@ -128,38 +121,6 @@ int bdb_id2entry_rw(
 #ifdef BDB_HIER
                bdb_fix_dn(be, id, *e);
 #endif
-               ret = bdb_cache_add_entry_rw( bdb->bi_dbenv,
-                               &bdb->bi_cache, *e, rw, locker, lock);
-               while ( ret == 1 || ret == -1 ) {
-                       Entry *ee;
-                       int add_loop_cnt = 0;
-                       if ( (*e)->e_private != NULL ) {
-                               free ((*e)->e_private);
-                       }
-                       (*e)->e_private = NULL;
-                       if ( (ee = bdb_cache_find_entry_id
-                                       (bdb->bi_dbenv, &bdb->bi_cache, id, rw, locker, lock) ) != NULL) {
-                               bdb_entry_return ( *e );
-                               *e = ee;
-                               return 0;
-                       }
-                       if ( ++add_loop_cnt == BDB_MAX_ADD_LOOP ) {
-                               bdb_entry_return ( *e );
-                               *e = NULL;
-                               return LDAP_BUSY;
-                       }
-               }
-               if ( ret != 0 ) {
-                       if ( (*e)->e_private != NULL )
-                               free ( (*e)->e_private );
-                       bdb_entry_return( *e );
-                       *e = NULL;
-               }
-               rc = ret;
-       }
-
-       if (rc == 0) {
-               bdb_cache_entry_commit(*e);
        }
 
        return rc;
@@ -175,8 +136,6 @@ int bdb_id2entry_delete(
        DBT key;
        int rc;
 
-       bdb_cache_delete_entry(&bdb->bi_cache, e);
-
        DBTzero( &key );
        key.data = (char *) &e->e_id;
        key.size = sizeof(ID);
@@ -205,18 +164,6 @@ int bdb_entry_return(
        if( (void *) e->e_attrs != (void *) (e+1)) {
                attrs_free( e->e_attrs );
        }
-#if defined(SLAP_NVALUES) && !defined(SLAP_NVALUES_ON_DISK)
-       else {
-               /* nvals are not contiguous with the rest. oh well. */
-               Attribute *a;
-               for (a = e->e_attrs; a; a=a->a_next) {
-                       if (a->a_nvals != a->a_vals) {
-                               ber_bvarray_free( a->a_nvals );
-                               a->a_nvals = NULL;
-                       }
-               }
-       }
-#endif
 
 #ifndef BDB_HIER
        /* See if the DNs were changed by modrdn */
@@ -244,13 +191,11 @@ int bdb_entry_return(
 }
 
 int bdb_entry_release(
-       BackendDB *be,
-       Connection *c,
        Operation *o,
        Entry *e,
        int rw )
 {
-       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+       struct bdb_info *bdb = (struct bdb_info *) o->o_bd->be_private;
        struct bdb_op_info *boi = NULL;
  
        /* slapMode : SLAP_SERVER_MODE, SLAP_TOOL_MODE,
@@ -266,7 +211,7 @@ int bdb_entry_release(
                        bdb_unlocked_cache_return_entry_rw( &bdb->bi_cache, e, rw );
                } else {
                        bdb_cache_return_entry_rw( bdb->bi_dbenv, &bdb->bi_cache, e, rw, &boi->boi_lock );
-                       ch_free( boi );
+                       sl_free( boi, o->o_tmpmemctx );
                        o->o_private = NULL;
                }
        } else {
@@ -282,8 +227,6 @@ int bdb_entry_release(
 /* return LDAP_SUCCESS IFF we can retrieve the specified entry.
  */
 int bdb_entry_get(
-       BackendDB *be,
-       Connection *c,
        Operation *op,
        struct berval *ndn,
        ObjectClass *oc,
@@ -291,10 +234,11 @@ int bdb_entry_get(
        int rw,
        Entry **ent )
 {
-       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+       struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
        struct bdb_op_info *boi = NULL;
        DB_TXN *txn = NULL;
        Entry *e;
+       EntryInfo *ei;
        int     rc;
        const char *at_name = at->ad_cname.bv_val;
 
@@ -317,7 +261,7 @@ int bdb_entry_get(
 #endif
 
        if( op ) boi = (struct bdb_op_info *) op->o_private;
-       if( boi != NULL && be == boi->boi_bdb ) {
+       if( boi != NULL && op->o_bd == boi->boi_bdb ) {
                txn = boi->boi_txn;
                locker = boi->boi_locker;
        }
@@ -337,7 +281,7 @@ int bdb_entry_get(
 
 dn2entry_retry:
        /* can we find entry */
-       rc = bdb_dn2entry_rw( be, txn, ndn, &e, NULL, 0, rw, locker, &lock );
+       rc = bdb_dn2entry( op->o_bd, txn, ndn, &ei, 0, locker, &lock, op->o_tmpmemctx );
        switch( rc ) {
        case DB_NOTFOUND:
        case 0:
@@ -358,6 +302,7 @@ dn2entry_retry:
                }
                return (rc != LDAP_BUSY) ? LDAP_OTHER : LDAP_BUSY;
        }
+       if (ei) e = ei->bei_e;
        if (e == NULL) {
 #ifdef NEW_LOGGING
                LDAP_LOG( BACK_BDB, INFO, 
@@ -433,7 +378,7 @@ return_results:
                 * release it later??
                 */
                if ( op && !boi ) {
-                       boi = ch_calloc(1,sizeof(struct bdb_op_info));
+                       boi = sl_calloc(1,sizeof(struct bdb_op_info),op->o_tmpmemctx);
                        boi->boi_lock = lock;
                        op->o_private = boi;
                }