mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

More BDB_PSEARCH cleanup

Browse Source
This commit is contained in:
Howard Chu 2004-11-26 09:39:33 +00:00
parent 127a85b553
commit 3426a11983
6 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servers/slapd/back-bdb/add.c
View File

@ -367,6 +367,7 @@ retry: /* transaction retry */
goto return_results;
}
#ifdef BDB_PSEARCH
if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
rc = bdb_csn_commit( op, rs, ltid, ei, &suffix_ei,
&ctxcsn_e, &ctxcsn_added, locker );
@ -377,6 +378,7 @@ retry: /* transaction retry */
goto retry;
}
}
#endif
/* post-read */
if( op->o_postread ) {

2
servers/slapd/back-bdb/ctxcsn.c
View File

@ -25,6 +25,7 @@
#include "lutil.h"
#include "back-bdb.h"
#ifdef BDB_PSEARCH
int
bdb_csn_commit(
Operation *op,
@ -439,3 +440,4 @@ done:
return rs->sr_err;
}
#endif

2
servers/slapd/back-bdb/delete.c
View File

@ -482,6 +482,7 @@ retry: /* transaction retry */
ldap_pvt_thread_mutex_unlock( &bdb->bi_lastid_mutex );
#endif
#ifdef BDB_PSEARCH
if ( !dn_match( &ctxcsn_ndn, &op->o_req_ndn ) &&
!be_issuffix( op->o_bd, &op->o_req_ndn ) &&
LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
@ -494,6 +495,7 @@ retry: /* transaction retry */
goto retry;
}
}
#endif
if( op->o_noop ) {
if ( ( rs->sr_err = TXN_ABORT( ltid ) ) != 0 ) {

2
servers/slapd/back-bdb/modify.c
View File

@ -537,6 +537,7 @@ retry: /* transaction retry */
goto return_results;
}
#ifdef BDB_PSEARCH
if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
rc = bdb_csn_commit( op, rs, ltid, ei, &suffix_ei,
&ctxcsn_e, &ctxcsn_added, locker );
@ -547,6 +548,7 @@ retry: /* transaction retry */
goto retry;
}
}
#endif
if( op->o_postread ) {
if( postread_ctrl == NULL ) {

2
servers/slapd/back-bdb/modrdn.c
View File

@ -805,6 +805,7 @@ retry: /* transaction retry */
goto return_results;
}
#ifdef BDB_PSEARCH
if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
rc = bdb_csn_commit( op, rs, ltid, ei, &suffix_ei,
&ctxcsn_e, &ctxcsn_added, locker );
@ -815,6 +816,7 @@ retry: /* transaction retry */
goto retry;
}
}
#endif
if( op->o_postread ) {
if( postread_ctrl == NULL ) {

3
servers/slapd/back-bdb/search.c
View File

@ -1870,9 +1870,6 @@ done:
bdb_cache_return_entry_r( bdb->bi_dbenv, &bdb->bi_cache, e, &lock );
}
ber_bvfree( search_context_csn );
#else
bdb_cache_return_entry_r( bdb->bi_dbenv, &bdb->bi_cache, e, &lock );
#endif
if ( !opinfo )