More for #5860 - if the cache blew past the maxsize, bring it all the way

[openldap] / servers / slapd / back-bdb / nextid.c

diff --git a/servers/slapd/back-bdb/nextid.c b/servers/slapd/back-bdb/nextid.c
index acf15046c7694ddf4f9b764491b7f8e4e2d4ae6c..50d3d0aef4028ff31be9608a1af55fad18d79530 100644 (file)
--- a/servers/slapd/back-bdb/nextid.c
+++ b/servers/slapd/back-bdb/nextid.c
@@ -1,73 +1,80 @@
 /* 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-2009 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"
 
 #include <stdio.h>
-
 #include <ac/string.h>
-#include <ac/socket.h>
 
 #include "back-bdb.h"
 
-int bdb_next_id( BackendDB *be, DB_TXN *tid, ID *out )
+int bdb_next_id( BackendDB *be, 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;
+       unsigned char idbuf[sizeof(ID)];
        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 *) idbuf;
+       key.ulen = sizeof( idbuf );
 
        DBTzero( &data );
-       data.data = (char *) &id;
-       data.ulen = sizeof( id );
-       data.flags = DB_DBT_USERMEM;
-
-       /* get exiting value (with write lock) */
-       rc = bdb->bi_entries->bdi_db->get( bdb->bi_nextid->bdi_db,
-               ltid, &key, &data, DB_RMW );
+       data.flags = DB_DBT_USERMEM | DB_DBT_PARTIAL;
 
-       if( rc == DB_NOTFOUND ) {
-               /* must be first add */
-               id = NOID;
+       /* Get a read cursor */
+       rc = bdb->bi_id2entry->bdi_db->cursor( bdb->bi_id2entry->bdi_db,
+               tid, &cursor, 0 );
 
-       } 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:
+               rc = 0;
+               break;
+       case 0:
+               BDB_DISK2ID( idbuf, &id );
+               break;
+
+       default:
+               Debug( LDAP_DEBUG_ANY,
+                       "=> bdb_last_id: get failed: %s (%d)\n",
+                       db_strerror(rc), rc, 0 );
                goto done;
        }
 
-       id++;
-
-       /* store new value */
-       rc = bdb->bi_entries->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;
 }