X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fdn2id.c;h=b0bef02a1da63cc72b7be709601cdcf6c8a9d7bc;hb=6df9b5459294bcc9adf27f048508d43eea58a203;hp=1f5969e3ff1e4b10e88150b312baa50209a68e08;hpb=68daf5bee9cb569aad8225b288de0805138cf5a2;p=openldap

diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index 1f5969e3ff..b0bef02a1d 100644
--- a/servers/slapd/back-bdb/dn2id.c
+++ b/servers/slapd/back-bdb/dn2id.c
@@ -1,7 +1,7 @@
 /* dn2id.c - routines to deal with the dn2id index */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -25,7 +25,8 @@ bdb_dn2id_add(
 	DB *db = bdb->bi_dn2id->bdi_db;
 	int		rc;
 	DBT		key, data;
-	char		*buf, *ptr, *pdn;
+	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 );
@@ -36,8 +37,10 @@ bdb_dn2id_add(
 	buf = ch_malloc( key.size );
 	key.data = buf;
 	buf[0] = DN_BASE_PREFIX;
-	ptr = buf + 1;
-	AC_MEMCPY( ptr, e->e_ndn, key.size - 1 );
+	ptr.bv_val = buf + 1;
+	ptr.bv_len = e->e_nname.bv_len;
+	AC_MEMCPY( ptr.bv_val, e->e_nname.bv_val, e->e_nname.bv_len );
+	ptr.bv_val[ptr.bv_len] = '\0';
 
 	DBTzero( &data );
 	data.data = (char *) &e->e_id;
@@ -51,51 +54,49 @@ bdb_dn2id_add(
 		goto done;
 	}
 
-	if( !be_issuffix( be, ptr )) {
+	if( !be_issuffix( be, &ptr )) {
 		buf[0] = DN_SUBTREE_PREFIX;
 		rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id );
 		if( rc != 0 ) {
 			Debug( LDAP_DEBUG_ANY,
 			"=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
-			ptr, rc, 0 );
+			ptr.bv_val, rc, 0 );
 			goto done;
 		}
-	}
-
-	pdn = dn_parent( be, ptr );
-
-	if( pdn != NULL ) {
-		key.size -= pdn - ptr;
-		pdn[-1] = DN_ONE_PREFIX;
-		key.data = pdn - 1;
+		
+		dnParent( &ptr, &pdn );
+	
+		key.size = pdn.bv_len + 2;
+		pdn.bv_val[-1] = DN_ONE_PREFIX;
+		key.data = pdn.bv_val-1;
+		ptr = pdn;
 
 		rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id );
 
 		if( rc != 0 ) {
 			Debug( LDAP_DEBUG_ANY,
 				"=> bdb_dn2id_add: parent (%s) insert failed: %d\n",
-					pdn, rc, 0 );
+					ptr.bv_val, rc, 0 );
 			goto done;
 		}
 	}
 
-	while( pdn != NULL ) {
-		if ( be_issuffix( be, pdn ))
-			break;
-		pdn[-1] = DN_SUBTREE_PREFIX;
+	while( !be_issuffix( be, &ptr )) {
+		ptr.bv_val[-1] = DN_SUBTREE_PREFIX;
 
 		rc = bdb_idl_insert_key( be, db, txn, &key, e->e_id );
 
 		if( rc != 0 ) {
 			Debug( LDAP_DEBUG_ANY,
 				"=> bdb_dn2id_add: subtree (%s) insert failed: %d\n",
-					pdn, rc, 0 );
+					ptr.bv_val, rc, 0 );
 			break;
 		}
+		dnParent( &ptr, &pdn );
+
+		key.size = pdn.bv_len + 2;
+		key.data = pdn.bv_val - 1;
 		ptr = pdn;
-		pdn = dn_parent( be, pdn );
-		key.size -= pdn - ptr;
-		key.data = pdn - 1;
 	}
 
 done:
