X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fid2entry.c;h=fce1fcdc637266ec84f2a2a67ac290785be08328;hb=c59f0869ec670a8b2f58cb69a5c92202fd33f0c3;hp=9c8c9657e4e46aef515193ff8c68254cd38abc92;hpb=ff9e580d335da9089339b0483a6867af711b9f9d;p=openldap

diff --git a/servers/slapd/back-bdb/id2entry.c b/servers/slapd/back-bdb/id2entry.c
index 9c8c9657e4..fce1fcdc63 100644
--- a/servers/slapd/back-bdb/id2entry.c
+++ b/servers/slapd/back-bdb/id2entry.c
@@ -1,8 +1,17 @@
 /* id2entry.c - routines to deal with the id2entry database */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 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"
@@ -11,8 +20,9 @@
 #include <ac/string.h>
 
 #include "back-bdb.h"
+#include "external.h"
 
-int bdb_id2entry_put(
+static int bdb_id2entry_put(
 	BackendDB *be,
 	DB_TXN *tid,
 	Entry *e,
@@ -24,13 +34,14 @@ int bdb_id2entry_put(
 	struct berval bv;
 	int rc;
 #ifdef BDB_HIER
-	char *odn, *ondn;
+	struct berval odn, ondn;
 
-	/* We only store rdns, and they go in the id2parent database. */
+	/* We only store rdns, and they go in the dn2id database. */
 
-	odn = e->e_dn; ondn = e->e_ndn;
+	odn = e->e_name; ondn = e->e_nname;
 
-	e->e_dn = ""; e->e_ndn = "";
+	e->e_name = slap_empty_bv;
+	e->e_nname = slap_empty_bv;
 #endif
 	DBTzero( &key );
 	key.data = (char *) &e->e_id;
@@ -38,7 +49,7 @@ int bdb_id2entry_put(
 
 	rc = entry_encode( e, &bv );
 #ifdef BDB_HIER
-	e->e_dn = odn; e->e_ndn = ondn;
+	e->e_name = odn; e->e_nname = ondn;
 #endif
 	if( rc != LDAP_SUCCESS ) {
 		return -1;
@@ -75,14 +86,11 @@ int bdb_id2entry_update(
 	return bdb_id2entry_put(be, tid, e, 0);
 }
 
-int bdb_id2entry_rw(
+int bdb_id2entry(
 	BackendDB *be,
 	DB_TXN *tid,
 	ID id,
-	Entry **e,
-	int rw,
-	u_int32_t locker,
-	DB_LOCK *lock )
+	Entry **e )
 {
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 	DB *db = bdb->bi_id2entry->bdi_db;
@@ -99,12 +107,8 @@ int bdb_id2entry_rw(
 	DBTzero( &data );
 	data.flags = DB_DBT_MALLOC;
 
-	if ((*e = bdb_cache_find_entry_id(bdb->bi_dbenv, &bdb->bi_cache, id, rw, locker, lock)) != NULL) {
-		return 0;
-	}
-
 	/* fetch it */
-	rc = db->get( db, tid, &key, &data, bdb->bi_db_opflags | ( rw ? DB_RMW : 0 ));
+	rc = db->get( db, tid, &key, &data, bdb->bi_db_opflags );
 
 	if( rc != 0 ) {
 		return rc;
@@ -123,45 +127,6 @@ int bdb_id2entry_rw(
 		ch_free( data.data );
 	}
 
-	if ( rc == 0 ) {
-#ifdef BDB_HIER
-		bdb_fix_dn(be, id, *e);
-#endif
-		ret = bdb_cache_add_entry_rw( bdb->bi_dbenv,
-				&bdb->bi_cache, *e, rw, locker, lock);
-		while ( ret == 1 || ret == -1 ) {
-			Entry *ee;
-			int add_loop_cnt = 0;
-			if ( (*e)->e_private != NULL ) {
-				free ((*e)->e_private);
-			}
-			(*e)->e_private = NULL;
-			if ( (ee = bdb_cache_find_entry_id
-					(bdb->bi_dbenv, &bdb->bi_cache, id, rw, locker, lock) ) != NULL) {
-				bdb_entry_return ( *e );
-				*e = ee;
-				return 0;
-			}
-			if ( ++add_loop_cnt == BDB_MAX_ADD_LOOP ) {
-				bdb_entry_return ( *e );
-				*e = NULL;
-				return LDAP_BUSY;
-			}
-		}
-		if ( ret != 0 ) {
-			if ( (*e)->e_private != NULL )
-				free ( (*e)->e_private );
-			bdb_entry_return( *e );
-			*e = NULL;
-			ch_free( data.data );
-		}
-		rc = ret;
-	}
-
-	if (rc == 0) {
-		bdb_cache_entry_commit(*e);
-	}
-
 	return rc;
 }
 
@@ -175,8 +140,6 @@ int bdb_id2entry_delete(
 	DBT key;
 	int rc;
 
-	bdb_cache_delete_entry(&bdb->bi_cache, e);
-
 	DBTzero( &key );
 	key.data = (char *) &e->e_id;
 	key.size = sizeof(ID);
@@ -206,7 +169,6 @@ int bdb_entry_return(
 		attrs_free( e->e_attrs );
 	}
 
-#ifndef BDB_HIER
 	/* See if the DNs were changed by modrdn */
 	if( e->e_nname.bv_val < e->e_bv.bv_val || e->e_nname.bv_val >
 		e->e_bv.bv_val + e->e_bv.bv_len ) {
@@ -215,43 +177,223 @@ int bdb_entry_return(
 		e->e_name.bv_val = NULL;
 		e->e_nname.bv_val = NULL;
 	}
-#else
-	/* We had to construct the dn and ndn as well, in a single block */
-	if( e->e_name.bv_val ) {
-		free( e->e_name.bv_val );
-	}
-#endif
+#ifndef BDB_HIER
 	/* In tool mode the e_bv buffer is realloc'd, leave it alone */
 	if( !(slapMode & SLAP_TOOL_MODE) ) {
 		free( e->e_bv.bv_val );
 	}
-
+#else
+	free( e->e_bv.bv_val );
+#endif
 	free( e );
 
 	return 0;
 }
 
 int bdb_entry_release(
-	BackendDB *be,
-	Connection *c,
 	Operation *o,
 	Entry *e,
 	int rw )
 {
-	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+	struct bdb_info *bdb = (struct bdb_info *) o->o_bd->be_private;
+	struct bdb_op_info *boi = NULL;
  
 	/* slapMode : SLAP_SERVER_MODE, SLAP_TOOL_MODE,
 			SLAP_TRUNCATE_MODE, SLAP_UNDEFINED_MODE */
  
 	if ( slapMode == SLAP_SERVER_MODE ) {
 		/* free entry and reader or writer lock */
-		bdb_unlocked_cache_return_entry_rw( &bdb->bi_cache, e, rw );
+		if ( o ) {
+			boi = (struct bdb_op_info *)o->o_private;
+		}
+		/* lock is freed with txn */
+		if ( !boi || boi->boi_txn ) {
+			bdb_unlocked_cache_return_entry_rw( &bdb->bi_cache, e, rw );
+		} else {
+			bdb_cache_return_entry_rw( bdb->bi_dbenv, &bdb->bi_cache, e, rw, &boi->boi_lock );
+			o->o_tmpfree( boi, o->o_tmpmemctx );
+			o->o_private = NULL;
+		}
 	} else {
 		if (e->e_private != NULL)
-			free (e->e_private);
+			BEI(e)->bei_e = NULL;
 		e->e_private = NULL;
 		bdb_entry_return ( e );
 	}
  
 	return 0;
 }
+
+/* return LDAP_SUCCESS IFF we can retrieve the specified entry.
+ */
+int bdb_entry_get(
+	Operation *op,
+	struct berval *ndn,
+	ObjectClass *oc,
+	AttributeDescription *at,
+	int rw,
+	Entry **ent )
+{
+	struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+	struct bdb_op_info *boi = NULL;
+	DB_TXN *txn = NULL;
+	Entry *e = NULL;
+	EntryInfo *ei;
+	int	rc;
+	const char *at_name = at ? at->ad_cname.bv_val : "(null)";
+
+	u_int32_t	locker = 0;
+	DB_LOCK		lock;
+	int		free_lock_id = 0;
+
+#ifdef NEW_LOGGING
+	LDAP_LOG( BACK_BDB, ARGS, 
+		"bdb_entry_get: ndn: \"%s\"\n", ndn->bv_val, 0, 0 );
+	LDAP_LOG( BACK_BDB, ARGS, 
+		"bdb_entry_get: oc: \"%s\", at: \"%s\"\n",
+		oc ? oc->soc_cname.bv_val : "(null)", at_name, 0);
+#else
+	Debug( LDAP_DEBUG_ARGS,
+		"=> bdb_entry_get: ndn: \"%s\"\n", ndn->bv_val, 0, 0 ); 
+	Debug( LDAP_DEBUG_ARGS,
+		"=> bdb_entry_get: oc: \"%s\", at: \"%s\"\n",
+		oc ? oc->soc_cname.bv_val : "(null)", at_name, 0);
+#endif
+
+	if( op ) boi = (struct bdb_op_info *) op->o_private;
+	if( boi != NULL && op->o_bd == boi->boi_bdb ) {
+		txn = boi->boi_txn;
+		locker = boi->boi_locker;
+	}
+
+	if ( txn != NULL ) {
+		locker = TXN_ID ( txn );
+	} else if ( !locker ) {
+		rc = LOCK_ID ( bdb->bi_dbenv, &locker );
+		free_lock_id = 1;
+		switch(rc) {
+		case 0:
+			break;
+		default:
+			return LDAP_OTHER;
+		}
+	}
+
+dn2entry_retry:
+	/* can we find entry */
+	rc = bdb_dn2entry( op, txn, ndn, &ei, 0, locker, &lock );
+	switch( rc ) {
+	case DB_NOTFOUND:
+	case 0:
+		break;
+	case DB_LOCK_DEADLOCK:
+	case DB_LOCK_NOTGRANTED:
+		/* the txn must abort and retry */
+		if ( txn ) {
+			boi->boi_err = rc;
+			return LDAP_BUSY;
+		}
+		ldap_pvt_thread_yield();
+		goto dn2entry_retry;
+	default:
+		if ( boi ) boi->boi_err = rc;
+		if ( free_lock_id ) {
+			LOCK_ID_FREE( bdb->bi_dbenv, locker );
+		}
+		return (rc != LDAP_BUSY) ? LDAP_OTHER : LDAP_BUSY;
+	}
+	if (ei) e = ei->bei_e;
+	if (e == NULL) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( BACK_BDB, INFO, 
+			"bdb_entry_get: cannot find entry (%s)\n", 
+			ndn->bv_val, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ACL,
+			"=> bdb_entry_get: cannot find entry: \"%s\"\n",
+				ndn->bv_val, 0, 0 ); 
+#endif
+		if ( free_lock_id ) {
+			LOCK_ID_FREE( bdb->bi_dbenv, locker );
+		}
+		return LDAP_NO_SUCH_OBJECT; 
+	}
+	
+#ifdef NEW_LOGGING
+	LDAP_LOG( BACK_BDB, DETAIL1, "bdb_entry_get: found entry (%s)\n",
+		ndn->bv_val, 0, 0 );
+#else
+	Debug( LDAP_DEBUG_ACL,
+		"=> bdb_entry_get: found entry: \"%s\"\n",
+		ndn->bv_val, 0, 0 ); 
+#endif
+
+#ifdef BDB_ALIASES
+	/* find attribute values */
+	if( is_entry_alias( e ) ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( BACK_BDB, INFO, 
+			"bdb_entry_get: entry (%s) is an alias\n", e->e_name.bv_val, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ACL,
+			"<= bdb_entry_get: entry is an alias\n", 0, 0, 0 );
+#endif
+		rc = LDAP_ALIAS_PROBLEM;
+		goto return_results;
+	}
+#endif
+
+	if( is_entry_referral( e ) ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( BACK_BDB, INFO, 
+			"bdb_entry_get: entry (%s) is a referral.\n", e->e_name.bv_val, 0, 0);
+#else
+		Debug( LDAP_DEBUG_ACL,
+			"<= bdb_entry_get: entry is a referral\n", 0, 0, 0 );
+#endif
+		rc = LDAP_REFERRAL;
+		goto return_results;
+	}
+
+	if ( oc && !is_entry_objectclass( e, oc, 0 )) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( BACK_BDB, INFO, 
+			"bdb_entry_get: failed to find objectClass.\n", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ACL,
+			"<= bdb_entry_get: failed to find objectClass\n",
+			0, 0, 0 ); 
+#endif
+		rc = LDAP_NO_SUCH_ATTRIBUTE;
+		goto return_results;
+	}
+
+return_results:
+	if( rc != LDAP_SUCCESS ) {
+		/* free entry */
+		bdb_cache_return_entry_rw(bdb->bi_dbenv, &bdb->bi_cache, e, rw, &lock);
+	} else {
+		*ent = e;
+		/* big drag. we need a place to store a read lock so we can
+		 * release it later??
+		 */
+		if ( op && !boi ) {
+			boi = op->o_tmpcalloc(1,sizeof(struct bdb_op_info),op->o_tmpmemctx);
+			boi->boi_lock = lock;
+			op->o_private = boi;
+		}
+	}
+
+	if ( free_lock_id ) {
+		LOCK_ID_FREE( bdb->bi_dbenv, locker );
+	}
+
+#ifdef NEW_LOGGING
+	LDAP_LOG( BACK_BDB, ENTRY, "bdb_entry_get: rc=%d\n", rc, 0, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE,
+		"bdb_entry_get: rc=%d\n",
+		rc, 0, 0 ); 
+#endif
+	return(rc);
+}