X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fback-bdb%2Fdn2id.c;h=19dc5d30742217996c6bd2bf2334446d67aa0746;hb=1a9bc6655ddf9a1d08ee4f5e6e4ef6a7707ca5f7;hp=8dd54061a200ca22c61d253ad5587ec830cdba88;hpb=03429046998f4ea337e3acf079dd7409065683d8;p=openldap

diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index 8dd54061a2..19dc5d3074 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 <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"
@@ -113,10 +122,11 @@ bdb_dn2id_add(
 #ifndef BDB_MULTIPLE_SUFFIXES
 	}
 
-	while( !be_issuffix( op->o_bd, &ptr )) {
+	while( !be_issuffix( op->o_bd, &ptr ))
 #else
-	for (;;) {
+	for (;;)
 #endif
+	{
 		ptr.bv_val[-1] = DN_SUBTREE_PREFIX;
 
 		rc = bdb_idl_insert_key( op->o_bd, db, txn, &key, e->e_id );
@@ -418,19 +428,19 @@ bdb_dn2idl(
 	DBT		key;
 	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_SUBTREE ? DN_SUBTREE_PREFIX :
-			DN_ONE_PREFIX;
+	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", e->e_nname.bv_val, 0, 0 );
+	LDAP_LOG ( INDEX, ARGS, "=> bdb_dn2ididl( \"%s\" )\n",
+		e->e_nname.bv_val, 0, 0 );
 #else
-	Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2idl( \"%s\" )\n", e->e_nname.bv_val, 0, 0 );
+	Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2idl( \"%s\" )\n",
+		e->e_nname.bv_val, 0, 0 );
 #endif
 
 #ifndef	BDB_MULTIPLE_SUFFIXES
-	if (prefix == DN_SUBTREE_PREFIX && BEI(e)->bei_parent->bei_id == 0 )
-	{
+	if ( prefix == DN_SUBTREE_PREFIX && BEI(e)->bei_parent->bei_id == 0 ) {
 		BDB_IDL_ALL(bdb, ids);
 		return 0;
 	}
@@ -767,23 +777,6 @@ hdb_dn2id(
 	return rc;
 }
 
-static void
-hdb_dn2ei(
-	char	*buf,
-	int	len,
-	EntryInfo	*ei )
-{
-	diskNode *d = (diskNode *)buf;
-	char *ptr;
-
-	AC_MEMCPY( &ei->bei_id, &d->entryID, sizeof(ID) );
-	AC_MEMCPY( &ei->bei_nrdn.bv_len, &d->nrdnlen, sizeof(d->nrdnlen) );
-	ber_str2bv( d->nrdn, ei->bei_nrdn.bv_len, 0, &ei->bei_nrdn );
-	ei->bei_rdn.bv_len = len - 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 );
-}
-
 int
 hdb_dn2id_parent(
 	Operation *op,
@@ -916,23 +909,15 @@ struct dn2id_cookie {
 	Operation *op;
 };
 
-struct apply_arg {
-	ID *idl;
-	EntryInfo **ei;
-};
-
 static int
 apply_func(
 	void *data,
 	void *arg )
 {
 	EntryInfo *ei = data;
-	struct apply_arg *ap = arg;
+	ID *idl = arg;
 
-	bdb_idl_insert( ap->idl, ei->bei_id );
-	if ( ap->ei ) {
-		*(ap->ei)++ = ei;
-	}
+	bdb_idl_insert( idl, ei->bei_id );
 	return 0;
 }
 
@@ -941,7 +926,6 @@ hdb_dn2idl_internal(
 	struct dn2id_cookie *cx
 )
 {
-	EntryInfo **eilist = NULL, **ptr;
 #ifdef SLAP_IDL_CACHE
 	if ( cx->bdb->bi_idl_cache_size ) {
 		cx->rc = bdb_idl_cache_get(cx->bdb, cx->db, &cx->key, cx->tmp);
@@ -955,10 +939,26 @@ hdb_dn2idl_internal(
 #endif
 	BDB_IDL_ZERO( cx->tmp );
 
+	if ( !cx->ei ) {
+		cx->ei = bdb_cache_find_info( cx->bdb, cx->id );
+		if ( !cx->ei ) {
+			cx->rc = DB_NOTFOUND;
+			goto saveit;
+		}
+	}
+
+	bdb_cache_entryinfo_lock( cx->ei );
+
+	/* 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;
 
+		bdb_cache_entryinfo_unlock( cx->ei );
+
 		cx->rc = cx->db->cursor( cx->db, NULL, &cx->dbc,
 			cx->bdb->bi_db_opflags );
 		if ( cx->rc ) return cx->rc;
@@ -970,21 +970,20 @@ hdb_dn2idl_internal(
 
 		/* 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;
+		if ( cx->rc ) {
+			cx->dbc->c_close( cx->dbc );
+			if ( cx->rc == DB_NOTFOUND ) goto saveit;
+			return cx->rc;
+		}
 
-		if ( !cx->ei->bei_dkids ) {
-			db_recno_t dkids;
+		/* 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;
 		}
 
-		if ( cx->prefix == DN_SUBTREE_PREFIX && cx->ei->bei_dkids > 1 ) {
-			eilist = cx->op->o_tmpalloc( sizeof(EntryInfo *) * cx->ei->bei_dkids, cx->op->o_tmpmemctx );
-			eilist[cx->ei->bei_dkids-1] = NULL;
-			ptr = eilist;
-		}
-
 		cx->data.data = cx->buf;
 		cx->data.ulen = BDB_IDL_UM_SIZE * sizeof(ID);
 		cx->data.flags = DB_DBT_USERMEM;
@@ -999,33 +998,37 @@ hdb_dn2idl_internal(
 				DB_MULTIPLE_NEXT( cx->ptr, &cx->data, j, len );
 				if (j) {
 					EntryInfo *ei2;
-					hdb_dn2ei( j, len, &ei );
+					diskNode *d = (diskNode *)j;
+					short nrlen;
+
+					AC_MEMCPY( &ei.bei_id, &d->entryID, sizeof(ID) );
+					AC_MEMCPY( &nrlen, &d->nrdnlen, sizeof(d->nrdnlen) );
+					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_insert( cx->tmp, ei.bei_id );
-					hdb_entryinfo_load( cx->bdb, &ei, &ei2 );
-					if ( eilist )
-						*ptr++ = ei2;
+					hdb_cache_load( cx->bdb, &ei, &ei2 );
 				}
 			}
 		}
-		cx->dbc->c_close( cx->dbc );
+		cx->rc = cx->dbc->c_close( cx->dbc );
 	} else {
+		/* The in-memory cache is in sync with the on-disk data.
+		 * do we have any kids?
+		 */
+		cx->rc = 0;
 		if ( cx->ei->bei_ckids > 0 ) {
-			struct apply_arg ap;
-			if ( cx->prefix == DN_SUBTREE_PREFIX ) {
-				eilist = cx->op->o_tmpalloc( sizeof(EntryInfo *) * cx->ei->bei_dkids, cx->op->o_tmpmemctx );
-				eilist[cx->ei->bei_dkids-1] = NULL;
-			}
-			ap.idl = cx->tmp;
-			ap.ei = eilist;
-			bdb_cache_entryinfo_lock( cx->ei );
-			avl_apply( cx->ei->bei_kids, apply_func, &ap, -1, AVL_POSTORDER );
-			bdb_cache_entryinfo_unlock( cx->ei );
-		}
-	}
 
-	/* If we got some records, treat as success */
-	if (!BDB_IDL_IS_ZERO(cx->tmp)) {
-		cx->rc = 0;
+			/* Walk the kids tree; order is irrelevant since bdb_idl_insert
+			 * will insert in sorted order.
+			 */
+			avl_apply( cx->ei->bei_kids, apply_func, cx->tmp, -1, AVL_POSTORDER );
+		}
+		bdb_cache_entryinfo_unlock( cx->ei );
 	}
 
 saveit:
@@ -1036,15 +1039,34 @@ saveit:
 #endif
 	;
 gotit:
-	if ( cx->rc == 0 ) {
-		/* If eilist is NULL, cx->tmp is empty... */
-		if ( cx->prefix == DN_SUBTREE_PREFIX && eilist ) {
-			bdb_idl_union( cx->ids, cx->tmp );
-			for (ptr = eilist; *ptr; ptr++) {
-				cx->ei = *ptr;
-				cx->id = cx->ei->bei_id;
-				hdb_dn2idl_internal( cx );
-			cx->op->o_tmpfree( eilist, cx->op->o_tmpmemctx );
+	if ( !BDB_IDL_IS_ZERO( cx->tmp )) {
+		if ( cx->prefix == DN_SUBTREE_PREFIX ) {
+			if (cx->ei->bei_state & CACHE_ENTRY_NO_GRANDKIDS) {
+				bdb_idl_union( cx->ids, cx->tmp );
+			} else {
+				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 );
+				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 )) {
+					cx->ei = NULL;
+					hdb_dn2idl_internal( cx );
+					if ( !BDB_IDL_IS_ZERO( cx->tmp ))
+						nokids = 0;
+				}
+				cx->op->o_tmpfree( save, cx->op->o_tmpmemctx );
+				if ( nokids ) ei->bei_state |= CACHE_ENTRY_NO_GRANDKIDS;
+			}
+			/* Make sure caller knows it had kids! */
+			cx->tmp[0]=1;
+
 			cx->rc = 0;
 		} else {
 			BDB_IDL_CPY( cx->ids, cx->tmp );
@@ -1071,8 +1093,9 @@ hdb_dn2idl(
 #endif
 
 #ifndef BDB_MULTIPLE_SUFFIXES
-	if ( op->ors_scope == LDAP_SCOPE_SUBTREE && 
-		BEI(e)->bei_parent->bei_id == 0 ) {
+	if ( op->ors_scope != LDAP_SCOPE_ONELEVEL && 
+		BEI(e)->bei_parent->bei_id == 0 )
+	{
 		BDB_IDL_ALL( bdb, ids );
 		return 0;
 	}
@@ -1082,8 +1105,8 @@ hdb_dn2idl(
 	cx.ei = BEI(e);
 	cx.bdb = bdb;
 	cx.db = cx.bdb->bi_dn2id->bdi_db;
-	cx.prefix = op->ors_scope == LDAP_SCOPE_SUBTREE ? DN_SUBTREE_PREFIX :
-			DN_ONE_PREFIX;
+	cx.prefix = op->ors_scope == LDAP_SCOPE_ONELEVEL
+		? DN_ONE_PREFIX : DN_SUBTREE_PREFIX;
 	cx.ids = ids;
 	cx.buf = stack;
 	cx.op = op;