X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fnextid.c;h=3ec1e36c6fcac6af4fd34cf8759676bcab07d80c;hb=82c1b0d1f0a27e374961c910473f549878e81e24;hp=f7a3e6dfbae49587abe6d10f4458f6f140c4addc;hpb=d5d801d1528935c3a2634544a48d2429d3f163b0;p=openldap
diff --git a/servers/slapd/back-bdb/nextid.c b/servers/slapd/back-bdb/nextid.c
index f7a3e6dfba..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 .
+ *
+ * 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
+ * .
*/
#include "portable.h"
@@ -15,161 +24,56 @@
int bdb_next_id( BackendDB *be, DB_TXN *tid, ID *out )
{
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
- int rc;
- ID kid = NOID;
- ID id;
- DBT key, data;
- DB_TXN *ltid = NULL;
-
- DBTzero( &key );
- key.data = (char *) &kid;
- key.size = sizeof( kid );
-
- DBTzero( &data );
- data.data = (char *) &id;
- data.ulen = sizeof( id );
- data.flags = DB_DBT_USERMEM;
-
- 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;
- }
- }
-
- if( bdb->bi_txn ) {
- rc = txn_begin( bdb->bi_dbenv, tid, <id, 0 );
- if( rc != 0 ) {
- Debug( LDAP_DEBUG_ANY,
- "=> bdb_next_id: txn_begin failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
- return rc;
- }
- }
-
- /* 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;
- 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;
+ ldap_pvt_thread_mutex_lock( &bdb->bi_lastid_mutex );
+ *out = ++bdb->bi_lastid;
+ ldap_pvt_thread_mutex_unlock( &bdb->bi_lastid_mutex );
- default:
- Debug( LDAP_DEBUG_ANY,
- "=> bdb_next_id: get failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
- goto done;
- }
-
- if( bdb->bi_lastid > id ) id = bdb->bi_lastid;
-
- 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;
-
- if (bdb->bi_txn) {
- rc = txn_commit( ltid, 0 );
- ltid = NULL;
- }
-
- 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 );
- }
-
- return rc;
+ 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;
+ 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 existing value for read/modify/write */
- rc = bdb->bi_nextid->bdi_db->get( bdb->bi_nextid->bdi_db,
- tid, &key, &data, 0 );
+ /* Get a read cursor */
+ rc = bdb->bi_id2entry->bdi_db->cursor( bdb->bi_id2entry->bdi_db,
+ tid, &cursor, 0 );
+
+ if (rc == 0) {
+ rc = cursor->c_get(cursor, &key, &data, DB_LAST);
+ cursor->c_close(cursor);
+ }
switch(rc) {
case DB_NOTFOUND:
id = 0;
rc = 0;
- break;
-
+ /* FALLTHROUGH */
case 0:
- if ( data.size != sizeof( id ) ) {
- Debug( LDAP_DEBUG_ANY,
- "=> bdb_last_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;
}