X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fnextid.c;h=3ec1e36c6fcac6af4fd34cf8759676bcab07d80c;hb=82c1b0d1f0a27e374961c910473f549878e81e24;hp=68f87b3fd9fd636c5178176b90f5d1f5698d8605;hpb=aaab54e14270a6ba1d6d16f9b0b9bcf52a7c8cba;p=openldap

diff --git a/servers/slapd/back-bdb/nextid.c b/servers/slapd/back-bdb/nextid.c
index 68f87b3fd9..3ec1e36c6f 100644
--- a/servers/slapd/back-bdb/nextid.c
+++ b/servers/slapd/back-bdb/nextid.c
@@ -1,8 +1,17 @@
 /* init.c - initialize bdb backend */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -13,59 +22,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;
-
-	rc = txn_begin( bdb->bi_dbenv, tid, &ltid, 0 );
-	if( rc != 0 ) {
-		return rc;
-	}
+	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;
 
-	/* get exiting value (with write lock) */
-	rc = bdb->bi_nextid->bdi_db->get( bdb->bi_nextid->bdi_db,
-		ltid, &key, &data, DB_RMW );
+	/* Get a read cursor */
+	rc = bdb->bi_id2entry->bdi_db->cursor( bdb->bi_id2entry->bdi_db,
+		tid, &cursor, 0 );
 
-	if( rc == DB_NOTFOUND ) {
-		/* must be first add */
-		id = NOID;
-
-	} else if( rc != 0 ) {
-		goto done;
+	if (rc == 0) {
+		rc = cursor->c_get(cursor, &key, &data, DB_LAST);
+		cursor->c_close(cursor);
+	}
 
-	} else if ( data.size != sizeof(ID) ) {
-		/* size mismatch! */
-		rc = -1;
+	switch(rc) {
+	case DB_NOTFOUND:
+		id = 0;
+		rc = 0;
+		/* FALLTHROUGH */
+	case 0:
+		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_last_id: get failed: %s (%d)\n",
+			db_strerror(rc), rc, 0 );
+#endif
 		goto done;
 	}
 
-	id++;
-
-	/* store new value */
-	rc = bdb->bi_nextid->bdi_db->put( bdb->bi_nextid->bdi_db,
-		ltid, &key, &data, 0 );
-
-	*out = id;
+	bdb->bi_lastid = id;
 
 done:
-	if( rc != 0 ) {
-		(void) txn_abort( ltid );
-	} else {
-		rc = txn_commit( ltid, 0 );
-	}
-
 	return rc;
 }