Added LDAP_LOG messages

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

diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c
index 992fb7346b52aac83fdf5387e712e64d72751173..bcec7c7c5525b977906c0e4d46cf236f366ee8ae 100644 (file)
--- a/servers/slapd/back-bdb/tools.c
+++ b/servers/slapd/back-bdb/tools.c
@@ -1,7 +1,7 @@
 /* tools.c - tools for slap tools */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -112,83 +112,105 @@ Entry* bdb_tool_entry_get( BackendDB *be, ID id )
 
 ID bdb_tool_entry_put(
        BackendDB *be,
-       Entry *e )
+       Entry *e,
+       struct berval *text )
 {
        int rc;
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
        DB_TXN *tid = NULL;
-       char *pdn;
+       struct berval pdn;
 
        assert( be != NULL );
        assert( slapMode & SLAP_TOOL_MODE );
 
+       assert( text );
+       assert( text->bv_val );
+       assert( text->bv_val[0] == '\0' );
+
        Debug( LDAP_DEBUG_TRACE, "=> bdb_tool_entry_put( %ld, \"%s\" )\n",
                (long) e->e_id, e->e_dn, 0 );
 
-       if( bdb->bi_txn ) {
-               rc = txn_begin( bdb->bi_dbenv, NULL, &tid, 
-                       bdb->bi_db_opflags );
-               if( rc != 0 ) {
-                       Debug( LDAP_DEBUG_ANY,
-                               "=> bdb_tool_entry_put: txn_begin failed: %s (%d)\n",
-                               db_strerror(rc), rc, 0 );
-                       return NOID;
-               }
+       rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &tid, 
+               bdb->bi_db_opflags );
+       if( rc != 0 ) {
+               snprintf( text->bv_val, text->bv_len,
+                       "txn_begin failed: %s (%d)",
+                       db_strerror(rc), rc );
+               Debug( LDAP_DEBUG_ANY,
+                       "=> bdb_tool_entry_put: %s\n",
+                        text->bv_val, 0, 0 );
+               return NOID;
        }
 
        rc = bdb_next_id( be, tid, &e->e_id );
        if( rc != 0 ) {
+               snprintf( text->bv_val, text->bv_len,
+                               "next_id failed: %s (%d)",
+                               db_strerror(rc), rc );
                Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_put: next_id failed: %s (%d)\n",
-                       db_strerror(rc), rc, 0 );
+                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
                goto done;
        }
 
        /* add dn2id indices */
-       pdn = dn_parent( be, e->e_ndn );
-       rc = bdb_dn2id_add( be, tid, pdn, e );
+       if ( be_issuffix( be, &e->e_nname ) ) {
+               pdn = slap_empty_bv;
+       } else {
+               dnParent( &e->e_nname, &pdn );
+       }
+       rc = bdb_dn2id_add( be, tid, &pdn, e );
        if( rc != 0 ) {
+               snprintf( text->bv_val, text->bv_len, 
+                               "dn2id_add failed: %s (%d)",
+                               db_strerror(rc), rc );
                Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_put: dn2id_add failed: %s (%d)\n",
-                       db_strerror(rc), rc, 0 );
+                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
                goto done;
        }
 
        /* id2entry index */
        rc = bdb_id2entry_add( be, tid, e );
        if( rc != 0 ) {
+               snprintf( text->bv_val, text->bv_len,
+                               "id2entry_add failed: %s (%d)",
+                               db_strerror(rc), rc );
                Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_put: id2entry_add failed: %s (%d)\n",
-                       db_strerror(rc), rc, 0 );
+                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
                goto done;
        }
 
        rc = bdb_index_entry_add( be, tid, e, e->e_attrs );
        if( rc != 0 ) {
+               snprintf( text->bv_val, text->bv_len,
+                               "index_entry_add failed: %s (%d)",
+                               db_strerror(rc), rc );
                Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_put: index_entry_add failed: %s (%d)\n",
-                       db_strerror(rc), rc, 0 );
+                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
                goto done;
        }
 
 done:
