X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fdn2id.c;h=eb7fbdb3fa52b8843392884c0f944102c3739b39;hb=19deaedb59bfda97526836af89d56d5d8b1d8c14;hp=fa0c7e601f78165b7112600decce1327a82e1e54;hpb=6f461690c1647a710fcb25022ad72e5c82b56674;p=openldap
diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index fa0c7e601f..eb7fbdb3fa 100644
--- a/servers/slapd/back-bdb/dn2id.c
+++ b/servers/slapd/back-bdb/dn2id.c
@@ -1,8 +1,17 @@
/* dn2id.c - routines to deal with the dn2id index */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 2000-2007 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"
@@ -14,36 +23,54 @@
#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(
- BackendDB *be,
+ Operation *op,
DB_TXN *txn,
EntryInfo *eip,
- Entry *e,
- void *ctx )
+ Entry *e )
{
- struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
int rc;
DBT key, data;
+ ID nid;
char *buf;
struct berval ptr, pdn;
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ARGS, "bdb_dn2id_add( \"%s\", 0x%08lx )\n",
- e->e_ndn, (long) e->e_id, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_add( \"%s\", 0x%08lx )\n",
- e->e_ndn, (long) e->e_id, 0 );
-#endif
+ 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 );
key.size = e->e_nname.bv_len + 2;
key.ulen = key.size;
key.flags = DB_DBT_USERMEM;
- buf = sl_malloc( key.size, ctx );
+ buf = op->o_tmpalloc( key.size, op->o_tmpmemctx );
key.data = buf;
buf[0] = DN_BASE_PREFIX;
ptr.bv_val = buf + 1;
@@ -52,43 +79,35 @@ bdb_dn2id_add(
ptr.bv_val[ptr.bv_len] = '\0';
DBTzero( &data );
- data.data = (char *) &e->e_id;
- data.size = sizeof( e->e_id );
+ data.data = &nid;
+ data.size = sizeof( nid );
+ BDB_ID2DISK( e->e_id, &nid );
/* store it -- don't override */
rc = db->put( db, txn, &key, &data, DB_NOOVERWRITE );
if( rc != 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ERR, "bdb_dn2id_add: put failed: %s %d\n",
- db_strerror(rc), rc, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_add: put failed: %s %d\n",
- db_strerror(rc), rc, 0 );
-#endif
+ Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_add 0x%lx: put failed: %s %d\n",
+ e->e_id, db_strerror(rc), rc );
goto done;
}
#ifndef BDB_MULTIPLE_SUFFIXES
- if( !be_issuffix( be, &ptr )) {
+ if( !be_issuffix( op->o_bd, &ptr ))
#endif
+ {
buf[0] = DN_SUBTREE_PREFIX;
rc = db->put( db, txn, &key, &data, DB_NOOVERWRITE );
if( rc != 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ERR,
- "=> bdb_dn2id_add: subtree (%s) put failed: %d\n",
- ptr.bv_val, rc, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
- "=> bdb_dn2id_add: subtree (%s) put failed: %d\n",
- ptr.bv_val, rc, 0 );
-#endif
+ "=> bdb_dn2id_add 0x%lx: subtree (%s) put failed: %d\n",
+ e->e_id, ptr.bv_val, rc );
goto done;
}
#ifdef BDB_MULTIPLE_SUFFIXES
- if( !be_issuffix( be, &ptr )) {
+ if( !be_issuffix( op->o_bd, &ptr ))
#endif
+ {
dnParent( &ptr, &pdn );
key.size = pdn.bv_len + 2;
@@ -97,45 +116,34 @@ bdb_dn2id_add(
key.data = pdn.bv_val-1;
ptr = pdn;
- rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id );
+ rc = bdb_idl_insert_key( op->o_bd, db, txn, &key, e->e_id );
if( rc != 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ERR,
- "=> bdb_dn2id_add: parent (%s) insert failed: %d\n",
- ptr.bv_val, rc, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
- "=> bdb_dn2id_add: parent (%s) insert failed: %d\n",
- ptr.bv_val, rc, 0 );
-#endif
+ "=> bdb_dn2id_add 0x%lx: parent (%s) insert failed: %d\n",
+ e->e_id, ptr.bv_val, rc );
goto done;
}
-#ifndef BDB_MULTIPLE_SUFFIXES
}
- while( !be_issuffix( be, &ptr )) {
+#ifndef BDB_MULTIPLE_SUFFIXES
+ while( !be_issuffix( op->o_bd, &ptr ))
#else
- for (;;) {
+ for (;;)
#endif
+ {
ptr.bv_val[-1] = DN_SUBTREE_PREFIX;
- rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id );
+ rc = bdb_idl_insert_key( op->o_bd, db, txn, &key, e->e_id );
if( rc != 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ERR,
- "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
- ptr.bv_val, rc, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
- "=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
- ptr.bv_val, rc, 0 );
-#endif
+ "=> bdb_dn2id_add 0x%lx: subtree (%s) insert failed: %d\n",
+ e->e_id, ptr.bv_val, rc );
break;
}
#ifdef BDB_MULTIPLE_SUFFIXES
- if( be_issuffix( be, &ptr )) break;
+ if( be_issuffix( op->o_bd, &ptr )) break;
#endif
dnParent( &ptr, &pdn );
@@ -144,46 +152,35 @@ bdb_dn2id_add(
key.data = pdn.bv_val - 1;
ptr = pdn;
}
-#ifdef BDB_MULTIPLE_SUFFIXES
}
-#endif
done:
- sl_free( buf, ctx );
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, RESULTS, "<= bdb_dn2id_add: %d\n", rc, 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_add: %d\n", rc, 0, 0 );
-#endif
+ op->o_tmpfree( buf, op->o_tmpmemctx );
+ Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_add 0x%lx: %d\n", e->e_id, rc, 0 );
return rc;
}
int
bdb_dn2id_delete(
- BackendDB *be,
+ Operation *op,
DB_TXN *txn,
EntryInfo *eip,
- Entry *e,
- void *ctx )
+ Entry *e )
{
- struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+ 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;
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ARGS,
- "=> bdb_dn2id_delete ( \"%s\", 0x%08lx )\n", e->e_ndn, e->e_id, 0);
-#else
- Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_delete( \"%s\", 0x%08lx )\n",
- e->e_ndn, e->e_id, 0 );
-#endif
+ 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;
- buf = sl_malloc( key.size, ctx );
+ buf = op->o_tmpalloc( key.size, op->o_tmpmemctx );
key.data = buf;
key.flags = DB_DBT_USERMEM;
buf[0] = DN_BASE_PREFIX;
@@ -192,41 +189,35 @@ bdb_dn2id_delete(
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 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ERR,
- "=> bdb_dn2id_delete: delete failed: %s %d\n",
- db_strerror(rc), rc, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_delete: delete failed: %s %d\n",
- db_strerror(rc), rc, 0 );
-#endif
+ Debug( LDAP_DEBUG_ANY, "=> bdb_dn2id_delete 0x%lx: delete failed: %s %d\n",
+ e->e_id, db_strerror(rc), rc );
goto done;
}
#ifndef BDB_MULTIPLE_SUFFIXES
- if( !be_issuffix( be, &ptr )) {
+ if( !be_issuffix( op->o_bd, &ptr ))
#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 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ERR,
- "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
- ptr.bv_val, rc, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
- "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
- ptr.bv_val, rc, 0 );
-#endif
+ "=> bdb_dn2id_delete 0x%lx: subtree (%s) delete failed: %d\n",
+ e->e_id, ptr.bv_val, rc );
goto done;
}
#ifdef BDB_MULTIPLE_SUFFIXES
- if( !be_issuffix( be, &ptr )) {
+ if( !be_issuffix( op->o_bd, &ptr ))
#endif
+ {
dnParent( &ptr, &pdn );
key.size = pdn.bv_len + 2;
@@ -235,44 +226,33 @@ bdb_dn2id_delete(
key.data = pdn.bv_val - 1;
ptr = pdn;
- rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id );
+ rc = bdb_idl_delete_key( op->o_bd, db, txn, &key, e->e_id );
if( rc != 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ERR,
- "=> bdb_dn2id_delete: parent (%s) delete failed: %d\n",
- ptr.bv_val, rc, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
- "=> bdb_dn2id_delete: parent (%s) delete failed: %d\n",
- ptr.bv_val, rc, 0 );
-#endif
+ "=> bdb_dn2id_delete 0x%lx: parent (%s) delete failed: %d\n",
+ e->e_id, ptr.bv_val, rc );
goto done;
}
-#ifndef BDB_MULTIPLE_SUFFIXES
}
- while( !be_issuffix( be, &ptr )) {
+#ifndef BDB_MULTIPLE_SUFFIXES
+ while( !be_issuffix( op->o_bd, &ptr ))
#else
- for (;;) {
+ for (;;)
#endif
+ {
ptr.bv_val[-1] = DN_SUBTREE_PREFIX;
- rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id );
+ rc = bdb_idl_delete_key( op->o_bd, db, txn, &key, e->e_id );
if( rc != 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ERR,
- "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
- ptr.bv_val, rc, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
- "=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
- ptr.bv_val, rc, 0 );
-#endif
+ "=> bdb_dn2id_delete 0x%lx: subtree (%s) delete failed: %d\n",
+ e->e_id, ptr.bv_val, rc );
goto done;
}
#ifdef BDB_MULTIPLE_SUFFIXES
- if( be_issuffix( be, &ptr )) break;
+ if( be_issuffix( op->o_bd, &ptr )) break;
#endif
dnParent( &ptr, &pdn );
@@ -281,72 +261,69 @@ bdb_dn2id_delete(
key.data = pdn.bv_val - 1;
ptr = pdn;
}
-#ifdef BDB_MULTIPLE_SUFFIXES
}
-#endif
done:
- sl_free( buf, ctx );
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, RESULTS, "<= bdb_dn2id_delete %d\n", rc, 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_delete %d\n", rc, 0, 0 );
-#endif
+ op->o_tmpfree( buf, op->o_tmpmemctx );
+ Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_delete 0x%lx: %d\n", e->e_id, rc, 0 );
return rc;
}
int
bdb_dn2id(
- BackendDB *be,
- DB_TXN *txn,
+ Operation *op,
struct berval *dn,
EntryInfo *ei,
- void *ctx )
+ 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;
- struct bdb_info *bdb = (struct bdb_info *) be->be_private;
- DB *db = bdb->bi_dn2id->bdi_db;
+ ID nid;
+
+ Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id(\"%s\")\n", dn->bv_val, 0, 0 );
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ARGS, "=> bdb_dn2id( \"%s\" )\n", dn->bv_val, 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id( \"%s\" )\n", dn->bv_val, 0, 0 );
-#endif
DBTzero( &key );
key.size = dn->bv_len + 2;
- key.data = sl_malloc( key.size, ctx );
+ key.data = op->o_tmpalloc( key.size, op->o_tmpmemctx );
((char *)key.data)[0] = DN_BASE_PREFIX;
AC_MEMCPY( &((char *)key.data)[1], dn->bv_val, key.size - 1 );
/* store the ID */
DBTzero( &data );
- data.data = &ei->bei_id;
+ data.data = &nid;
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 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ERR, "<= bdb_dn2id: get failed %s (%d)\n",
- db_strerror(rc), rc, 0 );
-#else
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: get failed: %s (%d)\n",
db_strerror( rc ), rc, 0 );
-#endif
} else {
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_dn2id: got id=0x%08lx\n", ei->bei_id, 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: got id=0x%08lx\n",
+ BDB_DISK2ID( &nid, &ei->bei_id );
+ Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: got id=0x%lx\n",
ei->bei_id, 0, 0 );
-#endif
}
-
- sl_free( key.data, ctx );
+ op->o_tmpfree( key.data, op->o_tmpmemctx );
return rc;
}
@@ -362,28 +339,21 @@ bdb_dn2id_children(
ID id;
int rc;
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ARGS,
- "=> bdb_dn2id_children( %s )\n", e->e_nname.bv_val, 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_children( %s )\n",
+ Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_children(\"%s\")\n",
e->e_nname.bv_val, 0, 0 );
-#endif
DBTzero( &key );
key.size = e->e_nname.bv_len + 2;
- key.data = sl_malloc( key.size, op->o_tmpmemctx );
+ key.data = op->o_tmpalloc( key.size, op->o_tmpmemctx );
((char *)key.data)[0] = DN_ONE_PREFIX;
AC_MEMCPY( &((char *)key.data)[1], e->e_nname.bv_val, key.size - 1 );
-#ifdef SLAP_IDL_CACHE
if ( bdb->bi_idl_cache_size ) {
rc = bdb_idl_cache_get( bdb, db, &key, NULL );
if ( rc != LDAP_NO_SUCH_OBJECT ) {
- sl_free( key.data, op->o_tmpmemctx );
+ op->o_tmpfree( key.data, op->o_tmpmemctx );
return rc;
}
}
-#endif
/* we actually could do a empty get... */
DBTzero( &data );
data.data = &id;
@@ -393,95 +363,69 @@ bdb_dn2id_children(
data.dlen = sizeof(id);
rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags );
- sl_free( key.data, op->o_tmpmemctx );
+ op->o_tmpfree( key.data, op->o_tmpmemctx );
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, DETAIL1,
- "<= bdb_dn2id_children( %s ): %s (%d)\n",
- e->e_nname.bv_val, rc == 0 ? "" : ( rc == DB_NOTFOUND ? "no " :
- db_strerror(rc)), rc );
-#else
- Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_children( %s ): %s (%d)\n",
+ Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_children(\"%s\"): %s (%d)\n",
e->e_nname.bv_val,
rc == 0 ? "" : ( rc == DB_NOTFOUND ? "no " :
db_strerror(rc) ), rc );
-#endif
return rc;
}
int
bdb_dn2idl(
- BackendDB *be,
- struct berval *dn,
- int prefix,
+ Operation *op,
+ Entry *e,
ID *ids,
- ID *stack,
- void *ctx )
+ ID *stack )
{
int rc;
DBT key;
- struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
+ int prefix = ( op->ors_scope == LDAP_SCOPE_ONELEVEL )
+ ? DN_ONE_PREFIX : DN_SUBTREE_PREFIX;
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ARGS,
- "=> bdb_dn2ididl( \"%s\" )\n", dn->bv_val, 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2idl( \"%s\" )\n", dn->bv_val, 0, 0 );
-#endif
+ Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2idl(\"%s\")\n",
+ e->e_nname.bv_val, 0, 0 );
#ifndef BDB_MULTIPLE_SUFFIXES
- if (prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn))
- {
+ if ( prefix == DN_SUBTREE_PREFIX && BEI(e)->bei_parent->bei_id == 0 ) {
BDB_IDL_ALL(bdb, ids);
return 0;
}
#endif
DBTzero( &key );
- key.size = dn->bv_len + 2;
+ key.size = e->e_nname.bv_len + 2;
key.ulen = key.size;
key.flags = DB_DBT_USERMEM;
- key.data = sl_malloc( key.size, ctx );
+ key.data = op->o_tmpalloc( key.size, op->o_tmpmemctx );
((char *)key.data)[0] = prefix;
- AC_MEMCPY( &((char *)key.data)[1], dn->bv_val, key.size - 1 );
+ AC_MEMCPY( &((char *)key.data)[1], e->e_nname.bv_val, key.size - 1 );
- rc = bdb_idl_fetch_key( be, db, NULL, &key, ids );
+ BDB_IDL_ZERO( ids );
+ rc = bdb_idl_fetch_key( op->o_bd, db, NULL, &key, ids, NULL, 0 );
if( rc != 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, ERR,
- "<= bdb_dn2ididl: get failed: %s (%d)\n", db_strerror(rc), rc, 0 );
-#else
Debug( LDAP_DEBUG_TRACE,
"<= bdb_dn2idl: get failed: %s (%d)\n",
db_strerror( rc ), rc, 0 );
-#endif
} else {
-#ifdef NEW_LOGGING
- LDAP_LOG ( INDEX, RESULTS,
- "<= bdb_dn2ididl: id=%ld first=%ld last=%ld\n",
- (long) ids[0], (long) BDB_IDL_FIRST( ids ),
- (long) BDB_IDL_LAST( ids ) );
-#else
Debug( LDAP_DEBUG_TRACE,
"<= bdb_dn2idl: id=%ld first=%ld last=%ld\n",
(long) ids[0],
(long) BDB_IDL_FIRST( ids ), (long) BDB_IDL_LAST( ids ) );
-#endif
}
- sl_free( key.data, ctx );
+ op->o_tmpfree( key.data, op->o_tmpmemctx );
return rc;
}
-#else /* BDB_HIER */
-/* Experimental management routines for a hierarchically structured database.
- *
- * Unsupported! Use at your own risk!
- * -- Howard Chu, Symas Corp. 2003.
+#else /* BDB_HIER */
+/* Management routines for a hierarchically structured database.
*
* Instead of a ldbm-style dn2id database, we use a hierarchical one. Each
* entry in this database is a struct diskNode, keyed by entryID and with
@@ -489,77 +433,85 @@ bdb_dn2idl(
* a B-Tree with sorted duplicates to store all the children of a node under
* the same key. Also, the first item under the key contains the entry's own
* rdn and the ID of the node's parent, to allow bottom-up tree traversal as
- * well as top-down. To keep this info first in the list, the nrdnlen is set
- * to the negative of its value.
+ * well as top-down. To keep this info first in the list, the high bit of all
+ * subsequent nrdnlen's is always set. This means we can only accomodate
+ * RDNs up to length 32767, but that's fine since full DNs are already
+ * restricted to 8192.
*
* The diskNode is a variable length structure. This definition is not
* directly usable for in-memory manipulation.
*/
typedef struct diskNode {
- ID entryID;
- short nrdnlen;
+ unsigned char nrdnlen[2];
char nrdn[1];
- char rdn[1];
+ char rdn[1]; /* variable placement */
+ 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 lexical order.
+ * Sorts based on normalized RDN, in length order.
*/
int
-bdb_dup_compare(
+hdb_dup_compare(
DB *db,
const DBT *usrkey,
const DBT *curkey
)
{
- diskNode *usr = usrkey->data;
- diskNode *cur = curkey->data;
- short curlen, usrlen;
- char *ptr;
- unsigned char *pt2;
- int rc;
-
- /* Make sure to detect negative values in the nrdnlen */
- ptr = (char *)&usr->nrdnlen;
- pt2 = (unsigned char *)(ptr+1);
-
- usrlen = ptr[0] << 8 | *pt2;
-
- ptr = (char *)&cur->nrdnlen;
- pt2 = (unsigned char *)(ptr+1);
-
- curlen = ptr[0] << 8 | *pt2;
+ diskNode *un, *cn;
+ int rc, ul, cl;
- if ( usrlen < 0 ) {
- if ( curlen < 0 ) return 0;
- return -1;
- }
+ un = (diskNode *)usrkey->data;
+ cn = (diskNode *)curkey->data;
- if ( curlen < 0 ) return 1;
+ /* 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;
- rc = strncmp( usr->nrdn, cur->nrdn, usrlen );
- if ( rc == 0 ) rc = usrlen - curlen;
- return rc;
+ return strcmp( un->nrdn, cn->nrdn );
}
/* This function constructs a full DN for a given entry.
*/
-int bdb_fix_dn(
- Entry *e
-)
+int hdb_fix_dn(
+ Entry *e,
+ int checkit )
{
EntryInfo *ei;
int rlen = 0, nrlen = 0;
char *ptr, *nptr;
-
+ int max = 0;
+
+ if ( !e->e_id )
+ return 0;
+
+ /* count length of all DN components */
for ( ei = BEI(e); ei && ei->bei_id; ei=ei->bei_parent ) {
rlen += ei->bei_rdn.bv_len + 1;
nrlen += ei->bei_nrdn.bv_len + 1;
+ if (ei->bei_modrdns > max) max = ei->bei_modrdns;
+ }
+
+ /* See if the entry DN was invalidated by a subtree rename */
+ if ( checkit ) {
+ if ( BEI(e)->bei_modrdns >= max ) {
+ return 0;
+ }
+ /* We found a mismatch, tell the caller to lock it */
+ if ( checkit == 1 ) {
+ return 1;
+ }
+ /* checkit == 2. do the fix. */
+ free( e->e_name.bv_val );
+ free( e->e_nname.bv_val );
}
+
e->e_name.bv_len = rlen - 1;
e->e_nname.bv_len = nrlen - 1;
- e->e_name.bv_val = ch_malloc(rlen + nrlen);
- e->e_nname.bv_val = e->e_name.bv_val + rlen;
+ e->e_name.bv_val = ch_malloc(rlen);
+ e->e_nname.bv_val = ch_malloc(nrlen);
ptr = e->e_name.bv_val;
nptr = e->e_nname.bv_val;
for ( ei = BEI(e); ei && ei->bei_id; ei=ei->bei_parent ) {
@@ -570,6 +522,7 @@ int bdb_fix_dn(
*nptr++ = ',';
}
}
+ BEI(e)->bei_modrdns = max;
ptr[-1] = '\0';
nptr[-1] = '\0';
@@ -581,47 +534,60 @@ int bdb_fix_dn(
* child's entryID containing the parent's entryID.
*/
int
-bdb_dn2id_add(
- BackendDB *be,
+hdb_dn2id_add(
+ Operation *op,
DB_TXN *txn,
EntryInfo *eip,
- Entry *e,
- void *ctx )
+ Entry *e )
{
- struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
DBT key, data;
+ ID nid;
int rc, rlen, nrlen;
diskNode *d;
char *ptr;
- nrlen = dn_rdnlen( be, &e->e_nname );
+ 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( be, &e->e_name );
+ rlen = dn_rdnlen( op->o_bd, &e->e_name );
} else {
nrlen = e->e_nname.bv_len;
rlen = e->e_name.bv_len;
}
- d = sl_malloc(sizeof(diskNode) + rlen + nrlen, ctx);
- d->entryID = e->e_id;
- d->nrdnlen = nrlen;
+ d = op->o_tmpalloc(sizeof(diskNode) + rlen + nrlen, op->o_tmpmemctx);
+ d->nrdnlen[1] = nrlen & 0xff;
+ d->nrdnlen[0] = (nrlen >> 8) | 0x80;
ptr = lutil_strncopy( d->nrdn, e->e_nname.bv_val, nrlen );
*ptr++ = '\0';
ptr = lutil_strncopy( ptr, e->e_name.bv_val, rlen );
- *ptr = '\0';
+ *ptr++ = '\0';
+ BDB_ID2DISK( e->e_id, ptr );
DBTzero(&key);
DBTzero(&data);
- key.data = &eip->bei_id;
key.size = sizeof(ID);
key.flags = DB_DBT_USERMEM;
+ BDB_ID2DISK( eip->bei_id, &nid );
-#ifdef SLAP_IDL_CACHE
- if ( bdb->bi_idl_cache_size ) {
- bdb_idl_cache_del( bdb, db, &key );
+ key.data = &nid;
+
+ /* Need to make dummy root node once. Subsequent attempts
+ * will fail harmlessly.
+ */
+ if ( eip->bei_id == 0 ) {
+ diskNode dummy = {{0, 0}, "", "", ""};
+ data.data = &dummy;
+ data.size = sizeof(diskNode);
+ data.flags = DB_DBT_USERMEM;
+
+ db->put( db, txn, &key, &data, DB_NODUPDATA );
}
-#endif
+
data.data = d;
data.size = sizeof(diskNode) + rlen + nrlen;
data.flags = DB_DBT_USERMEM;
@@ -629,98 +595,152 @@ bdb_dn2id_add(
rc = db->put( db, txn, &key, &data, DB_NODUPDATA );
if (rc == 0) {
- key.data = &e->e_id;
- d->entryID = eip->bei_id;
- d->nrdnlen = 0 - nrlen;
+ BDB_ID2DISK( e->e_id, &nid );
+ BDB_ID2DISK( eip->bei_id, ptr );
+ d->nrdnlen[0] ^= 0x80;
rc = db->put( db, txn, &key, &data, DB_NODUPDATA );
}
- sl_free( d, ctx );
+ /* Update all parents' IDL cache entries */
+ if ( rc == 0 && bdb->bi_idl_cache_size ) {
+ ID tmp[2];
+ char *ptr = ((char *)&tmp[1])-1;
+ key.data = ptr;
+ key.size = sizeof(ID)+1;
+ tmp[1] = eip->bei_id;
+ *ptr = DN_ONE_PREFIX;
+ bdb_idl_cache_add_id( bdb, db, &key, e->e_id );
+ *ptr = DN_SUBTREE_PREFIX;
+ for (; eip && eip->bei_parent->bei_id; eip = eip->bei_parent) {
+ tmp[1] = eip->bei_id;
+ 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
-bdb_dn2id_delete(
- BackendDB *be,
+hdb_dn2id_delete(
+ Operation *op,
DB_TXN *txn,
EntryInfo *eip,
- Entry *e,
- void *ctx )
+ Entry *e )
{
- struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
DBT key, data;
DBC *cursor;
diskNode *d;
- int rc, nrlen;
+ 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);
key.ulen = key.size;
- key.data = &eip->bei_id;
key.flags = DB_DBT_USERMEM;
+ BDB_ID2DISK( eip->bei_id, &nid );
DBTzero(&data);
- data.size = sizeof(diskNode) + BEI(e)->bei_nrdn.bv_len;
+ data.size = sizeof(diskNode) + BEI(e)->bei_nrdn.bv_len - sizeof(ID) - 1;
data.ulen = data.size;
data.dlen = data.size;
data.flags = DB_DBT_USERMEM | DB_DBT_PARTIAL;
-#ifdef SLAP_IDL_CACHE
- if ( bdb->bi_idl_cache_size ) {
- bdb_idl_cache_del( bdb, db, &key );
- }
-#endif
- rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );
- if ( rc ) return rc;
+ key.data = &nid;
- d = sl_malloc( data.size, ctx );
- d->entryID = e->e_id;
- d->nrdnlen = BEI(e)->bei_nrdn.bv_len;
+ d = op->o_tmpalloc( data.size, op->o_tmpmemctx );
+ d->nrdnlen[1] = BEI(e)->bei_nrdn.bv_len & 0xff;
+ d->nrdnlen[0] = (BEI(e)->bei_nrdn.bv_len >> 8) | 0x80;
+ dlen[0] = d->nrdnlen[0];
+ dlen[1] = d->nrdnlen[1];
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 | DB_RMW );
- if ( rc == 0 )
- rc = cursor->c_del( cursor, 0 );
+ rc = cursor->c_get( cursor, &key, &data, DB_GET_BOTH_RANGE );
+ if ( rc == 0 ) {
+ if ( dlen[1] == d->nrdnlen[1] && dlen[0] == d->nrdnlen[0] &&
+ !strcmp( d->nrdn, BEI(e)->bei_nrdn.bv_val ))
+ rc = cursor->c_del( cursor, 0 );
+ else
+ rc = DB_NOTFOUND;
+ }
/* Delete our ID from the tree. With sorted duplicates, this
* will leave any child nodes still hanging around. This is OK
* for modrdn, which will add our info back in later.
*/
if ( rc == 0 ) {
- key.data = &e->e_id;
+ BDB_ID2DISK( e->e_id, &nid );
rc = cursor->c_get( cursor, &key, &data, DB_SET );
if ( rc == 0 )
rc = cursor->c_del( cursor, 0 );
}
- cursor->c_close( cursor );
- sl_free( d, ctx );
+nolock:
+ cursor->c_close( cursor );
+leave:
+ op->o_tmpfree( d, op->o_tmpmemctx );
+
+ /* Delete IDL cache entries */
+ if ( rc == 0 && bdb->bi_idl_cache_size ) {
+ ID tmp[2];
+ char *ptr = ((char *)&tmp[1])-1;
+ key.data = ptr;
+ key.size = sizeof(ID)+1;
+ tmp[1] = eip->bei_id;
+ *ptr = DN_ONE_PREFIX;
+ bdb_idl_cache_del_id( bdb, db, &key, e->e_id );
+ *ptr = DN_SUBTREE_PREFIX;
+ for (; eip && eip->bei_parent->bei_id; eip = eip->bei_parent) {
+ tmp[1] = eip->bei_id;
+ 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
-bdb_dn2id(
- BackendDB *be,
- DB_TXN *txn,
+hdb_dn2id(
+ Operation *op,
struct berval *in,
EntryInfo *ei,
- void *ctx )
+ u_int32_t locker,
+ DB_LOCK *lock )
{
- struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
DBT key, data;
DBC *cursor;
int rc = 0, nrlen;
diskNode *d;
char *ptr;
- ID idp = ei->bei_parent->bei_id;
+ unsigned char dlen[2];
+ ID idp, parentID;
- nrlen = dn_rdnlen( be, in );
+ 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;
DBTzero(&key);
@@ -728,89 +748,131 @@ bdb_dn2id(
key.data = &idp;
key.ulen = sizeof(ID);
key.flags = DB_DBT_USERMEM;
+ parentID = ( ei->bei_parent != NULL ) ? ei->bei_parent->bei_id : 0;
+ BDB_ID2DISK( parentID, &idp );
DBTzero(&data);
- data.size = sizeof(diskNode) + nrlen;
+ data.size = sizeof(diskNode) + nrlen - sizeof(ID) - 1;
data.ulen = data.size * 3;
- data.flags = DB_DBT_USERMEM;
+ 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 = sl_malloc( data.size * 3, ctx );
- d->nrdnlen = nrlen;
+ d = op->o_tmpalloc( data.size * 3, op->o_tmpmemctx );
+ d->nrdnlen[1] = nrlen & 0xff;
+ d->nrdnlen[0] = (nrlen >> 8) | 0x80;
+ dlen[0] = d->nrdnlen[0];
+ dlen[1] = d->nrdnlen[1];
ptr = lutil_strncopy( d->nrdn, in->bv_val, nrlen );
*ptr = '\0';
data.data = d;
- rc = cursor->c_get( cursor, &key, &data, DB_GET_BOTH );
- cursor->c_close( cursor );
+ 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 ))) {
+ rc = DB_NOTFOUND;
+ }
if ( rc == 0 ) {
- AC_MEMCPY( &ei->bei_id, &d->entryID, sizeof(ID) );
+ ptr = (char *) data.data + data.size - sizeof(ID);
+ BDB_DISK2ID( ptr, &ei->bei_id );
ei->bei_rdn.bv_len = data.size - sizeof(diskNode) - nrlen;
ptr = d->nrdn + nrlen + 1;
- ei->bei_rdn.bv_val = ch_malloc( ei->bei_rdn.bv_len + 1 );
- strcpy( ei->bei_rdn.bv_val, ptr );
+ ber_str2bv( ptr, ei->bei_rdn.bv_len, 1, &ei->bei_rdn );
+ if ( ei->bei_parent != NULL && !ei->bei_parent->bei_dkids ) {
+ db_recno_t dkids;
+ /* How many children does the parent have? */
+ /* FIXME: do we need to lock the parent
+ * entryinfo? Seems safe...
+ */
+ cursor->c_count( cursor, &dkids, 0 );
+ 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 );
}
- sl_free( d, ctx );
return rc;
}
int
-bdb_dn2id_parent(
- Backend *be,
- DB_TXN *txn,
+hdb_dn2id_parent(
+ Operation *op,
+ u_int32_t locker,
EntryInfo *ei,
- ID *idp,
- void *ctx )
+ ID *idp )
{
- struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
DBT key, data;
DBC *cursor;
int rc = 0;
diskNode *d;
char *ptr;
- unsigned char *pt2;
+ ID nid;
DBTzero(&key);
key.size = sizeof(ID);
- key.data = &ei->bei_id;
+ key.data = &nid;
key.ulen = sizeof(ID);
key.flags = DB_DBT_USERMEM;
+ BDB_ID2DISK( ei->bei_id, &nid );
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 = sl_malloc( data.ulen, ctx );
+ d = op->o_tmpalloc( data.ulen, op->o_tmpmemctx );
data.data = d;
rc = cursor->c_get( cursor, &key, &data, DB_SET );
- cursor->c_close( cursor );
if ( rc == 0 ) {
- if (d->nrdnlen >= 0) {
- return LDAP_OTHER;
+ if (d->nrdnlen[0] & 0x80) {
+ rc = LDAP_OTHER;
+ } else {
+ db_recno_t dkids;
+ ptr = (char *) data.data + data.size - sizeof(ID);
+ BDB_DISK2ID( ptr, idp );
+ ei->bei_nrdn.bv_len = (d->nrdnlen[0] << 8) | d->nrdnlen[1];
+ ber_str2bv( d->nrdn, ei->bei_nrdn.bv_len, 1, &ei->bei_nrdn );
+ ei->bei_rdn.bv_len = data.size - sizeof(diskNode) -
+ ei->bei_nrdn.bv_len;
+ ptr = d->nrdn + ei->bei_nrdn.bv_len + 1;
+ ber_str2bv( ptr, ei->bei_rdn.bv_len, 1, &ei->bei_rdn );
+ /* How many children does this node have? */
+ cursor->c_count( cursor, &dkids, 0 );
+ ei->bei_dkids = dkids;
}
- AC_MEMCPY( idp, &d->entryID, sizeof(ID) );
- ei->bei_nrdn.bv_len = 0 - d->nrdnlen;
- ber_str2bv( d->nrdn, ei->bei_nrdn.bv_len, 1, &ei->bei_nrdn );
- ei->bei_rdn.bv_len = data.size - sizeof(diskNode) -
- ei->bei_nrdn.bv_len;
- ptr = d->nrdn + ei->bei_nrdn.bv_len + 1;
- ber_str2bv( ptr, ei->bei_rdn.bv_len, 1, &ei->bei_rdn );
}
- sl_free( d, ctx );
+ cursor->c_close( cursor );
+ op->o_tmpfree( d, op->o_tmpmemctx );
return rc;
}
int
-bdb_dn2id_children(
+hdb_dn2id_children(
Operation *op,
DB_TXN *txn,
Entry *e )
@@ -827,15 +889,17 @@ bdb_dn2id_children(
key.size = sizeof(ID);
key.data = &e->e_id;
key.flags = DB_DBT_USERMEM;
+ BDB_ID2DISK( e->e_id, &id );
-#ifdef SLAP_IDL_CACHE
+ /* IDL cache is in host byte order */
if ( bdb->bi_idl_cache_size ) {
rc = bdb_idl_cache_get( bdb, db, &key, NULL );
if ( rc != LDAP_NO_SUCH_OBJECT ) {
return rc;
}
}
-#endif
+
+ key.data = &id;
DBTzero(&data);
data.data = &d;
data.ulen = sizeof(d);
@@ -847,7 +911,12 @@ bdb_dn2id_children(
rc = cursor->c_get( cursor, &key, &data, DB_SET );
if ( rc == 0 ) {
- rc = cursor->c_get( cursor, &key, &data, DB_NEXT_DUP );
+ db_recno_t dkids;
+ rc = cursor->c_count( cursor, &dkids, 0 );
+ if ( rc == 0 ) {
+ BEI(e)->bei_dkids = dkids;
+ if ( dkids < 2 ) rc = DB_NOTFOUND;
+ }
}
cursor->c_close( cursor );
return rc;
@@ -865,99 +934,226 @@ bdb_dn2id_children(
struct dn2id_cookie {
struct bdb_info *bdb;
- DB *db;
- int prefix;
- int rc;
- ID id;
- ID dbuf;
+ Operation *op;
+ EntryInfo *ei;
ID *ids;
- void *ptr;
- ID tmp[BDB_IDL_DB_SIZE];
+ ID *tmp;
ID *buf;
+ DB *db;
+ DBC *dbc;
DBT key;
DBT data;
- DBC *dbc;
- void *ctx;
+ ID dbuf;
+ ID id;
+ ID nid;
+ int rc;
+ int depth;
+ char need_sort;
+ char prefix;
};
static int
-bdb_dn2idl_internal(
+apply_func(
+ void *data,
+ void *arg )
+{
+ EntryInfo *ei = data;
+ ID *idl = arg;
+
+ bdb_idl_append_one( idl, ei->bei_id );
+ return 0;
+}
+
+static int
+hdb_dn2idl_internal(
struct dn2id_cookie *cx
)
{
-#ifdef SLAP_IDL_CACHE
+ BDB_IDL_ZERO( cx->tmp );
+
if ( cx->bdb->bi_idl_cache_size ) {
+ char *ptr = ((char *)&cx->id)-1;
+
+ cx->key.data = ptr;
+ cx->key.size = sizeof(ID)+1;
+ if ( cx->prefix == DN_SUBTREE_PREFIX ) {
+ ID *ids = cx->depth ? cx->tmp : cx->ids;
+ *ptr = cx->prefix;
+ cx->rc = bdb_idl_cache_get(cx->bdb, cx->db, &cx->key, ids);
+ if ( cx->rc == LDAP_SUCCESS ) {
+ if ( cx->depth ) {
+ bdb_idl_append( cx->ids, cx->tmp );
+ cx->need_sort = 1;
+ }
+ return cx->rc;
+ }
+ }
+ *ptr = DN_ONE_PREFIX;
cx->rc = bdb_idl_cache_get(cx->bdb, cx->db, &cx->key, cx->tmp);
+ if ( cx->rc == LDAP_SUCCESS ) {
+ goto gotit;
+ }
if ( cx->rc == DB_NOTFOUND ) {
return cx->rc;
}
- if ( cx->rc == LDAP_SUCCESS ) {
- goto saveit;
- }
}
-#endif
- cx->rc = cx->db->cursor( cx->db, NULL, &cx->dbc,
- cx->bdb->bi_db_opflags );
- if ( cx->rc ) return cx->rc;
- BDB_IDL_ZERO( cx->tmp );
+ bdb_cache_entryinfo_lock( cx->ei );
- cx->data.data = &cx->dbuf;
- cx->data.ulen = sizeof(ID);
- cx->data.dlen = sizeof(ID);
- cx->data.flags = DB_DBT_USERMEM | DB_DBT_PARTIAL;
-
- /* The first item holds the parent ID. Ignore it. */
- cx->rc = cx->dbc->c_get( cx->dbc, &cx->key, &cx->data, DB_SET );
- if ( cx->rc == DB_NOTFOUND ) goto saveit;
- if ( cx->rc ) return cx->rc;
-
- cx->data.data = cx->buf;
- 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;
- DB_MULTIPLE_INIT( cx->ptr, &cx->data );
- while (cx->ptr) {
- DB_MULTIPLE_NEXT( cx->ptr, &cx->data, j, len );
- if (j) {
- AC_MEMCPY( &cx->dbuf, j, sizeof(ID) );
- bdb_idl_insert( cx->tmp, cx->dbuf );
+ /* If number of kids in the cache differs from on-disk, load
+ * up all the kids from the database
+ */
+ if ( cx->ei->bei_ckids+1 != cx->ei->bei_dkids ) {
+ EntryInfo ei;
+ db_recno_t dkids = cx->ei->bei_dkids;
+ ei.bei_parent = cx->ei;
+
+ /* Only one thread should load the cache */
+ while ( cx->ei->bei_state & CACHE_ENTRY_ONELEVEL ) {
+ bdb_cache_entryinfo_unlock( cx->ei );
+ ldap_pvt_thread_yield();
+ bdb_cache_entryinfo_lock( cx->ei );
+ if ( cx->ei->bei_ckids+1 == cx->ei->bei_dkids ) {
+ goto synced;
}
}
- }
- cx->dbc->c_close( cx->dbc );
- /* If we got some records, treat as success */
- if (!BDB_IDL_IS_ZERO(cx->tmp)) {
+ cx->ei->bei_state |= CACHE_ENTRY_ONELEVEL;
+
+ bdb_cache_entryinfo_unlock( cx->ei );
+
+ cx->rc = cx->db->cursor( cx->db, NULL, &cx->dbc,
+ cx->bdb->bi_db_opflags );
+ if ( cx->rc )
+ goto done_one;
+
+ cx->data.data = &cx->dbuf;
+ cx->data.ulen = sizeof(ID);
+ cx->data.dlen = sizeof(ID);
+ cx->data.flags = DB_DBT_USERMEM | DB_DBT_PARTIAL;
+
+ /* The first item holds the parent ID. Ignore it. */
+ cx->key.data = &cx->nid;
+ cx->key.size = 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 );
+ goto done_one;
+ }
+
+ /* If the on-disk count is zero we've never checked it.
+ * Count it now.
+ */
+ if ( !dkids ) {
+ cx->dbc->c_count( cx->dbc, &dkids, 0 );
+ cx->ei->bei_dkids = dkids;
+ }
+
+ cx->data.data = cx->buf;
+ cx->data.ulen = BDB_IDL_UM_SIZE * sizeof(ID);
+ cx->data.flags = DB_DBT_USERMEM;
+
+ 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?
+ */
+synced:
cx->rc = 0;
+ if ( cx->ei->bei_ckids > 0 ) {
+ /* Walk the kids tree; order is irrelevant since bdb_idl_sort
+ * will sort it later.
+ */
+ avl_apply( cx->ei->bei_kids, apply_func,
+ cx->tmp, -1, AVL_POSTORDER );
+ }
+ bdb_cache_entryinfo_unlock( cx->ei );
}
-saveit:
-#ifdef SLAP_IDL_CACHE
- if ( cx->bdb->bi_idl_cache_max_size ) {
+ 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 && !BDB_IDL_IS_ZERO( cx->tmp )) {
+ char *ptr = ((char *)&cx->id)-1;
+ cx->key.data = ptr;
+ cx->key.size = sizeof(ID)+1;
+ *ptr = DN_ONE_PREFIX;
bdb_idl_cache_put( cx->bdb, cx->db, &cx->key, cx->tmp, cx->rc );
}
-#endif
- if ( cx->rc == 0 ) {
- if ( cx->prefix == DN_SUBTREE_PREFIX ) {
- ID *save, idcurs;
- save = sl_malloc( BDB_IDL_SIZEOF( cx->tmp ), cx->ctx );
- BDB_IDL_CPY( save, cx->tmp );
- bdb_idl_union( cx->ids, cx->tmp );
-
- idcurs = 0;
- for ( cx->id = bdb_idl_first( save, &idcurs );
- cx->id != NOID;
- cx->id = bdb_idl_next( save, &idcurs )) {
- bdb_dn2idl_internal( cx );
+gotit:
+ if ( !BDB_IDL_IS_ZERO( cx->tmp )) {
+ if ( cx->prefix == DN_SUBTREE_PREFIX ) {
+ bdb_idl_append( cx->ids, cx->tmp );
+ cx->need_sort = 1;
+ if ( !(cx->ei->bei_state & CACHE_ENTRY_NO_GRANDKIDS)) {
+ ID *save, idcurs;
+ EntryInfo *ei = cx->ei;
+ int nokids = 1;
+ save = cx->op->o_tmpalloc( BDB_IDL_SIZEOF( cx->tmp ),
+ cx->op->o_tmpmemctx );
+ BDB_IDL_CPY( save, cx->tmp );
+
+ idcurs = 0;
+ cx->depth++;
+ for ( cx->id = bdb_idl_first( save, &idcurs );
+ cx->id != NOID;
+ cx->id = bdb_idl_next( save, &idcurs )) {
+ cx->ei = bdb_cache_find_info( cx->bdb, cx->id );
+ if ( !cx->ei ||
+ ( cx->ei->bei_state & CACHE_ENTRY_NO_KIDS ))
+ continue;
+
+ BDB_ID2DISK( cx->id, &cx->nid );
+ hdb_dn2idl_internal( cx );
+ if ( !BDB_IDL_IS_ZERO( cx->tmp ))
+ nokids = 0;
+ }
+ cx->depth--;
+ cx->op->o_tmpfree( save, cx->op->o_tmpmemctx );
+ if ( nokids ) ei->bei_state |= CACHE_ENTRY_NO_GRANDKIDS;
}
- sl_free( save, cx->ctx );
+ /* Make sure caller knows it had kids! */
+ cx->tmp[0]=1;
+
cx->rc = 0;
} else {
BDB_IDL_CPY( cx->ids, cx->tmp );
@@ -967,46 +1163,72 @@ saveit:
}
int
-bdb_dn2idl(
- BackendDB *be,
- struct berval *dn,
- int prefix,
+hdb_dn2idl(
+ Operation *op,
+ Entry *e,
ID *ids,
- ID *stack,
- void *ctx )
+ ID *stack )
{
+ struct bdb_info *bdb = (struct bdb_info *)op->o_bd->be_private;
struct dn2id_cookie cx;
- EntryInfo *ei = (EntryInfo *)dn;
+
+ Debug( LDAP_DEBUG_TRACE, "=> hdb_dn2idl(\"%s\")\n",
+ e->e_nname.bv_val, 0, 0 );
#ifndef BDB_MULTIPLE_SUFFIXES
- if ( ei->bei_parent->bei_id == 0 ) {
- struct bdb_info *bdb = (struct bdb_info *)be->be_private;
+ if ( op->ors_scope != LDAP_SCOPE_ONELEVEL &&
+ BEI(e)->bei_parent->bei_id == 0 )
+ {
BDB_IDL_ALL( bdb, ids );
return 0;
}
#endif
- cx.id = ei->bei_id;
- cx.bdb = (struct bdb_info *)be->be_private;
+ cx.id = e->e_id;
+ BDB_ID2DISK( cx.id, &cx.nid );
+ cx.ei = e->e_id ? BEI(e) : &bdb->bi_cache.c_dntree;
+ cx.bdb = bdb;
cx.db = cx.bdb->bi_dn2id->bdi_db;
- cx.prefix = prefix;
+ cx.prefix = (op->ors_scope == LDAP_SCOPE_ONELEVEL) ?
+ DN_ONE_PREFIX : DN_SUBTREE_PREFIX;
cx.ids = ids;
- cx.buf = stack;
- cx.ctx = ctx;
-
- BDB_IDL_ZERO( ids );
- if ( prefix == DN_SUBTREE_PREFIX ) {
- bdb_idl_insert( ids, cx.id );
+ cx.tmp = stack;
+ cx.buf = stack + BDB_IDL_UM_SIZE;
+ cx.op = op;
+ cx.need_sort = 0;
+ cx.depth = 0;
+
+ if ( cx.prefix == DN_SUBTREE_PREFIX ) {
+ ids[0] = 1;
+ ids[1] = cx.id;
+ } else {
+ BDB_IDL_ZERO( ids );
}
+ if ( cx.ei->bei_state & CACHE_ENTRY_NO_KIDS )
+ return LDAP_SUCCESS;
DBTzero(&cx.key);
- cx.key.data = &cx.id;
cx.key.ulen = sizeof(ID);
cx.key.size = sizeof(ID);
cx.key.flags = DB_DBT_USERMEM;
DBTzero(&cx.data);
- return bdb_dn2idl_internal(&cx);
+ hdb_dn2idl_internal(&cx);
+ if ( cx.need_sort ) {
+ char *ptr = ((char *)&cx.id)-1;
+ if ( !BDB_IDL_IS_RANGE( cx.ids ) && cx.ids[0] > 3 )
+ bdb_idl_sort( cx.ids, cx.tmp );
+ cx.key.data = ptr;
+ cx.key.size = sizeof(ID)+1;
+ *ptr = cx.prefix;
+ cx.id = e->e_id;
+ bdb_idl_cache_put( cx.bdb, cx.db, &cx.key, cx.ids, cx.rc );
+ }
+
+ if ( cx.rc == DB_NOTFOUND )
+ cx.rc = LDAP_SUCCESS;
+
+ return cx.rc;
}
#endif /* BDB_HIER */