]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-bdb/tools.c
More for 2.2beta
[openldap] / servers / slapd / back-bdb / tools.c
index 0203ef71068b7ede316b0f0bc60d540f3d00abc4..10652a7b52a486a88e964eac0782a6c1f3623540 100644 (file)
@@ -1,7 +1,7 @@
 /* tools.c - tools for slap tools */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
 #include <ac/string.h>
 
 #include "back-bdb.h"
+#include "external.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;
+
 int bdb_tool_entry_open(
        BackendDB *be, int mode )
 {
@@ -46,6 +57,16 @@ 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;
 }
 
@@ -83,16 +104,65 @@ 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 ) {
+#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;
+       }
+
+       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 );
@@ -100,14 +170,108 @@ Entry* bdb_tool_entry_get( BackendDB *be, ID id )
        if( rc == LDAP_SUCCESS ) {
                e->e_id = id;
        }
+#else
+       {
+               EntryInfo *ei = NULL;
+               Operation op = {0};
 
-#ifdef BDB_HIER
-       bdb_fix_dn(be, id, e);
-#endif
+               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_nname;
+       struct berval pdn;
+       EntryInfo *ei = NULL;
+       int rc;
+
+       rc = bdb_cache_find_ndn( op, tid, &dn, &ei );
+       if ( ei ) bdb_cache_entryinfo_unlock( ei );
+       if ( rc == DB_NOTFOUND ) {
+               if ( be_issuffix( op->o_bd, &dn ) ) {
+                       pdn = slap_empty_bv;
+               } else {
+                       dnParent( &dn, &pdn );
+                       e->e_nname = pdn;
+                       rc = bdb_tool_next_id( op, tid, e, text, 1 );
+                       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 );
+#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 );
+                                       AC_MEMCPY( holes, hbuf, sizeof(hbuf) );
+                               } else {
+                                       holes = ch_realloc( holes, nhmax * sizeof(ID) * 2 );
+                               }
+                               nhmax *= 2;
+                       }
+                       ber_dupbv( &holes[nholes].dn, &dn );
+                       holes[nholes++].id = e->e_id;
+               }
+       } else if ( !hole ) {
+               unsigned i;
+
+               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,
@@ -116,19 +280,18 @@ 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? */
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "tools", LDAP_LEVEL_ARGS,
-               "=> bdb_tool_entry_put( %ld, \"%s\" )\n",
-               (long) e->e_id, e->e_dn ));
+       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 );
@@ -141,8 +304,7 @@ ID bdb_tool_entry_put(
                        "txn_begin failed: %s (%d)",
                        db_strerror(rc), rc );
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
-               "=> bdb_tool_entry_put: %s\n", text->bv_val ));
+       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",
@@ -151,39 +313,13 @@ ID bdb_tool_entry_put(
                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 );
-#ifdef NEW_LOGGING
-               LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val ));
-#else
-               Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-#endif
-               goto done;
-       }
+       op.o_bd = be;
+       op.o_tmpmemctx = NULL;
+       op.o_tmpmfuncs = &ch_mfuncs;
 
        /* add dn2id indices */
-       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 );
+       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 );
-#ifdef NEW_LOGGING
-               LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val ));
-#else
-               Debug( LDAP_DEBUG_ANY,
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
-#endif
                goto done;
        }
 
@@ -194,8 +330,8 @@ ID bdb_tool_entry_put(
                                "id2entry_add failed: %s (%d)",
                                db_strerror(rc), rc );
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val ));
+               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 );
@@ -203,14 +339,14 @@ ID bdb_tool_entry_put(
                goto done;
        }
 
