Sync with HEAD as of 14-March-2004

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

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index eca84dcfeec8675e85dfa9fddf90b9dc0f8505d9..c8e46b6fd33ef51ea43bc2a44472431730ff4fa3 100644 (file)
--- a/servers/slapd/back-bdb/delete.c
+++ b/servers/slapd/back-bdb/delete.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2003 The OpenLDAP Foundation.
+ * Copyright 2000-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40,8 +40,6 @@ bdb_delete( Operation *op, SlapReply *rs )
        u_int32_t       locker = 0;
        DB_LOCK         lock, plock;
 
-       int             noop = 0;
-
        int             num_retries = 0;
 
        Operation* ps_list;
@@ -53,6 +51,9 @@ bdb_delete( Operation *op, SlapReply *rs )
        LDAPControl *ctrls[SLAP_MAX_RESPONSE_CONTROLS];
        int num_ctrls = 0;
 
+       int     parent_is_glue = 0;
+       int parent_is_leaf = 0;
+
 #ifdef NEW_LOGGING
        LDAP_LOG ( OPERATION, ARGS,  "==> bdb_delete: %s\n", op->o_req_dn.bv_val, 0, 0 );
 #else
@@ -82,6 +83,8 @@ retry:        /* transaction retry */
                        rs->sr_text = "internal error";
                        goto return_results;
                }
+               parent_is_glue = 0;
+               parent_is_leaf = 0;
                ldap_pvt_thread_yield();
                bdb_trans_backoff( ++num_retries );
        }
@@ -476,6 +479,39 @@ retry:     /* transaction retry */
                rs->sr_err = LDAP_OTHER;
                goto return_results;
        }
+
+       bdb_cache_find_id( op, lt2, eip->bei_id, &eip, 0, locker, &plock );
+       if ( eip ) p = eip->bei_e;
+       if ( pdn.bv_len != 0 ) {
+               parent_is_glue = is_entry_glue(p);
+               rs->sr_err = bdb_cache_children( op, lt2, p );
+               if ( rs->sr_err != DB_NOTFOUND ) {
+                       switch( rs->sr_err ) {
+                       case DB_LOCK_DEADLOCK:
+                       case DB_LOCK_NOTGRANTED:
+                               goto retry;
+                       case 0:
+                               break;
+                       default:
+#ifdef NEW_LOGGING
+                               LDAP_LOG ( OPERATION, ERR, 
+                                       "<=- bdb_delete: has_children failed %s (%d)\n",
+                                       db_strerror(rs->sr_err), rs->sr_err, 0 );
+#else
+                               Debug(LDAP_DEBUG_ARGS,
+                                       "<=- bdb_delete: has_children failed: %s (%d)\n",
+                                       db_strerror(rs->sr_err), rs->sr_err, 0 );
+#endif
+                               rs->sr_err = LDAP_OTHER;
+                               rs->sr_text = "internal error";
+                               goto return_results;
+                       }
+                       parent_is_leaf = 1;
+               }
+               bdb_unlocked_cache_return_entry_r(&bdb->bi_cache, p);
+               p = NULL;
+       }
+
        if ( TXN_COMMIT( lt2, 0 ) != 0 ) {
                rs->sr_err = LDAP_OTHER;
                rs->sr_text = "txn_commit(2) failed";
@@ -505,8 +541,8 @@ retry:      /* transaction retry */
                if ( ( rs->sr_err = TXN_ABORT( ltid ) ) != 0 ) {
                        rs->sr_text = "txn_abort (no-op) failed";
                } else {
-                       noop = 1;
-                       rs->sr_err = LDAP_SUCCESS;
+                       rs->sr_err = LDAP_NO_OPERATION;
+                       goto return_results;
                }
        } else {
                bdb_cache_delete( &bdb->bi_cache, e, bdb->bi_dbenv,
@@ -519,7 +555,7 @@ retry:      /* transaction retry */
                        }
                }
 
-               if ( rs->sr_err == LDAP_SUCCESS && !noop && !op->o_no_psearch ) {
+               if ( rs->sr_err == LDAP_SUCCESS && !op->o_no_psearch ) {
                        ldap_pvt_thread_rdwr_rlock( &bdb->bi_pslist_rwlock );
                        LDAP_LIST_FOREACH( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
                                bdb_psearch( op, rs, ps_list, e, LDAP_PSEARCH_BY_DELETE );
@@ -536,7 +572,8 @@ retry:      /* transaction retry */
 #ifdef NEW_LOGGING
                LDAP_LOG ( OPERATION, ERR, 
                        "bdb_delete: txn_%s failed: %s (%d)\n",
-                       op->o_noop ? "abort (no-op)" : "commit", db_strerror(rs->sr_err), rs->sr_err );
+                       op->o_noop ? "abort (no-op)" : "commit",
+                       db_strerror(rs->sr_err), rs->sr_err );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "bdb_delete: txn_%s failed: %s (%d)\n",
@@ -552,7 +589,8 @@ retry:      /* transaction retry */
 #ifdef NEW_LOGGING
        LDAP_LOG ( OPERATION, RESULTS, 
                "bdb_delete: deleted%s id=%08lx db=\"%s\"\n",
-               op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn );
+               op->o_noop ? " (no-op)" : "",
+               e->e_id, e->e_dn );
 #else
        Debug( LDAP_DEBUG_TRACE,
                "bdb_delete: deleted%s id=%08lx dn=\"%s\"\n",
@@ -566,12 +604,16 @@ retry:    /* transaction retry */
 return_results:
        send_ldap_result( op, rs );
 
-       if(rs->sr_err == LDAP_SUCCESS && bdb->bi_txn_cp ) {
+       if( rs->sr_err == LDAP_SUCCESS && bdb->bi_txn_cp ) {
                ldap_pvt_thread_yield();
                TXN_CHECKPOINT( bdb->bi_dbenv,
                        bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 );
        }
 
+       if ( rs->sr_err == LDAP_SUCCESS && parent_is_glue && parent_is_leaf ) {
+               op->o_delete_glue_parent = 1;
+       }
+
 done:
        /* free entry */
        if( e != NULL ) {
@@ -588,5 +630,5 @@ done:
                op->o_private = NULL;
        }
 
-       return ( ( rs->sr_err == LDAP_SUCCESS ) ? noop : rs->sr_err );
+       return rs->sr_err;
 }