More for 2.2beta

[openldap] / servers / slapd / back-bdb / back-bdb.h

diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h
index 7fe656e32e126708ecf75a69fdc1cdbef95e2ad7..b5dc2fe0339093d52ffaa0a30c2dccf6e249ea77 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -11,10 +11,11 @@
 #include <portable.h>
 #include "slap.h"
 #include <db.h>
-#undef const   /* db.h defines this?? */
 
 LDAP_BEGIN_DECL
 
+#define BDB_SUBENTRIES 1
+
 #define DN_BASE_PREFIX         SLAP_INDEX_EQUALITY_PREFIX
 #define DN_ONE_PREFIX          '%'
 #define DN_SUBTREE_PREFIX      '@'
@@ -93,7 +94,9 @@ typedef struct bdb_entry_info {
        struct berval bei_nrdn;
 #ifdef BDB_HIER
        struct berval bei_rdn;
-       int     bei_modrdns;
+       int     bei_modrdns;    /* track renames */
+       int     bei_ckids;      /* number of kids cached */
+       int     bei_dkids;      /* number of kids on-disk, plus 1 */
 #endif
        Entry   *bei_e;
        Avlnode *bei_kids;
@@ -155,9 +158,7 @@ struct bdb_info {
 
        ID                      bi_lastid;
        ldap_pvt_thread_mutex_t bi_lastid_mutex;
-#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
        LDAP_LIST_HEAD(pl, slap_op) bi_psearch_list;
-#endif
 #ifdef SLAP_IDL_CACHE
        int             bi_idl_cache_max_size;
        int             bi_idl_cache_size;
@@ -220,6 +221,10 @@ struct bdb_op_info {
 
 #define BDB_REUSE_LOCKERS
 
+#define BDB_CSN_COMMIT 0
+#define BDB_CSN_ABORT  1
+#define BDB_CSN_RETRY  2
+
 LDAP_END_DECL
 
 #include "proto-bdb.h"