More back-hdb search optimization

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

diff --git a/servers/slapd/back-bdb/proto-bdb.h b/servers/slapd/back-bdb/proto-bdb.h
index b63b9f3d954d66f398c0e97b875797211aa2101f..75f2f991bb85b6eb7666462436bbf4e36451fdda 100644 (file)
--- a/servers/slapd/back-bdb/proto-bdb.h
+++ b/servers/slapd/back-bdb/proto-bdb.h
@@ -31,25 +31,16 @@ LDAP_BEGIN_DECL
  */
 
 #define bdb_attr_mask                          BDB_SYMBOL(attr_mask)
+#define bdb_attr_flush                         BDB_SYMBOL(attr_flush)
 #define bdb_attr_index_config          BDB_SYMBOL(attr_index_config)
 #define bdb_attr_index_destroy         BDB_SYMBOL(attr_index_destroy)
+#define bdb_attr_index_free                    BDB_SYMBOL(attr_index_free)
 #define bdb_attr_index_unparse         BDB_SYMBOL(attr_index_unparse)
 
-#ifdef LDAP_COMP_MATCH
-#define bdb_attr_comp_ref                      BDB_SYMBOL(attr_comp_ref)
-#define bdb_attr_mask_cr                       BDB_SYMBOL(attr_mask_cr)
-void bdb_attr_comp_ref( struct bdb_info *bdb,
-       AttributeDescription *desc,
-       ComponentReference **cr );
-void bdb_attr_mask_cr( struct bdb_info *bdb,
-       AttributeDescription *desc,
-       slap_mask_t *indexmask,
-       ComponentReference **cr );
-#endif
+AttrInfo *bdb_attr_mask( struct bdb_info *bdb,
+       AttributeDescription *desc );
 
-void bdb_attr_mask( struct bdb_info *bdb,
-       AttributeDescription *desc,
-       slap_mask_t *indexmask );
+void bdb_attr_flush( struct bdb_info *bdb );
 
 int bdb_attr_index_config LDAP_P(( struct bdb_info *bdb,
        const char *fname, int lineno,
@@ -57,6 +48,8 @@ int bdb_attr_index_config LDAP_P(( struct bdb_info *bdb,
 
 void bdb_attr_index_unparse LDAP_P(( struct bdb_info *bdb, BerVarray *bva ));
 void bdb_attr_index_destroy LDAP_P(( Avlnode *tree ));
+void bdb_attr_index_free LDAP_P(( struct bdb_info *bdb,
+       AttributeDescription *ad ));
 
 /*
  * config.c
@@ -146,7 +139,9 @@ int bdb_fix_dn( Entry *e, int checkit );
 #if DB_VERSION_FULL < 0x04030000
 void bdb_errcall( const char *pfx, char * msg );
 #else
+#define bdb_msgcall                                    BDB_SYMBOL(msgcall)
 void bdb_errcall( const DB_ENV *env, const char *pfx, const char * msg );
+void bdb_msgcall( const DB_ENV *env, const char * msg );
 #endif
 
 #ifdef HAVE_EBCDIC
@@ -250,7 +245,7 @@ bdb_idl_cache_del(
 #define bdb_idl_intersection           BDB_SYMBOL(idl_intersection)
 #define bdb_idl_union                          BDB_SYMBOL(idl_union)
 #define bdb_idl_sort                           BDB_SYMBOL(idl_sort)
-#define bdb_idl_append                         BDB_SYMBOL(idl_append)
+#define bdb_idl_merge                          BDB_SYMBOL(idl_merge)
 #define bdb_idl_append_one                     BDB_SYMBOL(idl_append_one)
 
 #define bdb_idl_fetch_key                      BDB_SYMBOL(idl_fetch_key)
@@ -418,7 +413,7 @@ void bdb_cache_return_entry_rw( DB_ENV *env, Cache *cache, Entry *e,
 #if 0
 void bdb_unlocked_cache_return_entry_rw( Cache *cache, Entry *e, int rw );
 #else
-#define        bdb_unlocked_cache_return_entry_rw( a, b, c )
+#define        bdb_unlocked_cache_return_entry_rw( a, b, c )   ((void)0)
 #endif
 #define bdb_unlocked_cache_return_entry_r( c, e ) \
        bdb_unlocked_cache_return_entry_rw((c), (e), 0)
@@ -450,11 +445,11 @@ int bdb_cache_add(
        u_int32_t locker
 );
 int bdb_cache_modrdn(
+       struct bdb_info *bdb,
        Entry   *e,
        struct berval *nrdn,
        Entry   *new,
        EntryInfo *ein,
-       DB_ENV *env,
        u_int32_t locker,
        DB_LOCK *lock
 );
@@ -527,9 +522,9 @@ int bdb_cache_entry_db_unlock(
 #ifdef BDB_REUSE_LOCKERS
 
 #define bdb_locker_id                          BDB_SYMBOL(locker_id)
-int bdb_locker_id( Operation *op, DB_ENV *env, int *locker );
+int bdb_locker_id( Operation *op, DB_ENV *env, u_int32_t *locker );
 
-#define        LOCK_ID_FREE(env, locker)
+#define        LOCK_ID_FREE(env, locker)       ((void)0)
 #define        LOCK_ID(env, locker)    bdb_locker_id(op, env, locker)
 
 #else