misc cleanup

[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 30640a0e455baeeb44118dd75df14952d4ac6a61..d8880b314767addc78ce4930f58f8247b1d5eb7c 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -14,7 +14,9 @@
 
 LDAP_BEGIN_DECL
 
-/* #define BDB_HIER            1 */
+#ifdef LDAP_SYNCREPL
+#define BDB_SUBENTRIES 1
+#endif
 
 #define DN_BASE_PREFIX         SLAP_INDEX_EQUALITY_PREFIX
 #define DN_ONE_PREFIX          '%'
@@ -40,11 +42,7 @@ LDAP_BEGIN_DECL
 
 #define BDB_SUFFIX             ".bdb"
 #define BDB_ID2ENTRY   0
-#ifdef BDB_HIER
-#define BDB_ID2PARENT          1
-#else
 #define BDB_DN2ID              1
-#endif
 #define BDB_NDB                        2
 
 /* The bdb on-disk entry format is pretty space-inefficient. Average
@@ -90,12 +88,16 @@ typedef struct bdb_entry_info {
        int bei_state;
 #define        CACHE_ENTRY_DELETED     1
 #define        CACHE_ENTRY_NO_KIDS     2
+#define        CACHE_ENTRY_NOT_LINKED  4
 
        /*
         * remaining fields require backend cache lock to access
         */
        struct berval bei_nrdn;
+#ifdef BDB_HIER
        struct berval bei_rdn;
+       int     bei_modrdns;
+#endif
        Entry   *bei_e;
        Avlnode *bei_kids;
        ldap_pvt_thread_mutex_t bei_kids_mutex;
@@ -146,21 +148,17 @@ struct bdb_info {
        Avlnode         *bi_attrs;
        void            *bi_search_stack;
        int             bi_search_stack_depth;
-#ifdef BDB_HIER
-       Avlnode         *bi_tree;
-       ldap_pvt_thread_rdwr_t  bi_tree_rdwr;
-       void            *bi_troot;
-#endif
 
        int                     bi_txn_cp;
        u_int32_t       bi_txn_cp_min;
        u_int32_t       bi_txn_cp_kbyte;
 
        int                     bi_lock_detect;
+       long            bi_shm_key;
 
        ID                      bi_lastid;
        ldap_pvt_thread_mutex_t bi_lastid_mutex;
-#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
+#ifdef LDAP_SYNC
        LDAP_LIST_HEAD(pl, slap_op) bi_psearch_list;
 #endif
 #ifdef SLAP_IDL_CACHE
@@ -175,11 +173,7 @@ struct bdb_info {
 };
 
 #define bi_id2entry    bi_databases[BDB_ID2ENTRY]
-#ifdef BDB_HIER
-#define bi_id2parent   bi_databases[BDB_ID2PARENT]
-#else
 #define bi_dn2id       bi_databases[BDB_DN2ID]
-#endif
 
 struct bdb_op_info {
        BackendDB*      boi_bdb;
@@ -225,16 +219,14 @@ struct bdb_op_info {
        (db)->open(db, txn, file, name, type, flags, mode)
 #endif
 
-#define BDB_REUSE_LOCKERS
-
-#ifdef BDB_REUSE_LOCKERS
-#define        LOCK_ID_FREE(env, locker)
-#define        LOCK_ID(env, locker)    bdb_locker_id(op, env, locker)
-#else
-#define        LOCK_ID_FREE(env, locker)       XLOCK_ID_FREE(env, locker)
-#define        LOCK_ID(env, locker)            XLOCK_ID(env, locker)
 #endif
 
+#define BDB_REUSE_LOCKERS
+
+#ifdef LDAP_SYNC
+#define BDB_CSN_COMMIT 0
+#define BDB_CSN_ABORT  1
+#define BDB_CSN_RETRY  2
 #endif
 
 LDAP_END_DECL