When using BDB_IDL_MULTI, there are no longer any issues with storing

large IDLs. Concurrency is improved by using as small a page size as
possible. So, set the pagesize back to the default 4096 in this case.

diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h
index 60bbe60b9b4a7a5dd746d33f7cb074f677707f4c..97517e8b104cdb4512f79addad8783d0dd56e040 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -16,7 +16,7 @@
 LDAP_BEGIN_DECL
 
 #define BDB_FILTER_INDICES 1
-/* #define BDB_IDL_MULTI               1 */
+#define BDB_IDL_MULTI          1
 
 #define DN_BASE_PREFIX         SLAP_INDEX_EQUALITY_PREFIX
 #define DN_ONE_PREFIX          '%'
@@ -50,10 +50,17 @@ LDAP_BEGIN_DECL
  * 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_PAGESIZE
+#ifdef BDB_IDL_MULTI
+#define        BDB_PAGESIZE    4096    /* BDB's original default */
+#else
 #define        BDB_PAGESIZE    16384
 #endif
+#endif
 
 #define BDB_INDICES            128