/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2011-2013 The OpenLDAP Foundation.
+ * Copyright 2011-2016 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#define MDB_TOOL_IDL_FLUSH(be, txn)
#endif /* MDB_TOOL_IDL_CACHING */
-static MDB_txn *txn = NULL, *txi = NULL;
+MDB_txn *mdb_tool_txn = NULL;
+
+static MDB_txn *txi = NULL;
static MDB_cursor *cursor = NULL, *idcursor = NULL;
static MDB_cursor *mcp = NULL, *mcd = NULL;
static MDB_val key, data;
slapd_shutdown = 0;
ch_free( mdb_tool_index_rec );
mdb_tool_index_tcount = mdb_tool_threads - 1;
- if (txn)
- MDB_TOOL_IDL_FLUSH( be, txn );
+ if (mdb_tool_txn)
+ MDB_TOOL_IDL_FLUSH( be, mdb_tool_txn );
for (i=0; i<mdb_tool_threads; i++) {
mdb_tool_idl_cache *ic;
mdb_tool_idl_cache_entry *ice;
mdb_cursor_close( cursor );
cursor = NULL;
}
- if( txn ) {
+ {
+ struct mdb_info *mdb = be->be_private;
+ if ( mdb ) {
+ int i;
+ for (i=0; i<mdb->mi_nattrs; i++)
+ mdb->mi_attrs[i]->ai_cursor = NULL;
+ }
+ }
+ if( mdb_tool_txn ) {
int rc;
- if (( rc = mdb_txn_commit( txn ))) {
+ if (( rc = mdb_txn_commit( mdb_tool_txn ))) {
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(mdb_tool_entry_close) ": database %s: "
"txn_commit failed: %s (%d)\n",
be->be_suffix[0].bv_val, mdb_strerror(rc), rc );
return -1;
}
- txn = NULL;
+ mdb_tool_txn = NULL;
}
if( nholes ) {
mdb = (struct mdb_info *) be->be_private;
assert( mdb != NULL );
- if ( !txn ) {
- rc = mdb_txn_begin( mdb->mi_dbenv, NULL, MDB_RDONLY, &txn );
+ if ( !mdb_tool_txn ) {
+ rc = mdb_txn_begin( mdb->mi_dbenv, NULL, MDB_RDONLY, &mdb_tool_txn );
if ( rc )
return NOID;
- rc = mdb_cursor_open( txn, mdb->mi_id2entry, &cursor );
+ rc = mdb_cursor_open( mdb_tool_txn, mdb->mi_id2entry, &cursor );
if ( rc ) {
- mdb_txn_abort( txn );
+ mdb_txn_abort( mdb_tool_txn );
return NOID;
}
}
mdb = (struct mdb_info *) be->be_private;
- if ( !txn ) {
+ if ( !mdb_tool_txn ) {
rc = mdb_txn_begin( mdb->mi_dbenv, NULL, (slapMode & SLAP_TOOL_READONLY) != 0 ?
- MDB_RDONLY : 0, &txn );
+ MDB_RDONLY : 0, &mdb_tool_txn );
if ( rc )
return NOID;
}
op.o_tmpmemctx = NULL;
op.o_tmpmfuncs = &ch_mfuncs;
- rc = mdb_dn2id( &op, txn, NULL, dn, &id, NULL, NULL, NULL );
+ rc = mdb_dn2id( &op, mdb_tool_txn, NULL, dn, &id, NULL, NULL, NULL );
if ( rc == MDB_NOTFOUND )
return NOID;
op.o_tmpmemctx = NULL;
op.o_tmpmfuncs = &ch_mfuncs;
if ( slapMode & SLAP_TOOL_READONLY ) {
- rc = mdb_id2name( &op, txn, &idcursor, id, &dn, &ndn );
+ rc = mdb_id2name( &op, mdb_tool_txn, &idcursor, id, &dn, &ndn );
if ( rc ) {
rc = LDAP_OTHER;
- if ( e ) {
- mdb_entry_return( &op, e );
- e = NULL;
- }
goto done;
}
if ( tool_base != NULL ) {
}
}
}
- rc = mdb_entry_decode( &op, &data, &e );
+ rc = mdb_entry_decode( &op, mdb_tool_txn, &data, id, &e );
e->e_id = id;
if ( !BER_BVISNULL( &dn )) {
e->e_name = dn;
Entry *e = NULL;
int rc;
- if ( !txn ) {
+ if ( !mdb_tool_txn ) {
struct mdb_info *mdb = (struct mdb_info *) be->be_private;
rc = mdb_txn_begin( mdb->mi_dbenv, NULL,
- (slapMode & SLAP_TOOL_READONLY) ? MDB_RDONLY : 0, &txn );
+ (slapMode & SLAP_TOOL_READONLY) ? MDB_RDONLY : 0, &mdb_tool_txn );
if ( rc )
return NULL;
}
if ( !cursor ) {
struct mdb_info *mdb = (struct mdb_info *) be->be_private;
- rc = mdb_cursor_open( txn, mdb->mi_id2entry, &cursor );
+ rc = mdb_cursor_open( mdb_tool_txn, mdb->mi_id2entry, &cursor );
if ( rc ) {
- mdb_txn_abort( txn );
- txn = NULL;
+ mdb_txn_abort( mdb_tool_txn );
+ mdb_tool_txn = NULL;
return NULL;
}
}
static int
mdb_tool_index_finish()
{
- int i, rc;
+ int i, rc = 0;
ldap_pvt_thread_mutex_lock( &mdb_tool_index_mutex );
for ( i=1; i<mdb_tool_threads; i++ ) {
if ( mdb_tool_index_rec[i].ir_i == LDAP_BUSY ) {
mdb = (struct mdb_info *) be->be_private;
- if ( !txn ) {
- rc = mdb_txn_begin( mdb->mi_dbenv, NULL, 0, &txn );
+ if ( !mdb_tool_txn ) {
+ rc = mdb_txn_begin( mdb->mi_dbenv, NULL, 0, &mdb_tool_txn );
if( rc != 0 ) {
snprintf( text->bv_val, text->bv_len,
"txn_begin failed: %s (%d)",
text->bv_val, 0, 0 );
return NOID;
}
- rc = mdb_cursor_open( txn, mdb->mi_id2entry, &idcursor );
+ rc = mdb_cursor_open( mdb_tool_txn, mdb->mi_id2entry, &idcursor );
if( rc != 0 ) {
snprintf( text->bv_val, text->bv_len,
"cursor_open failed: %s (%d)",
ID dummy;
mdb_next_id( be, idcursor, &dummy );
}
- rc = mdb_cursor_open( txn, mdb->mi_dn2id, &mcp );
+ rc = mdb_cursor_open( mdb_tool_txn, mdb->mi_dn2id, &mcp );
if( rc != 0 ) {
snprintf( text->bv_val, text->bv_len,
"cursor_open failed: %s (%d)",
text->bv_val, 0, 0 );
return NOID;
}
- rc = mdb_cursor_open( txn, mdb->mi_dn2id, &mcd );
+ rc = mdb_cursor_open( mdb_tool_txn, mdb->mi_dn2id, &mcd );
if( rc != 0 ) {
snprintf( text->bv_val, text->bv_len,
"cursor_open failed: %s (%d)",
op.o_tmpmfuncs = &ch_mfuncs;
/* add dn2id indices */
- rc = mdb_tool_next_id( &op, txn, e, text, 0 );
+ rc = mdb_tool_next_id( &op, mdb_tool_txn, e, text, 0 );
if( rc != 0 ) {
goto done;
}
if ( mdb_tool_threads > 1 ) {
LDAP_SLIST_INSERT_HEAD( &op.o_extra, &mdb_tool_axinfo[0]->ai_oe, oe_next );
}
- rc = mdb_tool_index_add( &op, txn, e );
+ rc = mdb_tool_index_add( &op, mdb_tool_txn, e );
if( rc != 0 ) {
snprintf( text->bv_val, text->bv_len,
"index_entry_add failed: err=%d", rc );
/* id2entry index */
- rc = mdb_id2entry_add( &op, txn, idcursor, e );
+ rc = mdb_id2entry_add( &op, mdb_tool_txn, idcursor, e );
if( rc != 0 ) {
snprintf( text->bv_val, text->bv_len,
"id2entry_add failed: err=%d", rc );
mdb_writes++;
if ( mdb_writes >= mdb_writes_per_commit ) {
unsigned i;
- MDB_TOOL_IDL_FLUSH( be, txn );
- rc = mdb_txn_commit( txn );
+ MDB_TOOL_IDL_FLUSH( be, mdb_tool_txn );
+ rc = mdb_txn_commit( mdb_tool_txn );
for ( i=0; i<mdb->mi_nattrs; i++ )
mdb->mi_attrs[i]->ai_cursor = NULL;
mdb_writes = 0;
- txn = NULL;
+ mdb_tool_txn = NULL;
idcursor = NULL;
if( rc != 0 ) {
+ mdb->mi_numads = 0;
snprintf( text->bv_val, text->bv_len,
"txn_commit failed: %s (%d)",
mdb_strerror(rc), rc );
} else {
unsigned i;
- mdb_txn_abort( txn );
- txn = NULL;
+ mdb_txn_abort( mdb_tool_txn );
+ mdb_tool_txn = NULL;
idcursor = NULL;
for ( i=0; i<mdb->mi_nattrs; i++ )
mdb->mi_attrs[i]->ai_cursor = NULL;
mdb_cursor_close( cursor );
txi = NULL;
/* Must close the read txn to allow old pages to be reclaimed. */
- mdb_txn_abort( txn );
+ mdb_txn_abort( mdb_tool_txn );
/* and then reopen it so that tool_entry_next still works. */
- mdb_txn_begin( mi->mi_dbenv, NULL, MDB_RDONLY, &txn );
- mdb_cursor_open( txn, mi->mi_id2entry, &cursor );
+ mdb_txn_begin( mi->mi_dbenv, NULL, MDB_RDONLY, &mdb_tool_txn );
+ mdb_cursor_open( mdb_tool_txn, mi->mi_id2entry, &cursor );
key.mv_data = &id;
key.mv_size = sizeof(ID);
mdb_cursor_get( cursor, &key, NULL, MDB_SET );
mdb_cursor_close( cursor );
cursor = NULL;
}
- if ( !txn ) {
- rc = mdb_txn_begin( mdb->mi_dbenv, NULL, 0, &txn );
+ if ( !mdb_tool_txn ) {
+ rc = mdb_txn_begin( mdb->mi_dbenv, NULL, 0, &mdb_tool_txn );
if( rc != 0 ) {
snprintf( text->bv_val, text->bv_len,
"txn_begin failed: %s (%d)",
op.o_tmpmfuncs = &ch_mfuncs;
/* id2entry index */
- rc = mdb_id2entry_update( &op, txn, NULL, e );
+ rc = mdb_id2entry_update( &op, mdb_tool_txn, NULL, e );
if( rc != 0 ) {
snprintf( text->bv_val, text->bv_len,
"id2entry_update failed: err=%d", rc );
done:
if( rc == 0 ) {
- rc = mdb_txn_commit( txn );
+ rc = mdb_txn_commit( mdb_tool_txn );
if( rc != 0 ) {
+ mdb->mi_numads = 0;
snprintf( text->bv_val, text->bv_len,
"txn_commit failed: %s (%d)",
mdb_strerror(rc), rc );
}
} else {
- mdb_txn_abort( txn );
+ mdb_txn_abort( mdb_tool_txn );
snprintf( text->bv_val, text->bv_len,
"txn_aborted! %s (%d)",
mdb_strerror(rc), rc );
text->bv_val, 0, 0 );
e->e_id = NOID;
}
- txn = NULL;
- idcursor = NULL;
+ mdb_tool_txn = NULL;
return e->e_id;
}
+int mdb_tool_entry_delete(
+ BackendDB *be,
+ struct berval *ndn,
+ struct berval *text )
+{
+ int rc;
+ struct mdb_info *mdb;
+ Operation op = {0};
+ Opheader ohdr = {0};
+ Entry *e;
+
+ assert( be != NULL );
+ assert( slapMode & SLAP_TOOL_MODE );
+
+ assert( text != NULL );
+ assert( text->bv_val != NULL );
+ assert( text->bv_val[0] == '\0' ); /* overconservative? */
+
+ assert ( ndn != NULL );
+ assert ( ndn->bv_val != NULL );
+
+ Debug( LDAP_DEBUG_TRACE,
+ "=> " LDAP_XSTRING(mdb_tool_entry_delete) "( %s )\n",
+ ndn->bv_val, 0, 0 );
+
+ mdb = (struct mdb_info *) be->be_private;
+
+ assert( cursor == NULL );
+ if( cursor ) {
+ mdb_cursor_close( cursor );
+ cursor = NULL;
+ }
+ if( !mdb_tool_txn ) {
+ rc = mdb_txn_begin( mdb->mi_dbenv, NULL, 0, &mdb_tool_txn );
+ if( rc != 0 ) {
+ snprintf( text->bv_val, text->bv_len,
+ "txn_begin failed: %s (%d)",
+ mdb_strerror(rc), rc );
+ Debug( LDAP_DEBUG_ANY,
+ "=> " LDAP_XSTRING(mdb_tool_entry_delete) ": %s\n",
+ text->bv_val, 0, 0 );
+ return LDAP_OTHER;
+ }
+ }
+
+ rc = mdb_cursor_open( mdb_tool_txn, mdb->mi_dn2id, &cursor );
+ if( rc != 0 ) {
+ snprintf( text->bv_val, text->bv_len,
+ "cursor_open failed: %s (%d)",
+ mdb_strerror(rc), rc );
+ Debug( LDAP_DEBUG_ANY,
+ "=> " LDAP_XSTRING(mdb_tool_entry_delete) ": %s\n",
+ text->bv_val, 0, 0 );
+ return LDAP_OTHER;
+ }
+
+ op.o_hdr = &ohdr;
+ op.o_bd = be;
+ op.o_tmpmemctx = NULL;
+ op.o_tmpmfuncs = &ch_mfuncs;
+
+ rc = mdb_dn2entry( &op, mdb_tool_txn, cursor, ndn, &e, NULL, 0 );
+ if( rc != 0 ) {
+ snprintf( text->bv_val, text->bv_len,
+ "dn2entry failed: %s (%d)",
+ mdb_strerror(rc), rc );
+ Debug( LDAP_DEBUG_ANY,
+ "=> " LDAP_XSTRING(mdb_tool_entry_delete) ": %s\n",
+ text->bv_val, 0, 0 );
+ goto done;
+ }
+
+ /* check that we wouldn't orphan any children */
+ rc = mdb_dn2id_children( &op, mdb_tool_txn, e );
+ if( rc != MDB_NOTFOUND ) {
+ switch( rc ) {
+ case 0:
+ snprintf( text->bv_val, text->bv_len,
+ "delete failed:"
+ " subordinate objects must be deleted first");
+ break;
+ default:
+ snprintf( text->bv_val, text->bv_len,
+ "has_children failed: %s (%d)",
+ mdb_strerror(rc), rc );
+ break;
+ }
+ rc = -1;
+ Debug( LDAP_DEBUG_ANY,
+ "=> " LDAP_XSTRING(mdb_tool_entry_delete) ": %s\n",
+ text->bv_val, 0, 0 );
+ goto done;
+ }
+
+ /* delete from dn2id */
+ rc = mdb_dn2id_delete( &op, cursor, e->e_id, 1 );
+ if( rc != 0 ) {
+ snprintf( text->bv_val, text->bv_len,
+ "dn2id_delete failed: err=%d", rc );
+ Debug( LDAP_DEBUG_ANY,
+ "=> " LDAP_XSTRING(mdb_tool_entry_delete) ": %s\n",
+ text->bv_val, 0, 0 );
+ goto done;
+ }
+
+ /* deindex values */
+ rc = mdb_index_entry_del( &op, mdb_tool_txn, e );
+ if( rc != 0 ) {
+ snprintf( text->bv_val, text->bv_len,
+ "entry_delete failed: err=%d", rc );
+ Debug( LDAP_DEBUG_ANY,
+ "=> " LDAP_XSTRING(mdb_tool_entry_delete) ": %s\n",
+ text->bv_val, 0, 0 );
+ goto done;
+ }
+
+ /* do the deletion */
+ rc = mdb_id2entry_delete( be, mdb_tool_txn, e );
+ if( rc != 0 ) {
+ snprintf( text->bv_val, text->bv_len,
+ "id2entry_update failed: err=%d", rc );
+ Debug( LDAP_DEBUG_ANY,
+ "=> " LDAP_XSTRING(mdb_tool_entry_delete) ": %s\n",
+ text->bv_val, 0, 0 );
+ goto done;
+ }
+
+done:
+ /* free entry */
+ if( e != NULL ) {
+ mdb_entry_return( &op, e );
+ }
+
+ if( rc == 0 ) {
+ rc = mdb_txn_commit( mdb_tool_txn );
+ if( rc != 0 ) {
+ snprintf( text->bv_val, text->bv_len,
+ "txn_commit failed: %s (%d)",
+ mdb_strerror(rc), rc );
+ Debug( LDAP_DEBUG_ANY,
+ "=> " LDAP_XSTRING(mdb_tool_entry_delete) ": "
+ "%s\n", text->bv_val, 0, 0 );
+ }
+
+ } else {
+ mdb_txn_abort( mdb_tool_txn );
+ snprintf( text->bv_val, text->bv_len,
+ "txn_aborted! %s (%d)",
+ mdb_strerror(rc), rc );
+ Debug( LDAP_DEBUG_ANY,
+ "=> " LDAP_XSTRING(mdb_tool_entry_delete) ": %s\n",
+ text->bv_val, 0, 0 );
+ }
+ mdb_tool_txn = NULL;
+ cursor = NULL;
+
+ return rc;
+}
+
static void *
mdb_tool_index_task( void *ctx, void *ptr )
{
projects / openldap / blobdiff