-       rc = bdb_index_entry_add( be, tid, e, e->e_attrs );
+       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", LDAP_LEVEL_ERR,
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val ));
+               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 );
@@ -226,8 +362,8 @@ done:
                                        "txn_commit failed: %s (%d)",
                                        db_strerror(rc), rc );
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
-                               "=> bdb_tool_entry_put: %s\n", text->bv_val ));
+                       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",
@@ -242,8 +378,8 @@ done:
                        "txn_aborted! %s (%d)",
                        db_strerror(rc), rc );
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
-                       "=> bdb_tool_entry_put: %s\n", text->bv_val ));
+               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",
@@ -263,11 +399,11 @@ int bdb_tool_entry_reindex(
        int rc;
        Entry *e;
        DB_TXN *tid = NULL;
-       struct berval pdn;
+       Operation op = {0};
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "tools", LDAP_LEVEL_ARGS,
-               "=> bdb_tool_entry_reindex( %ld )\n", (long) id ));
+       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 );
@@ -277,9 +413,9 @@ int bdb_tool_entry_reindex(
 
        if( e == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "tools", LDAP_LEVEL_DETAIL1,
+               LDAP_LOG ( TOOLS, DETAIL1, 
                        "bdb_tool_entry_reindex:: could not locate id=%ld\n", 
-                       (long) id ));
+                       (long) id, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "bdb_tool_entry_reindex:: could not locate id=%ld\n",
@@ -291,9 +427,9 @@ int bdb_tool_entry_reindex(
        rc = TXN_BEGIN( bi->bi_dbenv, NULL, &tid, bi->bi_db_opflags );
        if( rc != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
+               LDAP_LOG ( TOOLS, ERR, 
                        "=> bdb_tool_entry_reindex: txn_begin failed: %s (%d)\n", 
-                       db_strerror(rc), rc ));
+                       db_strerror(rc), rc, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "=> bdb_tool_entry_reindex: txn_begin failed: %s (%d)\n",
@@ -310,26 +446,25 @@ int bdb_tool_entry_reindex(
         */
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
-               "=> bdb_tool_entry_reindex( %ld, \"%s\" )\n", 
-                       (long) id, e->e_dn ));
+       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
        /* add dn2id indices */
-       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 );
+       rc = bdb_dn2id_add( &op, tid, NULL, e );
        if( rc != 0 && rc != DB_KEYEXIST ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
+               LDAP_LOG ( TOOLS, ERR, 
                        "=> bdb_tool_entry_reindex: dn2id_add failed: %s (%d)\n", 
-                       db_strerror(rc), rc ));
+                       db_strerror(rc), rc, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "=> bdb_tool_entry_reindex: dn2id_add failed: %s (%d)\n",
@@ -337,17 +472,18 @@ int bdb_tool_entry_reindex(
 #endif
                goto done;
        }
+#endif
 
-       rc = bdb_index_entry_add( be, tid, e, e->e_attrs );
+       rc = bdb_index_entry_add( &op, tid, e );
 
 done:
        if( rc == 0 ) {
                rc = TXN_COMMIT( tid, 0 );
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG (( "tools", LDAP_LEVEL_ERR,
+                       LDAP_LOG ( TOOLS, ERR, 
                                "=> bdb_tool_entry_reindex: txn_commit failed: %s (%d)\n", 
-                               db_strerror(rc), rc ));
+                               db_strerror(rc), rc, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "=> bdb_tool_entry_reindex: txn_commit failed: %s (%d)\n",
@@ -359,9 +495,9 @@ done:
        } else {
                TXN_ABORT( tid );
 #ifdef NEW_LOGGING
-               LDAP_LOG (( "tools", LDAP_LEVEL_DETAIL1,
+               LDAP_LOG ( TOOLS, DETAIL1, 
                        "=> bdb_tool_entry_reindex: txn_aborted! %s (%d)\n", 
-                       db_strerror(rc), rc ));
+                       db_strerror(rc), rc, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "=> bdb_tool_entry_reindex: txn_aborted! %s (%d)\n",
@@ -369,6 +505,138 @@ done:
 #endif
                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 );
+
+#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 );
+       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;
+       }
+
+       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 );
+#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_del( &op, tid, e );
+       if( rc != 0 ) {
+               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;
+       }
+
+       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;
+       }
+
+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 );
+#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;
+}