-       if( bdb->bi_txn ) {
-               if( rc == 0 ) {
-                       rc = txn_commit( tid, 0 );
-                       if( rc != 0 ) {
-                               Debug( LDAP_DEBUG_ANY,
-                                       "=> bdb_tool_entry_put: txn_commit failed: %s (%d)\n",
-                                       db_strerror(rc), rc, 0 );
-                               e->e_id = NOID;
-                       }
-
-               } else {
-                       txn_abort( tid );
+       if( rc == 0 ) {
+               rc = TXN_COMMIT( tid, 0 );
+               if( rc != 0 ) {
+                       snprintf( text->bv_val, text->bv_len,
+                                       "txn_commit failed: %s (%d)",
+                                       db_strerror(rc), rc );
                        Debug( LDAP_DEBUG_ANY,
-                               "=> bdb_tool_entry_put: txn_aborted! %s (%d)\n",
-                               db_strerror(rc), rc, 0 );
+                               "=> bdb_tool_entry_put: %s\n",
+                               text->bv_val, 0, 0 );
                        e->e_id = NOID;
                }
+
+       } else {
+               TXN_ABORT( tid );
+               snprintf( text->bv_val, text->bv_len,
+                       "txn_aborted! %s (%d)",
+                       db_strerror(rc), rc );
+               Debug( LDAP_DEBUG_ANY,
+                       "=> bdb_tool_entry_put: %s\n",
+                       text->bv_val, 0, 0 );
+               e->e_id = NOID;
        }
 
        return e->e_id;
@@ -202,7 +224,7 @@ int bdb_tool_entry_reindex(
        int rc;
        Entry *e;
        DB_TXN *tid = NULL;
-       char *pdn;
+       struct berval pdn;
 
        Debug( LDAP_DEBUG_ARGS, "=> bdb_tool_entry_reindex( %ld )\n",
                (long) id, 0, 0 );
@@ -216,14 +238,12 @@ int bdb_tool_entry_reindex(
                return -1;
        }
 
-       if( bi->bi_txn ) {
-               rc = txn_begin( bi->bi_dbenv, NULL, &tid, bi->bi_db_opflags );
-               if( rc != 0 ) {
-                       Debug( LDAP_DEBUG_ANY,
-                               "=> bdb_tool_entry_reindex: txn_begin failed: %s (%d)\n",
-                               db_strerror(rc), rc, 0 );
-                       goto done;
-               }
+       rc = TXN_BEGIN( bi->bi_dbenv, NULL, &tid, bi->bi_db_opflags );
+       if( rc != 0 ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "=> bdb_tool_entry_reindex: txn_begin failed: %s (%d)\n",
+                       db_strerror(rc), rc, 0 );
+               goto done;
        }
        
        /*
@@ -237,8 +257,12 @@ int bdb_tool_entry_reindex(
                (long) id, e->e_dn, 0 );
 
        /* add dn2id indices */
-       pdn = dn_parent( be, e->e_ndn );
-       rc = bdb_dn2id_add( be, tid, pdn, e );
+       if ( be_issuffix( be, &e->e_nname ) ) {
+               pdn = slap_empty_bv;
+       } else {
+               dnParent( &e->e_nname, &pdn );
+       }
+       rc = bdb_dn2id_add( be, tid, &pdn, e );
        if( rc != 0 && rc != DB_KEYEXIST ) {
                Debug( LDAP_DEBUG_ANY,
                        "=> bdb_tool_entry_reindex: dn2id_add failed: %s (%d)\n",
@@ -249,23 +273,21 @@ int bdb_tool_entry_reindex(
        rc = bdb_index_entry_add( be, tid, e, e->e_attrs );
 
 done:
-       if( bi->bi_txn ) {
-               if( rc == 0 ) {
-                       rc = txn_commit( tid, 0 );
-                       if( rc != 0 ) {
-                               Debug( LDAP_DEBUG_ANY,
-                                       "=> bdb_tool_entry_reindex: txn_commit failed: %s (%d)\n",
-                                       db_strerror(rc), rc, 0 );
-                               e->e_id = NOID;
-                       }
-
-               } else {
-                       txn_abort( tid );
+       if( rc == 0 ) {
+               rc = TXN_COMMIT( tid, 0 );
+               if( rc != 0 ) {
                        Debug( LDAP_DEBUG_ANY,
-                               "=> bdb_tool_entry_reindex: txn_aborted! %s (%d)\n",
+                               "=> bdb_tool_entry_reindex: txn_commit failed: %s (%d)\n",
                                db_strerror(rc), rc, 0 );
                        e->e_id = NOID;
                }
+
+       } else {
+               TXN_ABORT( tid );
+               Debug( LDAP_DEBUG_ANY,
+                       "=> bdb_tool_entry_reindex: txn_aborted! %s (%d)\n",
+                       db_strerror(rc), rc, 0 );
+               e->e_id = NOID;
        }
 
        return rc;