Add SLAP_MR_ORDERED_INDEX - support for inequality indexing. Currently

[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 8561e1ca5d9f205b829593057ccd31e22ba6071a..6d1c507d8332e993a6e5658fb8567b314a4058c1 100644 (file)
--- a/servers/slapd/back-bdb/proto-bdb.h
+++ b/servers/slapd/back-bdb/proto-bdb.h
@@ -203,7 +203,6 @@ BI_entry_get_rw bdb_entry_get;
 /*
  * idl.c
  */
-#ifdef SLAP_IDL_CACHE
 
 #define bdb_idl_cache_get                      BDB_SYMBOL(idl_cache_get)
 #define bdb_idl_cache_put                      BDB_SYMBOL(idl_cache_put)
@@ -228,7 +227,6 @@ bdb_idl_cache_del(
        struct bdb_info *bdb,
        DB              *db,
        DBT             *key );
-#endif
 
 #define bdb_idl_first                          BDB_SYMBOL(idl_first)
 #define bdb_idl_next                           BDB_SYMBOL(idl_next)
@@ -244,11 +242,13 @@ bdb_idl_cache_del(
 unsigned bdb_idl_search( ID *ids, ID id );
 
 int bdb_idl_fetch_key(
-       BackendDB *be,
-       DB *db,
-       DB_TXN *txn,
-       DBT *key,
-       ID *ids );
+       BackendDB       *be,
+       DB                      *db,
+       DB_TXN          *tid,
+       DBT                     *key,
+       ID                      *ids,
+       DBC                     **saved_cursor,
+       int                     get_flag );
 
 int bdb_idl_insert( ID *ids, ID id );
 
@@ -345,7 +345,9 @@ bdb_key_read(
        DB *db,
        DB_TXN *txn,
     struct berval *k,
-       ID *ids );
+       ID *ids,
+    DBC **saved_cursor,
+        int get_flags );
 
 extern int
 bdb_key_change(
@@ -537,10 +539,19 @@ int bdb_locker_id( Operation *op, DB_ENV *env, int *locker );
 #define bdb_abandon                                    BDB_SYMBOL(abandon)
 #define bdb_cancel                                     BDB_SYMBOL(cancel)
 #define bdb_do_search                          BDB_SYMBOL(do_search)
+#define bdb_psearch                            BDB_SYMBOL(psearch)
 
 BI_op_abandon bdb_abandon;
 BI_op_cancel bdb_cancel;
 
+int bdb_psearch(
+       Operation       *op,
+       SlapReply       *rs,
+       Operation       *ps_op,
+       Entry           *entry,
+       int             psearch_type
+);
+
 int bdb_do_search(
        Operation       *op,
        SlapReply       *rs,
@@ -548,7 +559,6 @@ int bdb_do_search(
        Entry           *entry,
        int             psearch_type
 );
-#define        bdb_psearch(op, rs, sop, e, ps_type)    bdb_do_search(op, rs, sop, e, ps_type)
 
 /*
  * trans.c