X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fnextid.c;h=04b2f267ccb174f34fd0e7bc83fd74d0f570bedb;hb=190f161d741fb87417d743b64d0100dd6e2c0855;hp=a534840ae3085dd1e77a183335911229d0409ba0;hpb=bee0650d9ccf930491f6b9cbf2e149a93e0770d8;p=openldap

diff --git a/servers/slapd/back-bdb/nextid.c b/servers/slapd/back-bdb/nextid.c
index a534840ae3..04b2f267cc 100644
--- a/servers/slapd/back-bdb/nextid.c
+++ b/servers/slapd/back-bdb/nextid.c
@@ -1,7 +1,7 @@
 /* init.c - initialize bdb backend */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -13,111 +13,63 @@
 #include "back-bdb.h"
 
 int bdb_next_id( BackendDB *be, DB_TXN *tid, ID *out )
+{
+	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+
+	ldap_pvt_thread_mutex_lock( &bdb->bi_lastid_mutex );
+	*out = ++bdb->bi_lastid;
+	ldap_pvt_thread_mutex_unlock( &bdb->bi_lastid_mutex );
+
+	return 0;
+}
+
+int bdb_last_id( BackendDB *be, DB_TXN *tid )
 {
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 	int rc;
-	ID kid = NOID;
-	ID id;
+	ID id = 0;
 	DBT key, data;
-	DB_TXN	*ltid;
+	DBC *cursor;
 
 	DBTzero( &key );
-	key.data = (char *) &kid;
-	key.size = sizeof( kid );
+	key.flags = DB_DBT_USERMEM;
+	key.data = (char *) &id;
+	key.ulen = sizeof( id );
 
 	DBTzero( &data );
-	data.data = (char *) &id;
-	data.ulen = sizeof( id );
-	data.flags = DB_DBT_USERMEM;
+	data.flags = DB_DBT_USERMEM | DB_DBT_PARTIAL;
 
-	if( 0 ) {
-retry:	if( tid != NULL ) {
-			/* nested transaction, abort and return */
-			(void) txn_abort( ltid );
-			Debug( LDAP_DEBUG_ANY,
-				"=> bdb_next_id: aborted!\n",
-				0, 0, 0 );
-			return rc;
-		}
-		rc = txn_abort( ltid );
-		if( rc != 0 ) {
-			Debug( LDAP_DEBUG_ANY,
-				"=> bdb_next_id: txn_abort failed: %s (%d)\n",
-				db_strerror(rc), rc, 0 );
-			return rc;
-		}
-	}
+	/* Get a read cursor */
+	rc = bdb->bi_id2entry->bdi_db->cursor( bdb->bi_id2entry->bdi_db,
+		tid, &cursor, 0 );
 
-	rc = txn_begin( bdb->bi_dbenv, tid, &ltid, 0 );
-	if( rc != 0 ) {
-		Debug( LDAP_DEBUG_ANY,
-			"=> bdb_next_id: txn_begin failed: %s (%d)\n",
-			db_strerror(rc), rc, 0 );
-		return rc;
+	if (rc == 0) {
+		rc = cursor->c_get(cursor, &key, &data, DB_LAST);
+		cursor->c_close(cursor);
 	}
 
-	/* get existing value for read/modify/write */
-	rc = bdb->bi_nextid->bdi_db->get( bdb->bi_nextid->bdi_db,
-		ltid, &key, &data, DB_RMW );
-
 	switch(rc) {
-	case DB_LOCK_DEADLOCK:
-	case DB_LOCK_NOTGRANTED:
-		goto retry;
-
 	case DB_NOTFOUND:
 		id = 0;
-		break;
-
+		rc = 0;
+		/* FALLTHROUGH */
 	case 0:
-		if ( data.size != sizeof( id ) ) {
-			Debug( LDAP_DEBUG_ANY,
-				"=> bdb_next_id: get size mismatch: expected %ld, got %ld\n",
-				(long) sizeof( id ), (long) data.size, 0 );
-			rc = -1;
-			goto done;
-		}
 		break;
 
 	default:
+#ifdef NEW_LOGGING
+		LDAP_LOG ( INDEX, ERR, "bdb_last_id: get failed: %s (%d)\n",
+			db_strerror(rc), rc, 0 );
+#else
 		Debug( LDAP_DEBUG_ANY,
-			"=> bdb_next_id: get failed: %s (%d)\n",
+			"=> bdb_last_id: get failed: %s (%d)\n",
 			db_strerror(rc), rc, 0 );
+#endif
 		goto done;
 	}
 
-	id++;
-	data.size = sizeof( id );
-
-	/* put new value */
-	rc = bdb->bi_nextid->bdi_db->put( bdb->bi_nextid->bdi_db,
-		ltid, &key, &data, 0 );
-
-	switch(rc) {
-	case DB_LOCK_DEADLOCK:
-	case DB_LOCK_NOTGRANTED:
-		goto retry;
-
-	case 0:
-		*out = id;
-
-		bdb->bi_lastid = id;
-
-		rc = txn_commit( ltid, 0 );
-
-		if( rc != 0 ) {
-			Debug( LDAP_DEBUG_ANY,
-				"=> bdb_next_id: commit failed: %s (%d)\n",
-				db_strerror(rc), rc, 0 );
-		}
-		break;
-
-	default:
-		Debug( LDAP_DEBUG_ANY,
-			"=> bdb_next_id: put failed: %s (%d)\n",
-			db_strerror(rc), rc, 0 );
-done:	(void) txn_abort( ltid );
-	}
+	bdb->bi_lastid = id;
 
+done:
 	return rc;
 }