X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fsearch.c;h=df7ce17dd2e03f7694ee4364dcdad70ae9f51af9;hb=a61d2b914dafe2326a0336c87c530b93333e5eef;hp=ec841d7597dbff92908b21a3e5af6e0eddc6748a;hpb=ac1332cdb868b6a30f545796aca8e0bbf13fe939;p=openldap

diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index ec841d7597..df7ce17dd2 100644
--- a/servers/slapd/back-bdb/search.c
+++ b/servers/slapd/back-bdb/search.c
@@ -60,8 +60,12 @@ bdb_search(
 	struct slap_limits_set *limit = NULL;
 	int isroot = 0;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "search", LDAP_LEVEL_ENTRY,"bdb_back_search\n"));
+#else
 	Debug( LDAP_DEBUG_TRACE, "=> bdb_back_search\n",
 		0, 0, 0);
+#endif
 
 	manageDSAit = get_manageDSAit( op );
 
@@ -78,7 +82,7 @@ bdb_search(
 	} else
 #endif
 	{
-		rc = bdb_dn2entry( be, NULL, nbase, &e, &matched, 0 );
+		rc = bdb_dn2entry_r( be, NULL, nbase, &e, &matched, 0 );
 	}
 
 	switch(rc) {
@@ -86,6 +90,12 @@ bdb_search(
 	case 0:
 		break;
 	default:
+		if (e != NULL) {
+			bdb_cache_return_entry_w(&bdb->bi_cache, e);
+		}
+		if (matched != NULL) {
+			bdb_cache_return_entry_r(&bdb->bi_cache, matched);
+		}
 		send_ldap_result( conn, op, rc=LDAP_OTHER,
 			NULL, "internal error", NULL, NULL );
 		return rc;
@@ -104,7 +114,7 @@ bdb_search(
 				? get_entry_referrals( be, conn, op, matched )
 				: NULL;
 
-			bdb_entry_return( be, matched );
+			bdb_cache_return_entry_r (&bdb->bi_cache, matched);
 			matched = NULL;
 
 			if( erefs ) {
@@ -135,7 +145,7 @@ bdb_search(
 		erefs = get_entry_referrals( be, conn, op, e );
 		refs = NULL;
 
-		bdb_entry_return( be, e );
+		bdb_cache_return_entry_r( &bdb->bi_cache, e );
 		e = NULL;
 
 		if( erefs ) {
@@ -144,8 +154,12 @@ bdb_search(
 			ber_bvarray_free( erefs );
 		}
 
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: entry is referral\n"));
+#else
 		Debug( LDAP_DEBUG_TRACE, "bdb_search: entry is referral\n",
 			0, 0, 0 );
+#endif
 
 		send_ldap_result( conn, op, LDAP_REFERRAL,
 			matched_dn.bv_val,
@@ -241,17 +255,23 @@ bdb_search(
 	ber_dupbv( &realbase, &e->e_nname );
 
 	/* start cursor at base entry's id 
-	 * FIXME: hack to make "" base work */
+	 * FIXME: hack to make "" base work
+	 * FIXME: moddn needs to assign new ID for this to work
+	 */
 	cursor = e->e_id == NOID ? 1 : e->e_id;
 
 	if ( e != &slap_entry_root ) {
-		bdb_entry_return( be, e );
+		bdb_cache_return_entry_r(&bdb->bi_cache, e);
 	}
 	e = NULL;
 
 	if ( candidates[0] == 0 ) {
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: no candidates\n"));
+#else
 		Debug( LDAP_DEBUG_TRACE, "bdb_search: no candidates\n",
 			0, 0, 0 );
+#endif
 
 		send_search_result( conn, op,
 			LDAP_SUCCESS,
@@ -296,35 +316,43 @@ bdb_search(
 		}
 
 		/* get the entry with reader lock */
-		rc = bdb_id2entry( be, NULL, id, &e );
+		rc = bdb_id2entry_r( be, NULL, id, &e );
 
 		if ( e == NULL ) {
 			if( !BDB_IDL_IS_RANGE(candidates) ) {
 				/* only complain for non-range IDLs */
+#ifdef NEW_LOGGING
+				LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: candidate %ld not found\n", (long) id));
+#else
 				Debug( LDAP_DEBUG_TRACE,
 					"bdb_search: candidate %ld not found\n",
 					(long) id, 0, 0 );
+#endif
 			}
 
 			goto loop_continue;
 		}
 
+#ifdef BDB_SUBENTRIES
 		if ( is_entry_subentry( e ) ) {
 			if( scope != LDAP_SCOPE_BASE ) {
 				if(!get_subentries_visibility( op )) {
 					/* only subentries are visible */
 					goto loop_continue;
 				}
+
 			} else if ( get_subentries( op ) &&
 				!get_subentries_visibility( op ))
 			{
 				/* only subentries are visible */
 				goto loop_continue;
 			}
+
 		} else if ( get_subentries_visibility( op )) {
 			/* only subentries are visible */
 			goto loop_continue;
 		}
+#endif
 
 #ifdef BDB_ALIASES
 		if ( deref & LDAP_DEREF_SEARCHING && is_entry_alias( e ) ) {
@@ -346,18 +374,22 @@ bdb_search(
 
 			/* need to skip alias which deref into scope */
 			if( scope & LDAP_SCOPE_ONELEVEL ) {
-				char *pdn = dn_parent( NULL, e->e_ndn );
-				if ( pdn != NULL ) {
-					if( strcmp( pdn, realbase.bv_val ) ) {
-						goto loop_continue;
-					}
+				struct berval	pdn;
+				
+				dnParent( &e->e_nname, &pdn ):
+				if ( ber_bvcmp( pdn, &realbase ) ) {
+					goto loop_continue;
 				}
 
 			} else if ( dnIsSuffix( &e->e_nname, &realbase ) ) {
 				/* alias is within scope */
+#ifdef NEW_LOGGING
+				LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: \"%s\" in subtree\n", e->edn));
+#else
 				Debug( LDAP_DEBUG_TRACE,
 					"bdb_search: \"%s\" in subtree\n",
 					e->e_dn, 0, 0 );
+#endif
 				goto loop_continue;
 			}
 
@@ -392,16 +424,15 @@ bdb_search(
 		/* if it matches the filter and scope, send it */
 		rc = test_filter( be, conn, op, e, filter );
 		if ( rc == LDAP_COMPARE_TRUE ) {
-			char	*dn;
+			struct berval	dn;
 
 			/* check scope */
 			if ( !scopeok && scope == LDAP_SCOPE_ONELEVEL ) {
-				if ( (dn = dn_parent( be, e->e_ndn )) != NULL ) {
-					scopeok = (dn == realbase.bv_val)
-						? 1
-						: (strcmp( dn, realbase.bv_val ) ? 0 : 1 );
-				} else {
+				if ( be_issuffix( be, &e->e_nname ) ) {
 					scopeok = (realbase.bv_len == 0);
+				} else {
+					dnParent( &e->e_nname, &dn );
+					scopeok = dn_match( &dn, &realbase );
 				}
 
 			} else if ( !scopeok && scope == LDAP_SCOPE_SUBTREE ) {
@@ -414,7 +445,7 @@ bdb_search(
 			if ( scopeok ) {
 				/* check size limit */
 				if ( --slimit == -1 ) {
-					bdb_entry_return( be, e );
+					bdb_cache_return_entry_r (&bdb->bi_cache, e);
 					e = NULL;
 					send_search_result( conn, op,
 						rc = LDAP_SIZELIMIT_EXCEEDED, NULL, NULL,
@@ -423,8 +454,14 @@ bdb_search(
 				}
 
 				if (e) {
-					int result = send_search_entry( be, conn, op,
-						e, attrs, attrsonly, NULL);
+					int result;
+					
+					if( op->o_noop ) {
+						result = 0;
+					} else {
+						result = send_search_entry( be, conn, op,
+							e, attrs, attrsonly, NULL);
+					}
 
 					switch (result) {
 					case 0:		/* entry sent ok */
@@ -433,27 +470,36 @@ bdb_search(
 					case 1:		/* entry not sent */
 						break;
 					case -1:	/* connection closed */
-						bdb_entry_return( be, e );
+						bdb_cache_return_entry_r(&bdb->bi_cache, e);
 						e = NULL;
 						rc = LDAP_OTHER;
 						goto done;
 					}
 				}
 			} else {
+#ifdef NEW_LOGGING
+				LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: %ld scope not okay\n", (long) id));
+#else
 				Debug( LDAP_DEBUG_TRACE,
 					"bdb_search: %ld scope not okay\n",
 					(long) id, 0, 0 );
+#endif
 			}
 		} else {
+#ifdef NEW_LOGGING
+				LDAP_LOG (( "search", LDAP_LEVEL_RESULTS,"bdb_search: %ld does match filter\n", (long) id));
+#else
 			Debug( LDAP_DEBUG_TRACE,
 				"bdb_search: %ld does match filter\n",
 				(long) id, 0, 0 );
+#endif
 		}
 
 loop_continue:
 		if( e != NULL ) {
 			/* free reader lock */
-			bdb_entry_return( be, e );
+                        bdb_cache_return_entry_r ( &bdb->bi_cache, e );
+                        e = NULL;
 		}
 
 		ldap_pvt_thread_yield();
@@ -465,6 +511,11 @@ loop_continue:
 	rc = 0;
 
 done:
+	if( e != NULL ) {
+		/* free reader lock */
+		bdb_cache_return_entry_r ( &bdb->bi_cache, e );
+	}
+
 	if( v2refs ) ber_bvarray_free( v2refs );
 	if( realbase.bv_val ) ch_free( realbase.bv_val );
 
@@ -477,8 +528,12 @@ static int base_candidate(
 	Entry	*e,
 	ID		*ids )
 {
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "search", LDAP_LEVEL_ENTRY,"base_candidate: base: \"%s\" (0x%08lx)\n", e->e_dn, (long) e->e_id));
+#else
 	Debug(LDAP_DEBUG_ARGS, "base_candidates: base: \"%s\" (0x%08lx)\n",
 		e->e_dn, (long) e->e_id, 0);
+#endif
 
 	ids[0] = 1;
 	ids[1] = e->e_id;
@@ -528,15 +583,18 @@ static int search_candidates(
 	ID	*ids )
 {
 	int rc;
-	Filter		f, scopef, sf, rf, xf;
+	Filter		f, scopef, rf, xf;
 	ID		tmp[BDB_IDL_UM_SIZE];
 	AttributeAssertion aa_ref;
+#ifdef BDB_SUBENTRIES
+	Filter	sf;
 	AttributeAssertion aa_subentry;
-	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+#endif
 #ifdef BDB_ALIASES
 	Filter	af;
 	AttributeAssertion aa_alias;
 #endif
+	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 
 	/*
 	 * This routine takes as input a filter (user-filter)
@@ -545,9 +603,13 @@ static int search_candidates(
 	 *		(|[(objectClass=referral)(objectClass=alias)](user-filter))
 	 */
 
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "search", LDAP_LEVEL_ENTRY,"search_candidates: base=\"%s\" (0x%08lx) scope=%d\n", e->e_dn, (long) e->e_id, scope));
+#else
 	Debug(LDAP_DEBUG_TRACE,
 		"search_candidates: base=\"%s\" (0x%08lx) scope=%d\n",
 		e->e_dn, (long) e->e_id, scope );
+#endif
 
 	xf.f_or = filter;
 	xf.f_choice = LDAP_FILTER_OR;
@@ -589,6 +651,7 @@ static int search_candidates(
 	scopef.f_dn = &e->e_nname;
 	scopef.f_next = xf.f_or == filter ? filter : &xf ;
 
+#ifdef BDB_SUBENTRIES
 	if( get_subentries_visibility( op ) ) {
 		struct berval bv_subentry = { sizeof("SUBENTRY")-1, "SUBENTRY" };
 		sf.f_choice = LDAP_FILTER_EQUALITY;
@@ -598,23 +661,30 @@ static int search_candidates(
 		sf.f_next = scopef.f_next;
 		scopef.f_next = &sf;
 	}
+#endif
 
-#ifdef BDB_FILTER_INDICES
 	rc = bdb_filter_candidates( be, &f, ids, tmp );
+
+	if( rc ) {
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "search", LDAP_LEVEL_DETAIL1,"bdb_search_candidates: failed (rc=%d)\n", rc));
 #else
-	/* FIXME: Original code:
-	BDB_IDL_ID( bdb, ids, e->e_id );
-	* this is a hack to make "" base work; when bdb_filter_candidates
-	* is used this should not be needed any more */
-	BDB_IDL_ID( bdb, ids, (e->e_id == NOID ? 1 : e->e_id) );
-	rc = 0;
+		Debug(LDAP_DEBUG_TRACE,
+			"bdb_search_candidates: failed (rc=%d)\n",
+			rc, NULL, NULL );
 #endif
 
-	Debug(LDAP_DEBUG_TRACE,
-		"bdb_search_candidates: id=%ld first=%ld last=%ld\n",
-		(long) ids[0],
-		(long) BDB_IDL_FIRST(ids),
-		(long) BDB_IDL_LAST(ids) );
+	} else {
+#ifdef NEW_LOGGING
+		LDAP_LOG (( "search", LDAP_LEVEL_DETAIL1,"bdb_search_candidates: 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_search_candidates: id=%ld first=%ld last=%ld\n",
+			(long) ids[0],
+			(long) BDB_IDL_FIRST(ids),
+			(long) BDB_IDL_LAST(ids) );
+#endif
+	}
 
 	return rc;
 }