Tweak mt_dbxs array

[openldap] / libraries / libmdb / mdb.h

diff --git a/libraries/libmdb/mdb.h b/libraries/libmdb/mdb.h
index 518fba96a30f2d87f3906e2a19c95b63967ee451..613311a3d9cfd13fcc91dcf2ab7ea0c270db840c 100644 (file)
--- a/libraries/libmdb/mdb.h
+++ b/libraries/libmdb/mdb.h
@@ -5,14 +5,14 @@
 
 struct MDB_cursor;
 struct MDB_txn;
-struct MDB_db;
 struct MDB_env;
 
 typedef struct MDB_cursor MDB_cursor;
 typedef struct MDB_txn MDB_txn;
-typedef struct MDB_db MDB_db;
 typedef struct MDB_env MDB_env;
 
+typedef unsigned int   MDB_dbi;
+
 typedef struct MDB_val {
        void            *mv_data;
        size_t           mv_size;
@@ -38,26 +38,26 @@ typedef enum MDB_cursor_op {                /* cursor operations */
 
 /* DB flags */
 #define MDB_REVERSEKEY 0x02            /* use reverse string keys */
+#define MDB_DUPSORT            0x04            /* use sorted duplicates */
 #define MDB_NOSYNC             0x10000         /* don't fsync after commit */
 #define MDB_RDONLY             0x20000         /* read only */
+#define MDB_CREATE             0x40000         /* create if not present */
 
 /* environment flags */
 #define MDB_FIXEDMAP   0x01            /* mmap at a fixed address */
 
 typedef struct MDB_stat {
-       time_t                  ms_created_at;
        unsigned int    ms_psize;
        unsigned int    ms_depth;
        unsigned long   ms_branch_pages;
        unsigned long   ms_leaf_pages;
        unsigned long   ms_overflow_pages;
-       unsigned long   ms_revisions;
        unsigned long   ms_entries;
 } MDB_stat;
 
 int  mdbenv_create(MDB_env **env);
 int  mdbenv_open(MDB_env *env, const char *path, unsigned int flags, mode_t mode);
-int  mdbenv_stat(MDB_env *env, MDB_stat **stat);
+int  mdbenv_stat(MDB_env *env, MDB_stat *stat);
 void mdbenv_close(MDB_env *env);
 int  mdbenv_get_flags(MDB_env *env, unsigned int *flags);
 int  mdbenv_get_path(MDB_env *env, const char **path);
@@ -65,26 +65,29 @@ int  mdbenv_set_mapsize(MDB_env *env, size_t size);
 int  mdbenv_set_maxreaders(MDB_env *env, int readers);
 int  mdbenv_get_maxreaders(MDB_env *env, int *readers);
 int  mdbenv_sync(MDB_env *env);
-int  mdbenv_compact(MDB_env *env);
 
 int  mdb_txn_begin(MDB_env *env, int rdonly, MDB_txn **txn);
 int  mdb_txn_commit(MDB_txn *txn);
 void mdb_txn_abort(MDB_txn *txn);
 
-int  mdb_open(MDB_env *env, MDB_txn *txn, const char *name, unsigned int flags, MDB_db **db);
-int  mdb_stat(MDB_db *db, MDB_stat **stat);
-void mdb_close(MDB_db *db);
+int  mdb_open(MDB_txn *txn, const char *name, unsigned int flags, MDB_dbi *dbi);
+int  mdb_stat(MDB_txn *txn, MDB_dbi dbi, MDB_stat *stat);
+void mdb_close(MDB_txn *txn, MDB_dbi dbi);
+
+int  mdb_set_compare(MDB_txn *txn, MDB_dbi dbi, MDB_cmp_func *cmp);
+int  mdb_set_dupsort(MDB_txn *txn, MDB_dbi dbi, MDB_cmp_func *cmp);
+int  mdb_set_relfunc(MDB_txn *txn, MDB_dbi dbi, MDB_rel_func *rel);
 
-int  mdb_get(MDB_db *db, MDB_txn *txn, MDB_val *key, MDB_val *data);
-int  mdb_put(MDB_db *db, MDB_txn *txn, MDB_val *key, MDB_val *data,
+int  mdb_get(MDB_txn *txn, MDB_dbi dbi, MDB_val *key, MDB_val *data);
+int  mdb_put(MDB_txn *txn, MDB_dbi dbi, MDB_val *key, MDB_val *data,
                            unsigned int flags);
-int  mdb_del(MDB_db *db, MDB_txn *txn, MDB_val *key, MDB_val *data);
+int  mdb_del(MDB_txn *txn, MDB_dbi dbi, MDB_val *key, MDB_val *data);
 
-int  mdb_cursor_open(MDB_db *db, MDB_txn *txn, MDB_cursor **cursor);
+int  mdb_cursor_open(MDB_txn *txn, MDB_dbi dbi, MDB_cursor **cursor);
 void mdb_cursor_close(MDB_cursor *cursor);
 int  mdb_cursor_get(MDB_cursor *cursor, MDB_val *key, MDB_val *data,
                            MDB_cursor_op op);
 
-int  mdb_cmp(MDB_db *db, const MDB_val *a, const MDB_val *b);
+int  mdb_cmp(MDB_txn *txn, MDB_dbi dbi, const MDB_val *a, const MDB_val *b);
 
 #endif /* _MDB_H_ */