]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-bdb/tools.c
remove back-*/external.h
[openldap] / servers / slapd / back-bdb / tools.c
index a131ab0b45fe189504113762f112d01194940e9e..0f4dcfcfd6667514a68cff700e938aa28d29cb00 100644 (file)
@@ -1,8 +1,17 @@
 /* tools.c - tools for slap tools */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
 #include <stdio.h>
 #include <ac/string.h>
 
+#define AVL_INTERNAL
 #include "back-bdb.h"
 
 static DBC *cursor = NULL;
 static DBT key, data;
 
+typedef struct dn_id {
+       ID id;
+       struct berval dn;
+} dn_id;
+
+#define        HOLE_SIZE       4096
+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 )
 {
@@ -30,8 +52,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 ) {
@@ -48,9 +68,21 @@ int bdb_tool_entry_close(
                cursor = NULL;
        }
 
+       if( nholes ) {
+               unsigned i;
+               fprintf( stderr, "Error, entries missing!\n");
+               for (i=0; i<nholes; i++) {
+                       fprintf(stderr, "  entry %ld: %s\n",
+                               holes[i].id, holes[i].dn.bv_val);
+               }
+               return -1;
+       }
+                       
        return 0;
 }
 
+static int bdb_reindex_cmp(const void *a, const void *b) { return 0; }
+
 ID bdb_tool_entry_next(
        BackendDB *be )
 {
@@ -62,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,
@@ -74,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 ) {
@@ -85,16 +133,60 @@ ID bdb_tool_entry_next(
        return id;
 }
 
+ID bdb_tool_dn2id_get(
+       Backend *be,
+       struct berval *dn
+)
+{
+       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+       DB *db = bdb->bi_dn2id->bdi_db;
+       int rc;
+       DBT     key, data;
+       ID      id;
+
+       DBTzero( &key );
+       key.size = dn->bv_len + 2;
+       key.data = ch_malloc( key.size );
+       ((char*)key.data)[0] = DN_BASE_PREFIX;
+       AC_MEMCPY( &((char*)key.data)[1], dn->bv_val, key.size - 1 );
+
+       DBTzero( &data );
+       data.data = &id;
+       data.ulen = sizeof(ID);
+       data.flags = DB_DBT_USERMEM;
+
+       rc = db->get( db, NULL, &key, &data, bdb->bi_db_opflags );
+
+    if( rc != 0 ) {
+               Debug( LDAP_DEBUG_TRACE, "bdb_tool_dn2id_get: get failed: %s (%d)\n",
+                               db_strerror( rc ), rc, 0 );
+               id = NOID;
+       }
+
+       ch_free( key.data );
+       return id;
+}
+
+int bdb_tool_id2entry_get(
+       Backend *be,
+       ID id,
+       Entry **e
+)
+{
+       return bdb_id2entry( be, NULL, id, e );
+}
+
 Entry* bdb_tool_entry_get( BackendDB *be, ID id )
 {
        int rc;
-       Entry *e;
+       Entry *e = NULL;
        struct berval bv;
 
        assert( be != NULL );
        assert( slapMode & SLAP_TOOL_MODE );
        assert( data.data != NULL );
 
+#ifndef BDB_HIER
        DBT2bv( &data, &bv );
 
        rc = entry_decode( &bv, &e );
@@ -102,14 +194,104 @@ Entry* bdb_tool_entry_get( BackendDB *be, ID id )
        if( rc == LDAP_SUCCESS ) {
                e->e_id = id;
        }
-
-#ifdef BDB_HIER
-       bdb_fix_dn(be, id, e);
+#else
+       {
+               EntryInfo *ei = NULL;
+               Operation op = {0};
+
+               op.o_bd = be;
+               op.o_tmpmemctx = NULL;
+               op.o_tmpmfuncs = &ch_mfuncs;
+
+               rc = bdb_cache_find_id( &op, NULL, id, &ei, 0, 0, NULL );
+               if ( rc == LDAP_SUCCESS )
+                       e = ei->bei_e;
+       }
 #endif
-
        return e;
 }
 
+static int bdb_tool_next_id(
+       Operation *op,
+       DB_TXN *tid,
+       Entry *e,
+       struct berval *text,
+       int hole )
+{
+       struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+       struct berval dn = e->e_name;
+       struct berval ndn = e->e_nname;
+       struct berval pdn, npdn;
+       EntryInfo *ei = NULL;
+       int rc;
+
+       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, &ndn ) ) {
+                       dnParent( &dn, &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;
+                       }
+               }
+               rc = bdb_next_id( op->o_bd, tid, &e->e_id );
+               if ( rc ) {
+                       snprintf( text->bv_val, text->bv_len,
+                               "next_id failed: %s (%d)",
+                               db_strerror(rc), rc );
+               Debug( LDAP_DEBUG_ANY,
+                       "=> bdb_tool_next_id: %s\n", text->bv_val, 0, 0 );
+                       return rc;
+               }
+               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 );
+               Debug( LDAP_DEBUG_ANY,
+                       "=> bdb_tool_next_id: %s\n", text->bv_val, 0, 0 );
+               } else if ( hole ) {
+                       if ( nholes == nhmax - 1 ) {
+                               if ( holes == hbuf ) {
+                                       holes = ch_malloc( nhmax * sizeof(dn_id) * 2 );
+                                       AC_MEMCPY( holes, hbuf, sizeof(hbuf) );
+                               } else {
+                                       holes = ch_realloc( holes, nhmax * sizeof(dn_id) * 2 );
+                               }
+                               nhmax *= 2;
+                       }
+                       ber_dupbv( &holes[nholes].dn, &ndn );
+                       holes[nholes++].id = e->e_id;
+               }
+       } else if ( !hole ) {
+               unsigned i;
+
+               e->e_id = ei->bei_id;
+
+               for ( i=0; i<nholes; i++) {
+                       if ( holes[i].id == e->e_id ) {
+                               int j;
+                               free(holes[i].dn.bv_val);
+                               for (j=i;j<nholes;j++) holes[j] = holes[j+1];
+                               holes[j].id = 0;
+                               nholes--;
+                               break;
+                       } else if ( holes[i].id > e->e_id ) {
+                               break;
+                       }
+               }
+       }
+       return rc;
+}
+
 ID bdb_tool_entry_put(
        BackendDB *be,
        Entry *e,
@@ -118,55 +300,37 @@ ID bdb_tool_entry_put(
        int rc;
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
        DB_TXN *tid = NULL;
-       struct berval pdn;
+       Operation op = {0};
 
        assert( be != NULL );
        assert( slapMode & SLAP_TOOL_MODE );
 
        assert( text );
        assert( text->bv_val );
-       assert( text->bv_val[0] == '\0' );
+       assert( text->bv_val[0] == '\0' );      /* overconservative? */
 
        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 ) {
-                       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 );
+       rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &tid, 
+               bdb->bi_db_opflags );
        if( rc != 0 ) {
                snprintf( text->bv_val, text->bv_len,
-                               "next_id failed: %s (%d)",
-                               db_strerror(rc), rc );
+                       "txn_begin failed: %s (%d)",
+                       db_strerror(rc), rc );
                Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-               goto done;
