remove back-*/external.h

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

diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c
index e73f7c70db73b1159c57cd4a5e2e6c4d0c18a675..0f4dcfcfd6667514a68cff700e938aa28d29cb00 100644 (file)
--- a/servers/slapd/back-bdb/tools.c
+++ b/servers/slapd/back-bdb/tools.c
@@ -19,8 +19,8 @@
 #include <stdio.h>
 #include <ac/string.h>
 
+#define AVL_INTERNAL
 #include "back-bdb.h"
-#include "external.h"
 
 static DBC *cursor = NULL;
 static DBT key, data;
@@ -35,6 +35,8 @@ static dn_id hbuf[HOLE_SIZE], *holes = hbuf;
 static unsigned nhmax = HOLE_SIZE;
 static unsigned nholes;
 
+Avlnode *index_attrs, index_dummy;
+
 int bdb_tool_entry_open(
        BackendDB *be, int mode )
 {
@@ -79,6 +81,8 @@ int bdb_tool_entry_close(
        return 0;
 }
 
+static int bdb_reindex_cmp(const void *a, const void *b) { return 0; }
+
 ID bdb_tool_entry_next(
        BackendDB *be )
 {
@@ -90,6 +94,7 @@ ID bdb_tool_entry_next(
        assert( slapMode & SLAP_TOOL_MODE );
        assert( bdb != NULL );
        
+       /* Initialization */
        if (cursor == NULL) {
                rc = bdb->bi_id2entry->bdi_db->cursor(
                        bdb->bi_id2entry->bdi_db, NULL, &cursor,
@@ -102,7 +107,22 @@ ID bdb_tool_entry_next(
        rc = cursor->c_get( cursor, &key, &data, DB_NEXT );
 
        if( rc != 0 ) {
-               return NOID;
+               /* If we're doing linear indexing and there are more attrs to
+                * index, and we're at the end of the database, start over.
+                */
+               if ( bdb->bi_attrs == &index_dummy ) {
+                       if ( index_attrs && rc == DB_NOTFOUND ) {
+                               /* optional - do a checkpoint here? */
+                               index_dummy.avl_data = avl_delete(&index_attrs, NULL, bdb_reindex_cmp);
+                               rc = cursor->c_get( cursor, &key, &data, DB_FIRST );
+                       }
+                       if ( rc ) {
+                               bdb->bi_attrs = NULL;
+                               return NOID;
+                       }
+               } else {
+                       return NOID;
+               }
        }
 
        if( data.data == NULL ) {
@@ -138,13 +158,8 @@ ID bdb_tool_dn2id_get(
        rc = db->get( db, NULL, &key, &data, bdb->bi_db_opflags );
 
     if( rc != 0 ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG ( INDEX, ERR, "bdb_tool_dn2id_get: get failed %s (%d)\n",
-                               db_strerror(rc), rc, 0 );
-#else
                Debug( LDAP_DEBUG_TRACE, "bdb_tool_dn2id_get: get failed: %s (%d)\n",
                                db_strerror( rc ), rc, 0 );
-#endif
                id = NOID;
        }
 
@@ -204,20 +219,25 @@ static int bdb_tool_next_id(
        int hole )
 {
        struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
-       struct berval dn = e->e_nname;
-       struct berval pdn;
+       struct berval dn = e->e_name;
+       struct berval ndn = e->e_nname;
+       struct berval pdn, npdn;
        EntryInfo *ei = NULL;
        int rc;
 
-       rc = bdb_cache_find_ndn( op, tid, &dn, &ei );
+       if (ndn.bv_len == 0) return 0;
+
+       rc = bdb_cache_find_ndn( op, tid, &ndn, &ei );
        if ( ei ) bdb_cache_entryinfo_unlock( ei );
        if ( rc == DB_NOTFOUND ) {
-               if ( be_issuffix( op->o_bd, &dn ) ) {
-                       pdn = slap_empty_bv;
-               } else {
+               if ( !be_issuffix( op->o_bd, &ndn ) ) {
                        dnParent( &dn, &pdn );
-                       e->e_nname = pdn;
+                       dnParent( &ndn, &npdn );
+                       e->e_name = pdn;
+                       e->e_nname = npdn;
                        rc = bdb_tool_next_id( op, tid, e, text, 1 );
+                       e->e_name = dn;
+                       e->e_nname = ndn;
                        if ( rc ) {
                                return rc;
                        }
@@ -227,46 +247,34 @@ static int bdb_tool_next_id(
                        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_next_id: %s\n", text->bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "=> bdb_tool_next_id: %s\n", text->bv_val, 0, 0 );
-#endif
                        return rc;
                }
-               e->e_nname = dn;
                rc = bdb_dn2id_add( op, tid, ei, e );
                if ( rc ) {
                        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_next_id: %s\n", text->bv_val, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "=> bdb_tool_next_id: %s\n", text->bv_val, 0, 0 );
-#endif
                } else if ( hole ) {
                        if ( nholes == nhmax - 1 ) {
                                if ( holes == hbuf ) {
-                                       holes = ch_malloc( nhmax * sizeof(ID) * 2 );
+                                       holes = ch_malloc( nhmax * sizeof(dn_id) * 2 );
                                        AC_MEMCPY( holes, hbuf, sizeof(hbuf) );
                                } else {
-                                       holes = ch_realloc( holes, nhmax * sizeof(ID) * 2 );
+                                       holes = ch_realloc( holes, nhmax * sizeof(dn_id) * 2 );
                                }
                                nhmax *= 2;
                        }
-                       ber_dupbv( &holes[nholes].dn, &dn );
+                       ber_dupbv( &holes[nholes].dn, &ndn );
                        holes[nholes++].id = e->e_id;
                }
        } else if ( !hole ) {
                unsigned i;
 
                e->e_id = ei->bei_id;
-               rc = DB_KEYEXIST;
 
                for ( i=0; i<nholes; i++) {
                        if ( holes[i].id == e->e_id ) {
@@ -275,7 +283,6 @@ static int bdb_tool_next_id(
                                for (j=i;j<nholes;j++) holes[j] = holes[j+1];
                                holes[j].id = 0;
                                nholes--;
-                               rc = 0;
                                break;
                        } else if ( holes[i].id > e->e_id ) {
                                break;
@@ -302,13 +309,8 @@ ID bdb_tool_entry_put(
        assert( text->bv_val );
        assert( text->bv_val[0] == '\0' );      /* overconservative? */
 
-#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
 
        rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &tid, 
                bdb->bi_db_opflags );
@@ -316,13 +318,9 @@ ID bdb_tool_entry_put(
                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;
        }
 
@@ -342,28 +340,19 @@ 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;
        }
 
-       rc = bdb_index_entry_add( &op, tid, e );
+       if ( !bdb->bi_linear_index )
+               rc = bdb_index_entry_add( &op, tid, e );
        if( rc != 0 ) {
                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;
        }
 
@@ -374,14 +363,9 @@ done:
                        snprintf( text->bv_val, text->bv_len,
                                        "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;
                }
 
@@ -390,14 +374,9 @@ done:
                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;
        }
 
@@ -414,40 +393,37 @@ int bdb_tool_entry_reindex(
        DB_TXN *tid = NULL;
        Operation op = {0};
 
-#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
+
+       /* No indexes configured, nothing to do. Could return an
+        * error here to shortcut things.
+        */
+       if (!bi->bi_attrs) {
+               return 0;
+       }
+
+       /* Get the first attribute to index */
+       if (bi->bi_linear_index && !index_attrs && bi->bi_attrs != &index_dummy) {
+               index_attrs = bi->bi_attrs;
+               bi->bi_attrs = &index_dummy;
+               index_dummy.avl_data = avl_delete(&index_attrs, NULL, bdb_reindex_cmp);
+       }
 
        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;
        }
 
        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;
        }
        
@@ -458,31 +434,20 @@ 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
 
        op.o_bd = be;
        op.o_tmpmemctx = NULL;
        op.o_tmpmfuncs = &ch_mfuncs;
 
-#ifndef BDB_HIER
+#if 0 /* ndef BDB_HIER */
        /* add dn2id indices */
        rc = bdb_dn2id_add( &op, tid, NULL, 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;
        }
 #endif
@@ -493,29 +458,17 @@ done:
        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_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;
        }
        bdb_entry_release( &op, e, 0 );
@@ -543,13 +496,8 @@ ID bdb_tool_entry_modify(
        assert ( e->e_id != NOID );
        assert ( e->e_id != 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
 
        rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &tid, 
                bdb->bi_db_opflags );
@@ -557,13 +505,9 @@ ID bdb_tool_entry_modify(
                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;
        }
 
@@ -577,13 +521,8 @@ ID bdb_tool_entry_modify(
                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;
        }
 
@@ -592,13 +531,8 @@ ID bdb_tool_entry_modify(
                snprintf( text->bv_val, text->bv_len,
                                "index_entry_del 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;
        }
 
@@ -607,13 +541,8 @@ ID bdb_tool_entry_modify(
                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;
        }
 
@@ -624,14 +553,9 @@ done:
                        snprintf( text->bv_val, text->bv_len,
                                        "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;
                }
 
@@ -640,14 +564,9 @@ done:
                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;
        }