Reset Entry->e_ocflags to 0 if objectClass attr is modified.

[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 06361d7530cd0ea2cd37e519877c7cd92e87e1a9..3ef79b443797521b5f2625b0fcab73d75ca3879b 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -1,7 +1,7 @@
-/* back-bdb.h - ldap ldbm back-end header file */
+/* back-bdb.h - bdb back-end header file */
 /* $OpenLDAP$ */
 /*
- * Copyright 2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -15,11 +15,9 @@
 
 LDAP_BEGIN_DECL
 
-#define BDB_IDL_SIZE   (1<<16)
-#define BDB_IDL_MAX            (BDB_IDL_SIZE-16)
-#define BDB_IDL_ALLOC  (BDB_IDL_MAX * sizeof(ID))
-
-#define BDB_IS_ALLIDS(ids)     ((ids)[0] == NOID)
+#define BDB_FILTER_INDICES 1
+#define BDB_IDL_MULTI          1
+/* #define BDB_HIER            1 */
 
 #define DN_BASE_PREFIX         SLAP_INDEX_EQUALITY_PREFIX
 #define DN_ONE_PREFIX          '%'
@@ -33,18 +31,54 @@ LDAP_BEGIN_DECL
 
 #define DEFAULT_MODE           0600
 
+#define BDB_TXN_RETRIES        16
+
+#ifdef BDB_HIER
+#define BDB_DBENV_HOME LDAP_RUNDIR LDAP_DIRSEP "openldap-hdb"
+#else
 #define BDB_DBENV_HOME LDAP_RUNDIR LDAP_DIRSEP "openldap-bdb"
+#endif
 
+#ifdef BDB_SUBDIRS
 #define BDB_TMP_SUBDIR LDAP_DIRSEP "tmp"
 #define BDB_LG_SUBDIR  LDAP_DIRSEP "log"
 #define BDB_DATA_SUBDIR        LDAP_DIRSEP "data"
+#endif
 
-#define BDB_NEXTID             0
+#define BDB_SUFFIX             ".bdb"
+#define BDB_ID2ENTRY   0
+#ifdef BDB_HIER
+#define BDB_ID2PARENT          1
+#else
 #define BDB_DN2ID              1
-#define BDB_ID2ENTRY   2
-#define BDB_INDICES            3
+#endif
+#define BDB_NDB                        2
+
+/* The bdb on-disk entry format is pretty space-inefficient. Average
+ * sized user entries are 3-4K each. You need at least two entries to
+ * fit into a single database page, more is better. 64K is BDB's
+ * upper bound. The same issues arise with IDLs in the index databases,
+ * but it's nearly impossible to avoid overflows there.
+ *
+ * When using BDB_IDL_MULTI, the IDL size is no longer an issue. Smaller
+ * pages are better for concurrency.
+ */
+#ifndef BDB_ID2ENTRY_PAGESIZE
+#define        BDB_ID2ENTRY_PAGESIZE   16384
+#endif
+
+#ifndef BDB_PAGESIZE
+#ifdef BDB_IDL_MULTI
+#define        BDB_PAGESIZE    4096    /* BDB's original default */
+#else
+#define        BDB_PAGESIZE    16384
+#endif
+#endif
+
+#define BDB_INDICES            128
 
 struct bdb_db_info {
+       char            *bdi_name;
        DB                      *bdi_db;
 };
 
@@ -59,10 +93,57 @@ struct bdb_info {
 
        int                     bi_ndatabases;
        struct bdb_db_info **bi_databases;
+       ldap_pvt_thread_mutex_t bi_database_mutex;
+       int             bi_db_opflags;  /* db-specific flags */
+
+       slap_mask_t     bi_defaultmask;
+       Avlnode         *bi_attrs;
+#ifdef BDB_HIER
+       Avlnode         *bi_tree;
+       ldap_pvt_thread_rdwr_t  bi_tree_rdwr;
+       void            *bi_troot;
+       int             bi_nrdns;
+#endif
+
+       int             bi_txn;
+       int                     bi_txn_cp;
+       u_int32_t       bi_txn_cp_min;
+       u_int32_t       bi_txn_cp_kbyte;
+
+#ifndef NO_THREADS
+       int                     bi_lock_detect;
+       int                     bi_lock_detect_seconds;
+       ldap_pvt_thread_t       bi_lock_detect_tid;
+#endif
+
+       ID                      bi_lastid;
+       ldap_pvt_thread_mutex_t bi_lastid_mutex;
 };
-#define bi_nextid      bi_databases[BDB_NEXTID]
+
 #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;
+       DB_TXN*         boi_txn;
+       int                     boi_err;
+};
+
+#if DB_VERSION_MAJOR < 4
+#define        TXN_CHECKPOINT(env, k, m, f)    txn_checkpoint(env, k, m, f)
+#define        TXN_ID(txn)                     txn_id(txn)
+#define        LOCK_DETECT(env, f, t, a)       lock_detect(env, f, t, a)
+#define        LOCK_GET(env, i, f, o, m, l)    lock_get(env, i, f, o, m, l)
+#else
+#define        TXN_CHECKPOINT(env, k, m, f)    (env)->txn_checkpoint(env, k, m, f)
+#define        TXN_ID(txn)                     (txn)->id(txn)
+#define        LOCK_DETECT(env, f, t, a)       (env)->lock_detect(env, f, t, a)
+#define        LOCK_GET(env, i, f, o, m, l)    (env)->lock_get(env, i, f, o, m, l)
+#endif
 
 LDAP_END_DECL