Delete extranous assert()

[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 036129594942244e19e958044df23eb5aaad04ae..cdea9803e190411fc29f2d066bf0051eca884bc4 100644 (file)
--- a/servers/slapd/back-bdb/proto-bdb.h
+++ b/servers/slapd/back-bdb/proto-bdb.h
@@ -1,6 +1,6 @@
 /* $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,7 +15,7 @@ LDAP_BEGIN_DECL
 Entry *bdb_deref_internal_r LDAP_P((
        BackendDB *be,
        Entry *e,
-       const char *dn,
+       struct berval *dn,
        int *err,
        Entry **matched,
        const char **text ));
@@ -29,9 +29,9 @@ Entry *bdb_deref_internal_r LDAP_P((
  * attr.c
  */
 
-void bdb_attr_mask LDAP_P(( struct bdb_info *bdb,
-       const char *desc,
-       slap_mask_t *indexmask ));
+void bdb_attr_mask( struct bdb_info *bdb,
+       AttributeDescription *desc,
+       slap_mask_t *indexmask );
 
 int bdb_attr_index_config LDAP_P(( struct bdb_info *bdb,
        const char *fname, int lineno,
@@ -39,11 +39,28 @@ int bdb_attr_index_config LDAP_P(( struct bdb_info *bdb,
 
 void bdb_attr_index_destroy LDAP_P(( Avlnode *tree ));
 
+/*
+ * attribute.c
+ */
+
+BI_acl_attribute bdb_attribute;
+
+/*
+ * dbcache.c
+ */
+int
+bdb_db_cache(
+    Backend    *be,
+    const char *name,
+       DB **db );
+
 /*
  * dn2entry.c
  */
-int bdb_dn2entry LDAP_P(( BackendDB *be, DB_TXN *tid,
-       const char *dn, Entry **e, Entry **matched, int flags ));
+int bdb_dn2entry_rw LDAP_P(( BackendDB *be, DB_TXN *tid,
+       struct berval *dn, Entry **e, Entry **matched, int flags, int rw ));
+#define bdb_dn2entry_r(be, tid, dn, e, m, f) bdb_dn2entry_rw((be), (tid), (dn), (e), (m), (f), 0)
+#define bdb_dn2entry_w(be, tid, dn, e, m, f) bdb_dn2entry_rw((be), (tid), (dn), (e), (m), (f), 1)
 
 /*
  * dn2id.c
@@ -51,44 +68,45 @@ int bdb_dn2entry LDAP_P(( BackendDB *be, DB_TXN *tid,
 int bdb_dn2id(
        BackendDB *be,
        DB_TXN *tid,
-       const char *dn,
+       struct berval *dn,
        ID *id );
 
 int bdb_dn2id_matched(
        BackendDB *be,
        DB_TXN *tid,
-       const char *dn,
+       struct berval *dn,
        ID *id,
-       char **matchedDN );
+       ID *id2 );
 
 int bdb_dn2id_add(
        BackendDB *be,
        DB_TXN *tid,
-       const char *dn,
-       ID id );
+       struct berval *pdn,
+       Entry *e );
 
 int bdb_dn2id_delete(
        BackendDB *be,
        DB_TXN *tid,
-       const char *dn,
-       ID id );
+       char *pdn,
+       Entry *e );
 
 int bdb_dn2id_children(
        BackendDB *be,
        DB_TXN *tid,
-       const char *dn );
+       struct berval *dn );
 
 int
 bdb_dn2idl(
        BackendDB       *be,
-       const char      *dn,
+       struct berval   *dn,
        int prefix,
        ID *ids );
 
 /*
  * entry.c
  */
-int bdb_entry_return( BackendDB *be, Entry *e );
+int bdb_entry_return( Entry *e );
+BI_entry_release_rw bdb_entry_release;
 
 /*
  * error.c
@@ -100,12 +118,19 @@ void bdb_errcall( const char *pfx, char * msg );
  */
 int bdb_filter_candidates(
        Backend *be,
-       ID *range,
        Filter  *f,
-       ID *ids );
+       ID *ids,
+       ID *tmp,
+       ID *stack );
 
 /*
- * id2entry
+ * group.c
+ */
+
+BI_acl_group bdb_group;
+
+/*
+ * id2entry.c
  */
 int bdb_id2entry_add(
        BackendDB *be,
@@ -120,19 +145,36 @@ int bdb_id2entry_update(
 int bdb_id2entry_delete(
        BackendDB *be,
        DB_TXN *tid,
-       ID id );
+       Entry *e);
 
-int bdb_id2entry(
+int bdb_id2entry_rw(
        BackendDB *be,
        DB_TXN *tid,
        ID id,
-       Entry **e );
+       Entry **e,
+       int rw );
+#define bdb_id2entry_r(be, tid, id, e)      bdb_id2entry_rw((be), (tid), (id), (e), 0)
+#define bdb_id2entry_w(be, tid, id, e)      bdb_id2entry_rw((be), (tid), (id), (e), 1)
+
+void bdb_entry_free ( Entry *e );
 
 /*
  * idl.c
  */
 unsigned bdb_idl_search( ID *ids, ID id );
 
+int bdb_bt_compare(
+       DB *db,
+       const DBT *a,
+       const DBT *b );
+
+int bdb_idl_fetch_key(
+       BackendDB *be,
+       DB *db,
+       DB_TXN *txn,
+       DBT *key,
+       ID *ids );
+
 int bdb_idl_insert_key(
        BackendDB *be,
        DB *db,
@@ -147,23 +189,23 @@ int bdb_idl_delete_key(
        DBT *key,
        ID id );
 
+#if 0
 int
 bdb_idl_notin(
     ID         *a,
     ID         *b,
        ID      *ids );
+#endif
 
 int
 bdb_idl_intersection(
        ID *a,
-       ID *b,
-       ID *ids );
+       ID *b );
 
 int
 bdb_idl_union(
        ID *a,
-       ID *b,
-       ID *ids );
+       ID *b );
 
 ID bdb_idl_first( ID *ids, ID *cursor );
 ID bdb_idl_next( ID *ids, ID *cursor );
@@ -173,20 +215,25 @@ ID bdb_idl_next( ID *ids, ID *cursor );
  * index.c
  */
 extern int
+bdb_index_is_indexed LDAP_P((
+       Backend *be,
+       AttributeDescription *desc ));
+
+extern int
 bdb_index_param LDAP_P((
        Backend *be,
        AttributeDescription *desc,
        int ftype,
-       char **dbname,
+       DB **db,
        slap_mask_t *mask,
-       struct berval **prefix ));
+       struct berval *prefix ));
 
 extern int
 bdb_index_values LDAP_P((
        Backend *be,
        DB_TXN *txn,
        AttributeDescription *desc,
-       struct berval **vals,
+       BerVarray vals,
        ID id,
        int op ));
 
@@ -198,6 +245,11 @@ int bdb_index_entry LDAP_P(( Backend *be, DB_TXN *t,
 #define bdb_index_entry_del(be,t,e,ap) \
        bdb_index_entry((be),(t),SLAP_INDEX_DELETE_OP,(e),(ap))
 
+/*
+ * init.c
+ */
+extern struct berval bdb_uuid;
+
 /*
  * key.c
  */
@@ -205,8 +257,18 @@ extern int
 bdb_key_read(
     Backend    *be,
        DB *db,
+       DB_TXN *txn,
     struct berval *k,
        ID *ids );
+
+extern int
+bdb_key_change(
+    Backend     *be,
+    DB *db,
+       DB_TXN *txn,
+    struct berval *k,
+    ID id,
+    int        op );
        
 /*
  * nextid.c
@@ -231,29 +293,41 @@ int bdb_modify_internal(
 /*
  * passwd.c
  */
-int
-bdb_exop_passwd(
-       Backend         *be,
-       Connection              *conn,
-       Operation               *op,
-       const char              *reqoid,
-       struct berval   *reqdata,
-       char                    **rspoid,
-       struct berval   **rspdata,
-       LDAPControl             *** rspctrls,
-       const char              **text,
-       struct berval   *** refs );
+BI_op_extended bdb_exop_passwd;
+
 
 /*
- * tools.c
+ * cache.c
  */
-int bdb_tool_entry_open( BackendDB *be, int mode );
-int bdb_tool_entry_close( BackendDB *be );
-ID bdb_tool_entry_next( BackendDB *be );
-Entry* bdb_tool_entry_get( BackendDB *be, ID id );
-ID bdb_tool_entry_put( BackendDB *be, Entry *e );
-int bdb_tool_entry_reindex( BackendDB *be, ID id );
 
+void bdb_cache_entry_commit( Entry *e );
+void bdb_cache_return_entry_rw( Cache *cache, Entry *e, int rw );
+#define bdb_cache_return_entry_r(c, e) bdb_cache_return_entry_rw((c), (e), 0)
+#define bdb_cache_return_entry_w(c, e) bdb_cache_return_entry_rw((c), (e), 1)
+int bdb_cache_add_entry_rw(
+       Cache   *cache,
+       Entry   *e,
+       int     rw
+);
+int bdb_cache_update_entry(
+       Cache   *cache,
+       Entry   *e
+);
+ID bdb_cache_find_entry_ndn2id(
+       Backend *be,
+       Cache   *cache,
+       struct berval   *ndn
+);
+Entry* bdb_cache_find_entry_id(
+       Cache   *cache,
+       ID      id,
+       int     rw
+);
+int bdb_cache_delete_entry(
+       Cache   *cache,
+       Entry   *e
+);
+void bdb_cache_release_all( Cache *cache );
 
 LDAP_END_DECL