+                       "=> bdb_tool_entry_put: %s\n",
+                        text->bv_val, 0, 0 );
+               return NOID;
        }
 
+       op.o_bd = be;
+       op.o_tmpmemctx = NULL;
+       op.o_tmpmfuncs = &ch_mfuncs;
+
        /* add dn2id indices */
-       pdn.bv_val = dn_parent( be, e->e_ndn );
-       if (pdn.bv_val && *pdn.bv_val)
-               pdn.bv_len = e->e_nname.bv_len - (pdn.bv_val - e->e_ndn);
-       else
-               pdn.bv_len = 0;
-       rc = bdb_dn2id_add( be, tid, &pdn, e );
+       rc = bdb_tool_next_id( &op, tid, e, text, 0 );
        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: %s\n", text->bv_val, 0, 0 );
                goto done;
        }
 
@@ -181,7 +345,8 @@ ID bdb_tool_entry_put(
                goto done;
        }
 
-       rc = bdb_index_entry_add( be, tid, e, e->e_attrs );
+       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)",
@@ -192,29 +357,27 @@ ID bdb_tool_entry_put(
        }
 
 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 );
                        Debug( LDAP_DEBUG_ANY,
                                "=> 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;
@@ -228,11 +391,25 @@ int bdb_tool_entry_reindex(
        int rc;
        Entry *e;
        DB_TXN *tid = NULL;
-       struct berval pdn;
+       Operation op = {0};
 
        Debug( LDAP_DEBUG_ARGS, "=> bdb_tool_entry_reindex( %ld )\n",
                (long) id, 0, 0 );
 
+       /* 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 ) {
@@ -242,14 +419,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;
        }
        
        /*
@@ -262,41 +437,138 @@ int bdb_tool_entry_reindex(
        Debug( LDAP_DEBUG_TRACE, "=> bdb_tool_entry_reindex( %ld, \"%s\" )\n",
                (long) id, e->e_dn, 0 );
 
+       op.o_bd = be;
+       op.o_tmpmemctx = NULL;
+       op.o_tmpmfuncs = &ch_mfuncs;
+
+#if 0 /* ndef BDB_HIER */
        /* add dn2id indices */
-       pdn.bv_val = dn_parent( be, e->e_ndn );
-       if (pdn.bv_val && *pdn.bv_val)
-               pdn.bv_len = e->e_nname.bv_len - (pdn.bv_val - e->e_ndn);
-       else
-               pdn.bv_len = 0;
-       rc = bdb_dn2id_add( be, tid, &pdn, e );
+       rc = bdb_dn2id_add( &op, tid, NULL, e );
        if( rc != 0 && rc != DB_KEYEXIST ) {
                Debug( LDAP_DEBUG_ANY,
                        "=> bdb_tool_entry_reindex: dn2id_add failed: %s (%d)\n",
                        db_strerror(rc), rc, 0 );
                goto done;
        }
+#endif
 
-       rc = bdb_index_entry_add( be, tid, e, e->e_attrs );
+       rc = bdb_index_entry_add( &op, tid, e );
 
 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;
        }
+       bdb_entry_release( &op, e, 0 );
 
        return rc;
 }
