X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Ftools.c;h=1056944ebd255be7170b73275a5ca7b9c41ac04c;hb=23efa07a994c94c4e78a9495ac6e2981b87b4ba0;hp=255648ef722b95516dc86cd1d92c5b05612b336b;hpb=433eb73ef8d22d98e87e054ac4654d096261547c;p=openldap

diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c
index 255648ef72..1056944ebd 100644
--- a/servers/slapd/back-bdb/tools.c
+++ b/servers/slapd/back-bdb/tools.c
@@ -1,7 +1,7 @@
 /* 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
  */
 
@@ -18,18 +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;
-
-	assert( be != NULL );
-	assert( bdb != NULL );
-	
-	rc = bdb->bi_id2entry->bdi_db->cursor(
-		bdb->bi_id2entry->bdi_db, NULL, &cursor, 0 );
-	if( rc != 0 ) {
-		return NOID;
-	}
-
 	/* initialize key and data thangs */
 	DBTzero( &key );
 	DBTzero( &data );
@@ -42,8 +30,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 ) {
@@ -68,10 +54,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 );
 
@@ -105,89 +101,158 @@ 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;
+	DB_TXN *tid = NULL;
+	struct berval pdn;
 
 	assert( be != NULL );
 	assert( slapMode & SLAP_TOOL_MODE );
 
+	assert( text );
+	assert( text->bv_val );
+	assert( text->bv_val[0] == '\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",
-		e->e_id, e->e_dn, 0 );
+		(long) e->e_id, e->e_dn, 0 );
+#endif
 
-	rc = txn_begin( bdb->bi_dbenv, NULL, &tid, 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 );
+#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: txn_begin failed: %s (%d)\n",
-			db_strerror(rc), rc, 0 );
+			"=> bdb_tool_entry_put: %s\n",
+			 text->bv_val, 0, 0 );
+#endif
 		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, ERR, 
+			"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_ANY,
-			"=> bdb_tool_entry_put: next_id failed: %s (%d)\n",
-			db_strerror(rc), rc, 0 );
+			"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
+#endif
 		goto done;
 	}
 
 	/* add dn2id indices */
-	rc = bdb_dn2id_add( be, tid, e->e_ndn, e->e_id );
+	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 );
+#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: dn2id_add failed: %s (%d)\n",
-			db_strerror(rc), rc, 0 );
+			"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
+#endif
 		goto done;
 	}
 
 	/* 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 );
+#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: id2entry_add failed: %s (%d)\n",
-			db_strerror(rc), rc, 0 );
+			"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
+#endif
 		goto done;
 	}
 
-#if BDB_INDEX
 	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 );
+#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: index_entry_add failed: %s (%d)\n",
-			db_strerror(rc), rc, 0 );
+			"=> bdb_tool_entry_put: %s\n", text->bv_val, 0, 0 );
+#endif
 		goto done;
 	}
-#endif
 
 done:
 	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 );
+#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: txn_commit failed: %s (%d)\n",
-				db_strerror(rc), rc, 0 );
+				"=> 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: txn_aborted!\n",
-			0, 0, 0 );
-		txn_abort( tid );
+			"=> bdb_tool_entry_put: %s\n",
+			text->bv_val, 0, 0 );
+#endif
 		e->e_id = NOID;
 	}
 
 	return e->e_id;
 }
 
-#if BDB_REINDEX
 int bdb_tool_entry_reindex(
 	BackendDB *be,
 	ID id )
@@ -196,26 +261,45 @@ int bdb_tool_entry_reindex(
 	int rc;
 	Entry *e;
 	DB_TXN *tid = NULL;
+	struct berval pdn;
 
+#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 );
-
-#if 0
-	rc = txn_begin( bi->bi_dbenv, NULL, &tid, 0 );
 #endif
- 	
+
 	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 );
-#if 0
-		txn_abort( tid );
 #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;
+	}
+ 	
 	/*
 	 * just (re)add them for now
 	 * assume that some other routine (not yet implemented)
@@ -223,13 +307,65 @@ 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",
-		id, e->e_dn, 0 );
+		(long) id, e->e_dn, 0 );
+#endif
+
+	/* 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 ) {
+#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;
+	}
 
 	rc = bdb_index_entry_add( be, tid, e, e->e_attrs );
 
-	entry_free( e );
+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;
+	}
 
 	return rc;
 }
-#endif