@@ -108,14 +109,15 @@ int
 bdb_dn2id_delete(
 	BackendDB	*be,
 	DB_TXN *txn,
-	char	*pdn,
+	char	*pdnc,
 	Entry		*e )
 {
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 	DB *db = bdb->bi_dn2id->bdi_db;
 	int		rc;
 	DBT		key;
-	char		*buf, *ptr;
+	char		*buf;
+	struct berval	pdn, ptr;
 
 	Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_delete( \"%s\", 0x%08lx )\n",
 		e->e_ndn, e->e_id, 0 );
@@ -126,8 +128,10 @@ bdb_dn2id_delete(
 	key.data = buf;
 	key.flags = DB_DBT_USERMEM;
 	buf[0] = DN_BASE_PREFIX;
-	ptr = buf+1;
-	AC_MEMCPY( ptr, e->e_ndn, key.size - 1 );
+	ptr.bv_val = buf+1;
+	ptr.bv_len = e->e_nname.bv_len;
+	AC_MEMCPY( ptr.bv_val, e->e_nname.bv_val, e->e_nname.bv_len );
+	ptr.bv_val[ptr.bv_len] = '\0';
 
 	/* delete it */
 	rc = db->del( db, txn, &key, 0 );
@@ -137,51 +141,48 @@ bdb_dn2id_delete(
 		goto done;
 	}
 
-	if( !be_issuffix( be, ptr )) {
+	if( !be_issuffix( be, &ptr )) {
 		buf[0] = DN_SUBTREE_PREFIX;
 		rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id );
 		if( rc != 0 ) {
 			Debug( LDAP_DEBUG_ANY,
 			"=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
-			ptr, rc, 0 );
+			ptr.bv_val, rc, 0 );
 			goto done;
 		}
-	}
 
-	pdn = dn_parent( be, ptr );
+		dnParent( &ptr, &pdn );
 
-	if( pdn != NULL ) {
-		key.size -= pdn - ptr;
-		pdn[-1] = DN_ONE_PREFIX;
-		key.data = pdn - 1;
+		key.size = pdn.bv_len + 2;
+		pdn.bv_val[-1] = DN_ONE_PREFIX;
+		key.data = pdn.bv_val - 1;
+		ptr = pdn;
 
 		rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id );
 
 		if( rc != 0 ) {
 			Debug( LDAP_DEBUG_ANY,
 				"=> bdb_dn2id_delete: parent (%s) delete failed: %d\n",
-				pdn, rc, 0 );
+				ptr.bv_val, rc, 0 );
 			goto done;
 		}
 	}
 
-	while( pdn != NULL ) {
-		if ( be_issuffix( be, pdn ))
-			break;
-
-		pdn[-1] = DN_SUBTREE_PREFIX;
+	while( !be_issuffix( be, &ptr )) {
+		ptr.bv_val[-1] = DN_SUBTREE_PREFIX;
 
 		rc = bdb_idl_delete_key( be, db, txn, &key, e->e_id );
 		if( rc != 0 ) {
 			Debug( LDAP_DEBUG_ANY,
 				"=> bdb_dn2id_delete: subtree (%s) delete failed: %d\n",
-				pdn, rc, 0 );
+				ptr.bv_val, rc, 0 );
 			goto done;
 		}
+		dnParent( &ptr, &pdn );
+
+		key.size = pdn.bv_len + 2;
+		key.data = pdn.bv_val - 1;
 		ptr = pdn;
-		pdn = dn_parent( be, pdn );
-		key.size -= pdn - ptr;
-		key.data = pdn - 1;
 	}
 
 done:
