Sync with HEAD as of 14-March-2004

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

diff --git a/servers/slapd/back-bdb/modrdn.c b/servers/slapd/back-bdb/modrdn.c
index f1d58647f8faa3e1a5ee9c471de67e117f2a1818..ecef5038d838e646178be98018fcde95d77b2854 100644 (file)
--- a/servers/slapd/back-bdb/modrdn.c
+++ b/servers/slapd/back-bdb/modrdn.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
@@ -58,8 +58,6 @@ bdb_modrdn( Operation *op, SlapReply *rs )
        u_int32_t       locker = 0;
        DB_LOCK         lock, plock, nplock;
 
-       int             noop = 0;
-
        int             num_retries = 0;
 
        LDAPControl *ctrls[SLAP_MAX_RESPONSE_CONTROLS];
@@ -72,6 +70,9 @@ bdb_modrdn( Operation *op, SlapReply *rs )
        Entry           *ctxcsn_e;
        int                     ctxcsn_added = 0;
 
+       int parent_is_glue = 0;
+       int parent_is_leaf = 0;
+
 #ifdef NEW_LOGGING
        LDAP_LOG ( OPERATION, ENTRY, "==>bdb_modrdn(%s,%s,%s)\n", 
                op->o_req_dn.bv_val,op->oq_modrdn.rs_newrdn.bv_val,
@@ -118,6 +119,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 );
        }
@@ -954,6 +957,39 @@ retry:     /* transaction retry */
                rs->sr_text = "entry update failed";
                goto return_results;
        }
+
+       bdb_cache_find_id( op, lt2, eip->bei_id, &eip, 0, locker, &plock );
+    if ( eip ) p = eip->bei_e;
+    if ( p_ndn.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_modrdn: has_children failed %s (%d)\n",
+                    db_strerror(rs->sr_err), rs->sr_err, 0 );
+#else
+                Debug(LDAP_DEBUG_ARGS,
+                    "<=- bdb_modrdn: 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";
@@ -975,8 +1011,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;
+                       goto return_results;
                }
 
        } else {
@@ -990,7 +1026,7 @@ retry:     /* transaction retry */
                        }
                }
 
-               if ( rs->sr_err == LDAP_SUCCESS && !op->o_noop ) {
+               if ( rs->sr_err == LDAP_SUCCESS ) {
                        /* Loop through in-scope entries for each psearch spec */
                        ldap_pvt_thread_rdwr_rlock( &bdb->bi_pslist_rwlock );
                        LDAP_LIST_FOREACH ( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
@@ -1034,11 +1070,13 @@ retry:  /* transaction retry */
 #ifdef NEW_LOGGING
        LDAP_LOG ( OPERATION, RESULTS, 
                "bdb_modrdn: rdn modified%s id=%08lx dn=\"%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_modrdn: rdn modified%s id=%08lx dn=\"%s\"\n",
-               op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn );
+               op->o_noop ? " (no-op)" : "",
+               e->e_id, e->e_dn );
 #endif
        rs->sr_text = NULL;
        if( num_ctrls ) rs->sr_ctrls = ctrls;
@@ -1051,6 +1089,10 @@ return_results:
                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:
        if( new_dn.bv_val != NULL ) free( new_dn.bv_val );
@@ -1106,5 +1148,5 @@ done:
                op->o_private = NULL;
        }
 
-       return ( ( rs->sr_err == LDAP_SUCCESS ) ? noop : rs->sr_err );
+       return rs->sr_err;
 }