+
+ID bdb_tool_entry_modify(
+       BackendDB *be,
+       Entry *e,
+       struct berval *text )
+{
+       int rc;
+       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+       DB_TXN *tid = NULL;
+       Operation op = {0};
+
+       assert( be != NULL );
+       assert( slapMode & SLAP_TOOL_MODE );
+
+       assert( text );
+       assert( text->bv_val );
+       assert( text->bv_val[0] == '\0' );      /* overconservative? */
+
+       assert ( e->e_id != NOID );
+       assert ( e->e_id != 0 );
+
+       Debug( LDAP_DEBUG_TRACE, "=> bdb_tool_entry_put( %ld, \"%s\" )\n",
+               (long) e->e_id, e->e_dn, 0 );
+
+       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;
+       }
+
+       op.o_bd = be;
+       op.o_tmpmemctx = NULL;
+       op.o_tmpmfuncs = &ch_mfuncs;
+
+       /* id2entry index */
+       rc = bdb_id2entry_update( 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: %s\n", text->bv_val, 0, 0 );
+               goto done;
+       }
+
+       rc = bdb_index_entry_del( &op, tid, e );
+       if( rc != 0 ) {
+               snprintf( text->bv_val, text->bv_len,
+                               "index_entry_del failed: %s (%d)",
+                               db_strerror(rc), rc );
+               Debug( LDAP_DEBUG_ANY,
+                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
+               goto done;
+       }
+
+       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 );
+               Debug( LDAP_DEBUG_ANY,
+                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
+               goto done;
+       }
+
+done:
+       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 );
+               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;
+}