Enable management of attribute indices. Not yet used by test_filter.

diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c
index 06de7a69dfab04534ceea2eb72da142c023effa4..92e3163a598e1c1e2b31d194f105f3b04d48b9ac 100644 (file)
--- a/servers/slapd/back-bdb/add.c
+++ b/servers/slapd/back-bdb/add.c
@@ -238,7 +238,7 @@ retry:      rc = txn_abort( ltid );
                goto return_results;
        }
 
-#if 0
+#if BDB_INDEX
        /* attribute indexes */
        if ( index_entry_add( be, e, e->e_attrs ) != LDAP_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE, "bdb_add: index_entry_add failed\n",

diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h
index 74a55cecd2dbdbbd475f2db6e93a45798d53ce0c..63f4fc5318d2338b6bb68ee97e1a870b164e04fd 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -15,6 +15,7 @@
 
 LDAP_BEGIN_DECL
 
+#define BBD_INDEX 1
 
 #define DN_BASE_PREFIX         SLAP_INDEX_EQUALITY_PREFIX
 #define DN_ONE_PREFIX          '%'

diff --git a/servers/slapd/back-bdb/idl.h b/servers/slapd/back-bdb/idl.h
index b0d414098dc434619a916f85ad5457c6f0226b61..c84cec59ea34445fa7892e1a9d2897e6c7dd2900 100644 (file)
--- a/servers/slapd/back-bdb/idl.h
+++ b/servers/slapd/back-bdb/idl.h
@@ -12,15 +12,9 @@
 
 #include "slap.h"
 
-#if 1
-       /* larger IDL sizes (which blow thread stacks) */
+       /* larger IDL sizes - likely should be even bigger */
 #define BDB_IDL_DB_SIZE                (1<<16) /* 64K IDL on disk */
 #define BDB_IDL_SIZE           (1<<17) /* 128K IDL in memory */
-#else
-       /* reduced IDL sizes for testing */
-#define BDB_IDL_DB_SIZE                (1<<8) /* 256 IDL on disk */
-#define BDB_IDL_SIZE           (1<<10) /* 1K IDL in memory */
-#endif
 
 #define BDB_IDL_DB_MAX         (BDB_IDL_DB_SIZE-32)
 /* #define BDB_IDL_DB_ALLOC    (BDB_IDL_DB_SIZE * sizeof(ID)) */

diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c
index 03c0c29b0b41d6c75d0dc628d23c221572f25619..b1044d59b966a065da8d47de6f1d6b2360694f0a 100644 (file)
--- a/servers/slapd/back-bdb/modify.c
+++ b/servers/slapd/back-bdb/modify.c
@@ -127,7 +127,7 @@ int bdb_modify_internal(
                return rc;
        }
 
-#if 0
+#if BDB_INDEX
        /* delete indices for old attributes */
        rc = index_entry_del( be, tid, e, save_attrs);
 

diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c
index 096dcec539afb8f9e74d86dffbec516a00465682..9a212c6291bc8be72af29a34ad3a0bcba03d0555 100644 (file)
--- a/servers/slapd/back-bdb/tools.c
+++ b/servers/slapd/back-bdb/tools.c
@@ -156,7 +156,7 @@ ID bdb_tool_entry_put(
                goto done;
        }
 
-#if 0
+#if BDB_INDEX
        rc = bdb_index_entry_add( be, tid, e, e->e_attrs );
        if( rc != 0 ) {
                goto done;
@@ -184,7 +184,7 @@ done:
        return e->e_id;
 }
 
-#if 0
+#if BDB_INDEX
 int bdb_tool_entry_reindex(
        BackendDB *be,
        ID id )