X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Ftools.c;h=bcec7c7c5525b977906c0e4d46cf236f366ee8ae;hb=a61d2b914dafe2326a0336c87c530b93333e5eef;hp=686fd9ff6ef011732a69194896de6e64b39b5388;hpb=2b82d4f4863c3e54352bd9213baac6fd0c5243ab;p=openldap diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c index 686fd9ff6e..bcec7c7c55 100644 --- a/servers/slapd/back-bdb/tools.c +++ b/servers/slapd/back-bdb/tools.c @@ -1,16 +1,14 @@ /* 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 */ #include "portable.h" #include - #include -#include #include "back-bdb.h" @@ -20,15 +18,6 @@ static DBT key, data; int bdb_tool_entry_open( BackendDB *be, int mode ) { - int rc; - struct bdb_info *bdb = (struct bdb_info *) be->be_private; - - rc = bdb->bi_entries->bdi_db->cursor( - bdb->bi_entries->bdi_db, NULL, &cursor, 0 ); - if( rc != 0 ) { - return NOID; - } - /* initialize key and data thangs */ DBTzero( &key ); DBTzero( &data ); @@ -43,6 +32,8 @@ int bdb_tool_entry_close( { struct bdb_info *bdb = (struct bdb_info *) be->be_private; + assert( be != NULL ); + if( key.data ) { ch_free( key.data ); key.data = NULL; @@ -65,9 +56,20 @@ ID bdb_tool_entry_next( { int rc; ID id; + struct bdb_info *bdb = (struct bdb_info *) be->be_private; + assert( be != NULL ); assert( slapMode & SLAP_TOOL_MODE ); - assert( cursor != NULL ); + assert( bdb != NULL ); + + if (cursor == NULL) { + rc = bdb->bi_id2entry->bdi_db->cursor( + bdb->bi_id2entry->bdi_db, NULL, &cursor, + bdb->bi_db_opflags ); + if( rc != 0 ) { + return NOID; + } + } rc = cursor->c_get( cursor, &key, &data, DB_NEXT ); @@ -88,6 +90,8 @@ Entry* bdb_tool_entry_get( BackendDB *be, ID id ) int rc; Entry *e; struct berval bv; + + assert( be != NULL ); assert( slapMode & SLAP_TOOL_MODE ); assert( data.data != NULL ); @@ -99,109 +103,149 @@ Entry* bdb_tool_entry_get( BackendDB *be, ID id ) e->e_id = id; } +#ifdef BDB_HIER + bdb_fix_dn(be, id, e); +#endif + return e; } 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; - DBT key, data; - struct berval *bv; + DB_TXN *tid = NULL; + struct berval pdn; + assert( be != NULL ); assert( slapMode & SLAP_TOOL_MODE ); - DBTzero( &key ); - key.data = (char *) &e->e_id; - key.size = sizeof(ID); - - rc = entry_encode( e, &bv ); - if( rc != LDAP_SUCCESS ) { - return NOID; - } - - DBTzero( &data ); - bv2DBT( bv, &data ); + assert( text ); + assert( text->bv_val ); + assert( text->bv_val[0] == '\0' ); Debug( LDAP_DEBUG_TRACE, "=> bdb_tool_entry_put( %ld, \"%s\" )\n", - e->e_id, e->e_dn, 0 ); + (long) e->e_id, e->e_dn, 0 ); - rc = txn_begin( bdb->bi_dbenv, NULL, &tid, 0 ); + rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &tid, + bdb->bi_db_opflags ); if( rc != 0 ) { - ber_bvfree( bv ); + 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: %s\n", text->bv_val, 0, 0 ); goto done; } - /* store it -- don't override */ - rc = bdb->bi_entries->bdi_db->put( bdb->bi_entries->bdi_db, - tid, &key, &data, DB_NOOVERWRITE ); + /* 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 ); 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; } - /* add dn indices */ - rc = bdb_index_dn_add( be, tid, e->e_ndn, e->e_id ); + /* 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: %s\n", text->bv_val, 0, 0 ); goto done; } -#if 0 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: %s\n", text->bv_val, 0, 0 ); goto done; } -#endif done: - ber_bvfree( bv ); - if( rc == 0 ) { - rc = txn_commit( tid, 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 ); + 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; } -#if 0 int bdb_tool_entry_reindex( BackendDB *be, ID id ) { - struct bdb_dbinfo *bdi = (struct bdb_dbinfo *) be->be_private; + struct bdb_info *bi = (struct bdb_info *) be->be_private; int rc; Entry *e; - DB_TXN *tid; + DB_TXN *tid = NULL; + struct berval pdn; Debug( LDAP_DEBUG_ARGS, "=> bdb_tool_entry_reindex( %ld )\n", (long) id, 0, 0 ); - rc = txn_begin( bdi->bdi_db_env, NULL, &tid, 0 ); - - e = bdb_tool_entry_get( be, tid, id ); + e = bdb_tool_entry_get( be, id ); if( e == NULL ) { Debug( LDAP_DEBUG_ANY, "bdb_tool_entry_reindex:: could not locate id=%ld\n", (long) id, 0, 0 ); - txn_abort( tid ); return -1; } + 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; + } + /* * just (re)add them for now * assume that some other routine (not yet implemented) @@ -210,12 +254,41 @@ int bdb_tool_entry_reindex( */ Debug( LDAP_DEBUG_TRACE, "=> bdb_tool_entry_reindex( %ld, \"%s\" )\n", - id, e->e_dn, 0 ); + (long) id, e->e_dn, 0 ); + + /* 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 ); + 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; + } + + rc = bdb_index_entry_add( be, tid, e, e->e_attrs ); - rc = index_entry_add( be, e, e->e_attrs ); +done: + 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; + } - entry_free( e ); + } 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; } -#endif