X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fdn2id.c;h=528c57815f15089372f2b11178150b740a4b9c08;hb=82c1b0d1f0a27e374961c910473f549878e81e24;hp=1bf131eb77d5865075edb5772954eb69ae43aaf6;hpb=4fce207ca57919eaac52d55fabf05c7706edca26;p=openldap

diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index 1bf131eb77..528c57815f 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;
 	}
@@ -620,6 +630,18 @@ hdb_dn2id_add(
 	key.size = sizeof(ID);
 	key.flags = DB_DBT_USERMEM;
 
+	/* Need to make dummy root node once. Subsequent attempts
+	 * will fail harmlessly.
+	 */
+	if ( eip->bei_id == 0 ) {
+		diskNode dummy = {0};
+		data.data = &dummy;
+		data.size = sizeof(diskNode);
+		data.flags = DB_DBT_USERMEM;
+
+		db->put( db, txn, &key, &data, DB_NODUPDATA );
+	}
+
 #ifdef SLAP_IDL_CACHE
 	if ( bdb->bi_idl_cache_size ) {
 		bdb_idl_cache_del( bdb, db, &key );
@@ -705,6 +727,7 @@ hdb_dn2id_delete(
 	return rc;
 }
 
+
 int
 hdb_dn2id(
 	Operation	*op,
@@ -745,15 +768,22 @@ hdb_dn2id(
 	data.data = d;
 
 	rc = cursor->c_get( cursor, &key, &data, DB_GET_BOTH );
-	cursor->c_close( cursor );
-
 	if ( rc == 0 ) {
-		AC_MEMCPY( &ei->bei_id, &d->entryID, sizeof(ID) );
+		ei->bei_id = d->entryID;
 		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->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;
+		}
 	}
+	cursor->c_close( cursor );
 	op->o_tmpfree( d, op->o_tmpmemctx );
 
 	return rc;
@@ -792,19 +822,24 @@ hdb_dn2id_parent(
 	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;
+			rc = LDAP_OTHER;
+		} else {
+			db_recno_t dkids;
+			*idp = d->entryID;
+			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 );
+			/* 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 );
 	}
+	cursor->c_close( cursor );
 	op->o_tmpfree( d, op->o_tmpmemctx );
 	return rc;
 }
@@ -847,7 +882,12 @@ hdb_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;
@@ -868,6 +908,7 @@ struct dn2id_cookie {
 	DB *db;
 	int prefix;
 	int rc;
+	EntryInfo *ei;
 	ID id;
 	ID dbuf;
 	ID *ids;
@@ -880,6 +921,18 @@ struct dn2id_cookie {
 	Operation *op;
 };
 
+static int
+apply_func(
+	void *data,
+	void *arg )
+{
+	EntryInfo *ei = data;
+	ID *idl = arg;
+
+	bdb_idl_insert( idl, ei->bei_id );
+	return 0;
+}
+
 static int
 hdb_dn2idl_internal(
 	struct dn2id_cookie *cx
@@ -896,45 +949,98 @@ hdb_dn2idl_internal(
 		}
 	}
 #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 );
 
-	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 ( !cx->ei ) {
+		cx->ei = bdb_cache_find_info( cx->bdb, cx->id );
+		if ( !cx->ei ) {
+			cx->rc = DB_NOTFOUND;
+			goto saveit;
 		}
 	}
-	cx->dbc->c_close( cx->dbc );
 
-	/* If we got some records, treat as success */
-	if (!BDB_IDL_IS_ZERO(cx->tmp)) {
+	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;
+
+		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 ) {
+			cx->dbc->c_close( cx->dbc );
+			if ( cx->rc == DB_NOTFOUND ) goto saveit;
+			return cx->rc;
+		}
+
+		/* 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;
+
+		/* 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) {
+					EntryInfo *ei2;
+					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_cache_load( cx->bdb, &ei, &ei2 );
+				}
+			}
+		}
+		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 ) {
+
+			/* 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:
@@ -945,22 +1051,34 @@ saveit:
 #endif
 	;
 gotit:
-	if ( cx->rc == 0 ) {
+	if ( !BDB_IDL_IS_ZERO( cx->tmp )) {
 		if ( cx->prefix == DN_SUBTREE_PREFIX ) {
-			ID *save, idcurs;
-
-			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 )) {
-				hdb_dn2idl_internal( cx );
+			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;
 			}
-			cx->op->o_tmpfree( save, cx->op->o_tmpmemctx );
+			/* Make sure caller knows it had kids! */
+			cx->tmp[0]=1;
+
 			cx->rc = 0;
 		} else {
 			BDB_IDL_CPY( cx->ids, cx->tmp );
@@ -987,18 +1105,20 @@ 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;
 	}
 #endif
 
 	cx.id = e->e_id;
+	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 = 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;