use ldap_charray_*() instead of charray_*()

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

diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c
index a1323405e13c51c135eba755cd4781351aa840e5..1056944ebd255be7170b73275a5ca7b9c41ac04c 100644 (file)
--- a/servers/slapd/back-bdb/tools.c
+++ b/servers/slapd/back-bdb/tools.c
@@ -30,8 +30,6 @@ int bdb_tool_entry_open(
 int bdb_tool_entry_close(
        BackendDB *be )
 {
-       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
-
        assert( be != NULL );
 
        if( key.data ) {
@@ -127,21 +125,28 @@ ID bdb_tool_entry_put(
        assert( text->bv_val );
        assert( text->bv_val[0] == '\0' );
 
+#ifdef NEW_LOGGING
+       LDAP_LOG ( TOOLS, ARGS, "=> bdb_tool_entry_put( %ld, \"%s\" )\n",
+               (long) e->e_id, e->e_dn, 0 );
+#else
        Debug( LDAP_DEBUG_TRACE, "=> bdb_tool_entry_put( %ld, \"%s\" )\n",
                (long) e->e_id, e->e_dn, 0 );
+#endif
 
-       if( bdb->bi_txn ) {
-               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 = 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 );
+#ifdef NEW_LOGGING
+       LDAP_LOG ( TOOLS, ERR, "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY,
+                       "=> bdb_tool_entry_put: %s\n",
+                        text->bv_val, 0, 0 );
+#endif
+               return NOID;
        }
 
        rc = bdb_next_id( be, tid, &e->e_id );
@@ -149,8 +154,13 @@ ID bdb_tool_entry_put(
                snprintf( text->bv_val, text->bv_len,
                                "next_id failed: %s (%d)",
                                db_strerror(rc), rc );
+#ifdef NEW_LOGGING
+               LDAP_LOG ( TOOLS, ERR, 
+                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
+#else
                Debug( LDAP_DEBUG_ANY,
                        "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
+#endif
                goto done;
        }
 
@@ -165,8 +175,13 @@ ID bdb_tool_entry_put(
                snprintf( text->bv_val, text->bv_len, 
                                "dn2id_add failed: %s (%d)",
                                db_strerror(rc), rc );
+#ifdef NEW_LOGGING
+               LDAP_LOG ( TOOLS, ERR, 
+                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
+#else
                Debug( LDAP_DEBUG_ANY,
                        "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
+#endif
                goto done;
        }
 
@@ -176,8 +191,13 @@ ID bdb_tool_entry_put(
                snprintf( text->bv_val, text->bv_len,
                                "id2entry_add failed: %s (%d)",
                                db_strerror(rc), rc );
+#ifdef NEW_LOGGING
+               LDAP_LOG ( TOOLS, ERR, 
+                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
+#else
                Debug( LDAP_DEBUG_ANY,
                        "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
+#endif
                goto done;
        }
 
@@ -186,35 +206,48 @@ ID bdb_tool_entry_put(
                snprintf( text->bv_val, text->bv_len,
                                "index_entry_add failed: %s (%d)",
                                db_strerror(rc), rc );
+#ifdef NEW_LOGGING
+               LDAP_LOG ( TOOLS, ERR, 
+                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
+#else
                Debug( LDAP_DEBUG_ANY,
                        "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
+#endif
                goto done;
        }
 
 done:
-       if( bdb->bi_txn ) {
-               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: %s\n",
-                                       text->bv_val, 0, 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_aborted! %s (%d)",
+                                       "txn_commit failed: %s (%d)",
                                        db_strerror(rc), rc );
+#ifdef NEW_LOGGING
+                       LDAP_LOG ( TOOLS, ERR, 
+                               "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
+#else
                        Debug( LDAP_DEBUG_ANY,
                                "=> bdb_tool_entry_put: %s\n",
                                text->bv_val, 0, 0 );
+#endif
                        e->e_id = NOID;
                }
+
+       } else {
+               TXN_ABORT( tid );
+               snprintf( text->bv_val, text->bv_len,
+                       "txn_aborted! %s (%d)",
+                       db_strerror(rc), rc );
+#ifdef NEW_LOGGING
+               LDAP_LOG ( TOOLS, ERR, 
+                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY,
+                       "=> bdb_tool_entry_put: %s\n",
+                       text->bv_val, 0, 0 );
+#endif
+               e->e_id = NOID;
        }
 
        return e->e_id;
@@ -230,26 +263,41 @@ int bdb_tool_entry_reindex(
        DB_TXN *tid = NULL;
        struct berval pdn;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG ( TOOLS, ARGS, 
+               "=> bdb_tool_entry_reindex( %ld )\n", (long) id, 0, 0 );
+#else
        Debug( LDAP_DEBUG_ARGS, "=> bdb_tool_entry_reindex( %ld )\n",
                (long) id, 0, 0 );
+#endif
 
        e = bdb_tool_entry_get( be, id );
 
        if( e == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG ( TOOLS, DETAIL1, 
+                       "bdb_tool_entry_reindex:: could not locate id=%ld\n", 
+                       (long) id, 0, 0 );
+#else
                Debug( LDAP_DEBUG_ANY,
                        "bdb_tool_entry_reindex:: could not locate id=%ld\n",
                        (long) id, 0, 0 );
+#endif
                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 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG ( TOOLS, ERR, 
+                       "=> bdb_tool_entry_reindex: txn_begin failed: %s (%d)\n", 
+                       db_strerror(rc), rc, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY,
+                       "=> bdb_tool_entry_reindex: txn_begin failed: %s (%d)\n",
+                       db_strerror(rc), rc, 0 );
+#endif
+               goto done;
        }
        
        /*
@@ -259,8 +307,13 @@ int bdb_tool_entry_reindex(
         *
         */
 
+#ifdef NEW_LOGGING
+       LDAP_LOG ( TOOLS, ERR, 
+               "=> bdb_tool_entry_reindex( %ld, \"%s\" )\n", (long) id, e->e_dn, 0 );
+#else
        Debug( LDAP_DEBUG_TRACE, "=> bdb_tool_entry_reindex( %ld, \"%s\" )\n",
                (long) id, e->e_dn, 0 );
+#endif
 
        /* add dn2id indices */
        if ( be_issuffix( be, &e->e_nname ) ) {
@@ -270,32 +323,48 @@ int bdb_tool_entry_reindex(
        }
        rc = bdb_dn2id_add( be, tid, &pdn, e );
        if( rc != 0 && rc != DB_KEYEXIST ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG ( TOOLS, ERR, 
+                       "=> bdb_tool_entry_reindex: dn2id_add failed: %s (%d)\n", 
+                       db_strerror(rc), rc, 0 );
+#else
                Debug( LDAP_DEBUG_ANY,
                        "=> bdb_tool_entry_reindex: dn2id_add failed: %s (%d)\n",
                        db_strerror(rc), rc, 0 );
+#endif
                goto done;
        }
 
        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 ) {
+#ifdef NEW_LOGGING
+                       LDAP_LOG ( TOOLS, ERR, 
+                               "=> bdb_tool_entry_reindex: txn_commit failed: %s (%d)\n", 
+                               db_strerror(rc), rc, 0 );
+#else
                        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 );
+#endif
                        e->e_id = NOID;
                }
+
+       } else {
+               TXN_ABORT( tid );
+#ifdef NEW_LOGGING
+               LDAP_LOG ( TOOLS, DETAIL1, 
+                       "=> bdb_tool_entry_reindex: txn_aborted! %s (%d)\n", 
+                       db_strerror(rc), rc, 0 );
+#else
+               Debug( LDAP_DEBUG_ANY,
+                       "=> bdb_tool_entry_reindex: txn_aborted! %s (%d)\n",
+                       db_strerror(rc), rc, 0 );
+#endif
+               e->e_id = NOID;
        }
 
        return rc;