@@ -204,6 +205,13 @@ bdb_dn2id(
 
 	Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id( \"%s\" )\n", dn->bv_val, 0, 0 );
 
+	assert (id);
+ 
+	*id = bdb_cache_find_entry_ndn2id(be, &bdb->bi_cache, dn);
+	if (*id != NOID) {
+		return 0;
+	}
+
 	DBTzero( &key );
 	key.size = dn->bv_len + 2;
 	key.data = ch_malloc( key.size );
@@ -237,13 +245,15 @@ bdb_dn2id_matched(
 	DB_TXN *txn,
 	struct berval	*in,
 	ID *id,
-	char **matchedDN )
+	ID *id2 )
 {
 	int		rc;
 	DBT		key, data;
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 	DB *db = bdb->bi_dn2id->bdi_db;
-	char 		*buf, *dn;
+	char 		*buf;
+	struct	berval dn;
+	ID		cached_id;
 
 	Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_matched( \"%s\" )\n", in->bv_val, 0, 0 );
 
@@ -251,8 +261,9 @@ bdb_dn2id_matched(
 	key.size = in->bv_len + 2;
 	buf = ch_malloc( key.size );
 	key.data = buf;
-	dn = buf+1;
-	AC_MEMCPY( dn, in->bv_val, key.size - 1 );
+	dn.bv_val = buf+1;
+	dn.bv_len = key.size - 2;
+	AC_MEMCPY( dn.bv_val, in->bv_val, key.size - 1 );
 
 	/* store the ID */
 	DBTzero( &data );
@@ -260,29 +271,41 @@ bdb_dn2id_matched(
 	data.ulen = sizeof(ID);
 	data.flags = DB_DBT_USERMEM;
 
-	*matchedDN = NULL;
-
 	while(1) {
-		dn[-1] = DN_BASE_PREFIX;
+		dn.bv_val[-1] = DN_BASE_PREFIX;
 
 		*id = NOID;
 
-		/* fetch it */
-		rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags );
+		/* lookup cache */
+		cached_id = bdb_cache_find_entry_ndn2id(be, &bdb->bi_cache, &dn);
+ 
+		if (cached_id != NOID) {
+			rc = 0;
+			*id = cached_id;
+			if ( dn.bv_val != buf+1 ) {
+				*id2 = *id;
+			}
+			break;
+		} else {
+			/* fetch it */
+			rc = db->get(db, txn, &key, &data, bdb->bi_db_opflags );
+		}
 
 		if( rc == DB_NOTFOUND ) {
-			char *pdn = dn_parent( be, dn );
+			struct berval 	pdn;
 
-			if( pdn == NULL || *pdn == '\0' ) {
+			if ( ! be_issuffix( be, &dn ) ) {
+				dnParent( &dn, &pdn );
+			} else {
 				Debug( LDAP_DEBUG_TRACE,
 					"<= bdb_dn2id_matched: no match\n",
 					0, 0, 0 );
 				break;
 			}
 
-			key.size -= pdn - dn;
+			key.size = pdn.bv_len + 2;
 			dn = pdn;
-			key.data = pdn - 1;
+			key.data = pdn.bv_val - 1;
 
 		} else if ( rc == 0 ) {
 			if( data.size != sizeof( ID ) ) {
@@ -292,13 +315,13 @@ bdb_dn2id_matched(
 					(long) sizeof(ID), (long) data.size, 0 );
 			}
 
-			if( dn != buf+1 ) {
-				*matchedDN = (char *) dn;
+			if( dn.bv_val != buf+1 ) {
+				*id2 = *id;
 			}
 
 			Debug( LDAP_DEBUG_TRACE,
 				"<= bdb_dn2id_matched: id=0x%08lx: %s %s\n",
-				(long) *id, *matchedDN == NULL ? "entry" : "matched", dn );
+				(long) *id, *id2 == 0 ? "entry" : "matched", dn.bv_val );
 			break;
 
 		} else {
@@ -343,9 +366,10 @@ bdb_dn2id_children(
 	data.dlen = sizeof(id);
 
 	rc = db->get( db, txn, &key, &data, bdb->bi_db_opflags );
+	free( key.data );
 
 	Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_children( %s ): %schildren (%d)\n",
-		dn,
+		dn->bv_val,
 		rc == 0 ? "" : ( rc == DB_NOTFOUND ? "no " :
 			db_strerror(rc) ), rc );
 
@@ -366,7 +390,7 @@ bdb_dn2idl(
 
 	Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2idl( \"%s\" )\n", dn->bv_val, 0, 0 );
 
-	if (prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn->bv_val))
+	if (prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn))
 	{
 		BDB_IDL_ALL(bdb, ids);
 		return 0;
@@ -471,7 +495,11 @@ node_rdn_cmp(
 	idNode *b
 )
 {
+#if 0
 	return strcmp(a->i_rdn->nrdn.bv_val, b->i_rdn->nrdn.bv_val);
+#endif
+	/* should be slightly better without ordering drawbacks */
+	return ber_bvcmp(&a->i_rdn->nrdn, &b->i_rdn->nrdn);
 }
 
 idNode * bdb_find_id_node(
@@ -742,7 +770,7 @@ bdb_dn2id_matched(
 	DB_TXN *txn,
 	struct berval	*in,
 	ID *id,
-	char **matchedDN )
+	ID *id2 )
 {
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 	int		i;
@@ -753,7 +781,7 @@ bdb_dn2id_matched(
 		return DB_NOTFOUND;
 
 	p = bdb->bi_troot;
-	if (be_issuffix(be, in->bv_val)) {
+	if (be_issuffix(be, in)) {
 		*id = p->i_id;
 		return 0;
 	}
@@ -761,8 +789,10 @@ bdb_dn2id_matched(
 	rdns = ldap_explode_dn(in->bv_val, 0);
 	for (i=0; rdns[i]; i++);
 	i -= bdb->bi_nrdns;
-	if (i < 0)
+	if (i < 0) {
+		charray_free(rdns);
 		return -1;
+	}
 	n = p;
 	ldap_pvt_thread_rdwr_rlock(&bdb->bi_tree_rdwr);
 	for (--i; i>=0; i--) {
@@ -773,22 +803,12 @@ bdb_dn2id_matched(
 		p = n;
 	}
 	ldap_pvt_thread_rdwr_runlock(&bdb->bi_tree_rdwr);
+	charray_free(rdns);
 
 	if (n) {
 		*id = n->i_id;
-	} else if (matchedDN) {
-		int len = 0, j;
-		char *ptr;
-		++i;
-		for (j=i; rdns[j]; j++)
-			len += strlen(rdns[j]) + 1;
-		ptr = ch_malloc(len);
-		*matchedDN = ptr;
-		for (;rdns[i]; i++) {
-			ptr = slap_strcopy(ptr, rdns[i]);
-			*ptr++ = ',';
-		}
-		ptr[-1] = '\0';
+	} else if (id2) {
+		*id2 = p->i_id;
 	}
 	return n ? 0 : DB_NOTFOUND;
 }
@@ -870,7 +890,7 @@ bdb_dn2idl(
 	ID		id;
 	idNode		*n;
 
-	if (prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn->bv_val)) {
+	if (prefix == DN_SUBTREE_PREFIX && be_issuffix(be, dn)) {
 		BDB_IDL_ALL(bdb, ids);
 		return 0;
 	}