/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2000-2005 The OpenLDAP Foundation.
+ * Copyright 2000-2007 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include "idl.h"
#include "lutil.h"
+#define bdb_dn2id_lock BDB_SYMBOL(dn2id_lock)
+
+static int
+bdb_dn2id_lock( struct bdb_info *bdb, struct berval *dn,
+ int rw, u_int32_t locker, DB_LOCK *lock )
+{
+ int rc;
+ DBT lockobj;
+ int db_rw;
+
+ if (rw)
+ db_rw = DB_LOCK_WRITE;
+ else
+ db_rw = DB_LOCK_READ;
+
+ lockobj.data = dn->bv_val;
+ lockobj.size = dn->bv_len;
+
+ rc = LOCK_GET(bdb->bi_dbenv, locker, DB_LOCK_NOWAIT,
+ &lockobj, db_rw, lock);
+ return rc;
+}
+
#ifndef BDB_HIER
int
bdb_dn2id_add(
char *buf;
struct berval ptr, pdn;
- Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_add( \"%s\", 0x%08lx )\n",
- e->e_ndn, (long) e->e_id, 0 );
+ Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_add 0x%lx: \"%s\"\n",
+ e->e_id, e->e_ndn, 0 );
assert( e->e_id != NOID );
DBTzero( &key );
/* store it -- don't override */
rc = db->put( db, txn, &key, &data, DB_NOOVERWRITE );
if( rc != 0 ) {
- Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_add: put failed: %s %d\n",
- db_strerror(rc), rc, 0 );
+ Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_add 0x%lx: put failed: %s %d\n",
+ e->e_id, db_strerror(rc), rc );
goto done;
}
rc = db->put( db, txn, &key, &data, DB_NOOVERWRITE );
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "=> bdb_dn2id_add: subtree (%s) put failed: %d\n",
- ptr.bv_val, rc, 0 );
+ "=> bdb_dn2id_add 0x%lx: subtree (%s) put failed: %d\n",
+ e->e_id, ptr.bv_val, rc );
goto done;
}
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "=> bdb_dn2id_add: parent (%s) insert failed: %d\n",
- ptr.bv_val, rc, 0 );
+ "=> bdb_dn2id_add 0x%lx: parent (%s) insert failed: %d\n",
+ e->e_id, ptr.bv_val, rc );
goto done;
}
}
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
- ptr.bv_val, rc, 0 );
+ "=> bdb_dn2id_add 0x%lx: subtree (%s) insert failed: %d\n",
+ e->e_id, ptr.bv_val, rc );
break;
}
#ifdef BDB_MULTIPLE_SUFFIXES
done:
op->o_tmpfree( buf, op->o_tmpmemctx );
- Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_add: %d\n", rc, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_add 0x%lx: %d\n", e->e_id, rc, 0 );
return rc;
}
{
struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
- int rc;
- DBT key;
char *buf;
+ DBT key;
+ DB_LOCK lock;
struct berval pdn, ptr;
+ int rc;
- Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_delete( \"%s\", 0x%08lx )\n",
- e->e_ndn, e->e_id, 0 );
+ Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_delete 0x%lx: \"%s\"\n",
+ e->e_id, e->e_ndn, 0 );
DBTzero( &key );
key.size = e->e_nname.bv_len + 2;
AC_MEMCPY( ptr.bv_val, e->e_nname.bv_val, e->e_nname.bv_len );
ptr.bv_val[ptr.bv_len] = '\0';
+ /* We hold this lock until the TXN completes */
+ rc = bdb_dn2id_lock( bdb, &e->e_nname, 1, TXN_ID( txn ), &lock );
+ if ( rc ) goto done;
+
/* delete it */
rc = db->del( db, txn, &key, 0 );
if( rc != 0 ) {
- Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_delete: delete failed: %s %d\n",
- db_strerror(rc), rc, 0 );
+ Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_delete 0x%lx: delete failed: %s %d\n",
+ e->e_id, db_strerror(rc), rc );
goto done;
}
#endif
{
buf[0] = DN_SUBTREE_PREFIX;
- rc = db->del( db, txn, &key, 0 );
+ rc = bdb_idl_delete_key( op->o_bd, db, txn, &key, e->e_id );
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
- ptr.bv_val, rc, 0 );
+ "=> bdb_dn2id_delete 0x%lx: subtree (%s) delete failed: %d\n",
+ e->e_id, ptr.bv_val, rc );
goto done;
}
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "=> bdb_dn2id_delete: parent (%s) delete failed: %d\n",
- ptr.bv_val, rc, 0 );
+ "=> bdb_dn2id_delete 0x%lx: parent (%s) delete failed: %d\n",
+ e->e_id, ptr.bv_val, rc );
goto done;
}
}
rc = bdb_idl_delete_key( op->o_bd, db, txn, &key, e->e_id );
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
- "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
- ptr.bv_val, rc, 0 );
+ "=> bdb_dn2id_delete 0x%lx: subtree (%s) delete failed: %d\n",
+ e->e_id, ptr.bv_val, rc );
goto done;
}
#ifdef BDB_MULTIPLE_SUFFIXES
done:
op->o_tmpfree( buf, op->o_tmpmemctx );
- Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_delete %d\n", rc, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_delete 0x%lx: %d\n", e->e_id, rc, 0 );
return rc;
}
int
bdb_dn2id(
Operation *op,
- DB_TXN *txn,
struct berval *dn,
- EntryInfo *ei )
+ EntryInfo *ei,
+ u_int32_t locker,
+ DB_LOCK *lock )
{
struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
+ DBC *cursor;
int rc;
DBT key, data;
ID nid;
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id(\"%s\")\n", dn->bv_val, 0, 0 );
+
DBTzero( &key );
key.size = dn->bv_len + 2;
key.data = op->o_tmpalloc( key.size, op->o_tmpmemctx );
data.ulen = sizeof(ID);
data.flags = DB_DBT_USERMEM;
+ rc = db->cursor( db, NULL, &cursor, bdb->bi_db_opflags );
+ if ( rc ) goto leave;
+
+ rc = bdb_dn2id_lock( bdb, dn, 0, locker, lock );
+ if ( rc ) goto nolock;
+
+ if ( locker ) {
+ cursor->locker = locker;
+ }
+
/* fetch it */
- rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags );
+ rc = cursor->c_get( cursor, &key, &data, DB_SET );
+
+nolock:
+ cursor->c_close( cursor );
+leave:
if( rc != 0 ) {
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: get failed: %s (%d)\n",
db_strerror( rc ), rc, 0 );
} else {
BDB_DISK2ID( &nid, &ei->bei_id );
- Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: got id=0x%08lx\n",
+ Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: got id=0x%lx\n",
ei->bei_id, 0, 0 );
}
-
op->o_tmpfree( key.data, op->o_tmpmemctx );
return rc;
}
unsigned char entryID[sizeof(ID)]; /* variable placement */
} diskNode;
+/* Sort function for the sorted duplicate data items of a dn2id key.
+ * Sorts based on normalized RDN, in length order.
+ */
+int
+hdb_dup_compare(
+ DB *db,
+ const DBT *usrkey,
+ const DBT *curkey
+)
+{
+ diskNode *un, *cn;
+ int rc, ul, cl;
+
+ un = (diskNode *)usrkey->data;
+ cn = (diskNode *)curkey->data;
+
+ /* data is not aligned, cannot compare directly */
+ rc = un->nrdnlen[0] - cn->nrdnlen[0];
+ if ( rc ) return rc;
+ rc = un->nrdnlen[1] - cn->nrdnlen[1];
+ if ( rc ) return rc;
+
+ return strcmp( un->nrdn, cn->nrdn );
+}
+
/* This function constructs a full DN for a given entry.
*/
int hdb_fix_dn(
diskNode *d;
char *ptr;
+ Debug( LDAP_DEBUG_TRACE, "=> hdb_dn2id_add 0x%lx: \"%s\"\n",
+ e->e_id, e->e_ndn, 0 );
+
nrlen = dn_rdnlen( op->o_bd, &e->e_nname );
if (nrlen) {
rlen = dn_rdnlen( op->o_bd, &e->e_name );
bdb_idl_cache_add_id( bdb, db, &key, e->e_id );
}
}
+
+leave:
op->o_tmpfree( d, op->o_tmpmemctx );
+ Debug( LDAP_DEBUG_TRACE, "<= hdb_dn2id_add 0x%lx: %d\n", e->e_id, rc, 0 );
return rc;
}
int rc;
ID nid;
unsigned char dlen[2];
+ DB_LOCK lock;
+
+ Debug( LDAP_DEBUG_TRACE, "=> hdb_dn2id_delete 0x%lx: \"%s\"\n",
+ e->e_id, e->e_ndn, 0 );
DBTzero(&key);
key.size = sizeof(ID);
data.flags = DB_DBT_USERMEM | DB_DBT_PARTIAL;
key.data = &nid;
- rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );
- if ( rc ) return rc;
d = op->o_tmpalloc( data.size, op->o_tmpmemctx );
d->nrdnlen[1] = BEI(e)->bei_nrdn.bv_len & 0xff;
strcpy( d->nrdn, BEI(e)->bei_nrdn.bv_val );
data.data = d;
+ rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );
+ if ( rc ) goto leave;
+
+ /* We hold this lock until the TXN completes */
+ rc = bdb_dn2id_lock( bdb, &e->e_nname, 1, TXN_ID( txn ), &lock );
+ if ( rc ) goto nolock;
+
/* Delete our ID from the parent's list */
rc = cursor->c_get( cursor, &key, &data, DB_GET_BOTH_RANGE );
if ( rc == 0 ) {
if ( rc == 0 )
rc = cursor->c_del( cursor, 0 );
}
+
+nolock:
cursor->c_close( cursor );
+leave:
op->o_tmpfree( d, op->o_tmpmemctx );
/* Delete IDL cache entries */
bdb_idl_cache_del_id( bdb, db, &key, e->e_id );
}
}
+ Debug( LDAP_DEBUG_TRACE, "<= hdb_dn2id_delete 0x%lx: %d\n", e->e_id, rc, 0 );
return rc;
}
int
hdb_dn2id(
Operation *op,
- DB_TXN *txn,
struct berval *in,
- EntryInfo *ei )
+ EntryInfo *ei,
+ u_int32_t locker,
+ DB_LOCK *lock )
{
struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
unsigned char dlen[2];
ID idp, parentID;
+ Debug( LDAP_DEBUG_TRACE, "=> hdb_dn2id(\"%s\")\n", in->bv_val, 0, 0 );
+
nrlen = dn_rdnlen( op->o_bd, in );
if (!nrlen) nrlen = in->bv_len;
data.dlen = data.ulen;
data.flags = DB_DBT_USERMEM | DB_DBT_PARTIAL;
- rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );
+ rc = db->cursor( db, NULL, &cursor, bdb->bi_db_opflags );
if ( rc ) return rc;
+ if ( locker ) {
+ cursor->locker = locker;
+ }
d = op->o_tmpalloc( data.size * 3, op->o_tmpmemctx );
d->nrdnlen[1] = nrlen & 0xff;
*ptr = '\0';
data.data = d;
+ rc = bdb_dn2id_lock( bdb, in, 0, locker, lock );
+ if ( rc ) goto leave;
+
rc = cursor->c_get( cursor, &key, &data, DB_GET_BOTH_RANGE );
if ( rc == 0 && (dlen[1] != d->nrdnlen[1] || dlen[0] != d->nrdnlen[0] ||
strncmp( d->nrdn, in->bv_val, nrlen ))) {
ei->bei_parent->bei_dkids = dkids;
}
}
+
+leave:
cursor->c_close( cursor );
op->o_tmpfree( d, op->o_tmpmemctx );
+ if( rc != 0 ) {
+ Debug( LDAP_DEBUG_TRACE, "<= hdb_dn2id: get failed: %s (%d)\n",
+ db_strerror( rc ), rc, 0 );
+ } else {
+ Debug( LDAP_DEBUG_TRACE, "<= hdb_dn2id: got id=0x%lx\n",
+ ei->bei_id, 0, 0 );
+ }
return rc;
}
int
hdb_dn2id_parent(
Operation *op,
- DB_TXN *txn,
+ u_int32_t locker,
EntryInfo *ei,
ID *idp )
{
DBTzero(&data);
data.flags = DB_DBT_USERMEM;
- rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );
+ rc = db->cursor( db, NULL, &cursor, bdb->bi_db_opflags );
if ( rc ) return rc;
+ if ( locker ) {
+ cursor->locker = locker;
+ }
data.ulen = sizeof(diskNode) + (SLAP_LDAPDN_MAXLEN * 2);
d = op->o_tmpalloc( data.ulen, op->o_tmpmemctx );
cx->rc = cx->db->cursor( cx->db, NULL, &cx->dbc,
cx->bdb->bi_db_opflags );
- if ( cx->rc ) return cx->rc;
+ if ( cx->rc )
+ goto done_one;
cx->data.data = &cx->dbuf;
cx->data.ulen = sizeof(ID);
cx->rc = cx->dbc->c_get( cx->dbc, &cx->key, &cx->data, DB_SET );
if ( cx->rc ) {
cx->dbc->c_close( cx->dbc );
- return cx->rc;
+ goto done_one;
}
/* If the on-disk count is zero we've never checked it.
cx->data.ulen = BDB_IDL_UM_SIZE * sizeof(ID);
cx->data.flags = DB_DBT_USERMEM;
- /* Fetch the rest of the IDs in a loop... */
- while ( (cx->rc = cx->dbc->c_get( cx->dbc, &cx->key, &cx->data,
- DB_MULTIPLE | DB_NEXT_DUP )) == 0 ) {
- u_int8_t *j;
- size_t len;
- void *ptr;
- DB_MULTIPLE_INIT( ptr, &cx->data );
- while (ptr) {
- DB_MULTIPLE_NEXT( ptr, &cx->data, j, len );
- if (j) {
- EntryInfo *ei2;
- diskNode *d = (diskNode *)j;
- short nrlen;
-
- BDB_DISK2ID( j + len - sizeof(ID), &ei.bei_id );
- nrlen = ((d->nrdnlen[0] ^ 0x80) << 8) | d->nrdnlen[1];
- ei.bei_nrdn.bv_len = nrlen;
- /* nrdn/rdn are set in-place.
- * hdb_cache_load will copy them as needed
- */
- ei.bei_nrdn.bv_val = d->nrdn;
- ei.bei_rdn.bv_len = len - sizeof(diskNode)
- - ei.bei_nrdn.bv_len;
- ei.bei_rdn.bv_val = d->nrdn + ei.bei_nrdn.bv_len + 1;
- bdb_idl_append_one( cx->tmp, ei.bei_id );
- hdb_cache_load( cx->bdb, &ei, &ei2 );
+ if ( dkids > 1 ) {
+ /* Fetch the rest of the IDs in a loop... */
+ while ( (cx->rc = cx->dbc->c_get( cx->dbc, &cx->key, &cx->data,
+ DB_MULTIPLE | DB_NEXT_DUP )) == 0 ) {
+ u_int8_t *j;
+ size_t len;
+ void *ptr;
+ DB_MULTIPLE_INIT( ptr, &cx->data );
+ while (ptr) {
+ DB_MULTIPLE_NEXT( ptr, &cx->data, j, len );
+ if (j) {
+ EntryInfo *ei2;
+ diskNode *d = (diskNode *)j;
+ short nrlen;
+
+ BDB_DISK2ID( j + len - sizeof(ID), &ei.bei_id );
+ nrlen = ((d->nrdnlen[0] ^ 0x80) << 8) | d->nrdnlen[1];
+ ei.bei_nrdn.bv_len = nrlen;
+ /* nrdn/rdn are set in-place.
+ * hdb_cache_load will copy them as needed
+ */
+ ei.bei_nrdn.bv_val = d->nrdn;
+ ei.bei_rdn.bv_len = len - sizeof(diskNode)
+ - ei.bei_nrdn.bv_len;
+ ei.bei_rdn.bv_val = d->nrdn + ei.bei_nrdn.bv_len + 1;
+ bdb_idl_append_one( cx->tmp, ei.bei_id );
+ hdb_cache_load( cx->bdb, &ei, &ei2 );
+ }
}
}
}
+
cx->rc = cx->dbc->c_close( cx->dbc );
+done_one:
+ bdb_cache_entryinfo_lock( cx->ei );
+ cx->ei->bei_state ^= CACHE_ENTRY_ONELEVEL;
+ bdb_cache_entryinfo_unlock( cx->ei );
+ if ( cx->rc )
+ return cx->rc;
+
} else {
/* The in-memory cache is in sync with the on-disk data.
* do we have any kids?
if ( !BDB_IDL_IS_RANGE( cx->tmp ) && cx->tmp[0] > 3 )
bdb_idl_sort( cx->tmp, cx->buf );
- if ( cx->bdb->bi_idl_cache_max_size ) {
+ if ( cx->bdb->bi_idl_cache_max_size && !BDB_IDL_IS_ZERO( cx->tmp )) {
char *ptr = ((char *)&cx->id)-1;
cx->key.data = ptr;
cx->key.size = sizeof(ID)+1;
projects / openldap / blobdiff