dbwrap: dbwrap_hash_size().

[kai/samba-autobuild/.git] / lib / dbwrap / dbwrap.h

diff --git a/lib/dbwrap/dbwrap.h b/lib/dbwrap/dbwrap.h
index d0df1e5afa3b7f8858e42306b1ec5b7c4a9c2381..30c24fedb3c85c7b158563532f2eb0b8cfbb885b 100644 (file)
--- a/lib/dbwrap/dbwrap.h
+++ b/lib/dbwrap/dbwrap.h
@@ -20,7 +20,7 @@
 #ifndef __DBWRAP_H__
 #define __DBWRAP_H__
 
 #ifndef __DBWRAP_H__
 #define __DBWRAP_H__
 

-#include "tdb_compat.h"
+#include "tdb.h"

 
 struct db_record;
 struct db_context;
 
 struct db_record;
 struct db_context;


@@ -43,6 +43,11 @@ struct db_record *dbwrap_fetch_locked(struct db_context *db,
 struct db_record *dbwrap_try_fetch_locked(struct db_context *db,
                                          TALLOC_CTX *mem_ctx,
                                          TDB_DATA key);
 struct db_record *dbwrap_try_fetch_locked(struct db_context *db,
                                          TALLOC_CTX *mem_ctx,
                                          TDB_DATA key);

+struct db_record *dbwrap_fetch_locked_timeout(struct db_context *db,
+                                             TALLOC_CTX *mem_ctx,
+                                             TDB_DATA key,
+                                             unsigned int timeout);
+

 struct db_context *dbwrap_record_get_db(struct db_record *rec);
 void dbwrap_set_stored_callback(
        struct db_context *db,
 struct db_context *dbwrap_record_get_db(struct db_record *rec);
 void dbwrap_set_stored_callback(
        struct db_context *db,


@@ -69,13 +74,16 @@ NTSTATUS dbwrap_parse_record(struct db_context *db, TDB_DATA key,
                                            void *private_data),
                             void *private_data);
 int dbwrap_wipe(struct db_context *db);
                                            void *private_data),
                             void *private_data);
 int dbwrap_wipe(struct db_context *db);

+int dbwrap_check(struct db_context *db);

 int dbwrap_get_seqnum(struct db_context *db);
 int dbwrap_get_seqnum(struct db_context *db);

-int dbwrap_get_flags(struct db_context *db);
+/* Returns 0 if unknown. */
+int dbwrap_hash_size(struct db_context *db);

 int dbwrap_transaction_start(struct db_context *db);
 int dbwrap_transaction_start(struct db_context *db);

+NTSTATUS dbwrap_transaction_start_nonblock(struct db_context *db);

 int dbwrap_transaction_commit(struct db_context *db);
 int dbwrap_transaction_cancel(struct db_context *db);
 void dbwrap_db_id(struct db_context *db, const uint8_t **id, size_t *idlen);
 int dbwrap_transaction_commit(struct db_context *db);
 int dbwrap_transaction_cancel(struct db_context *db);
 void dbwrap_db_id(struct db_context *db, const uint8_t **id, size_t *idlen);

-
+const char *dbwrap_name(struct db_context *db);

 
 /* The following definitions come from lib/dbwrap_util.c  */
 
 
 /* The following definitions come from lib/dbwrap_util.c  */
 


@@ -93,25 +101,31 @@ NTSTATUS dbwrap_fetch_uint32_bystring(struct db_context *db,
                                      const char *keystr, uint32_t *val);
 NTSTATUS dbwrap_store_uint32_bystring(struct db_context *db,
                                      const char *keystr, uint32_t v);
                                      const char *keystr, uint32_t *val);
 NTSTATUS dbwrap_store_uint32_bystring(struct db_context *db,
                                      const char *keystr, uint32_t v);

-NTSTATUS dbwrap_change_uint32_atomic(struct db_context *db, const char *keystr,
-                                    uint32_t *oldval, uint32_t change_val);
-NTSTATUS dbwrap_trans_change_uint32_atomic(struct db_context *db,
-                                          const char *keystr,
-                                          uint32_t *oldval,
-                                          uint32_t change_val);
-NTSTATUS dbwrap_change_int32_atomic(struct db_context *db, const char *keystr,
-                                   int32_t *oldval, int32_t change_val);
-NTSTATUS dbwrap_trans_change_int32_atomic(struct db_context *db,
-                                         const char *keystr,
-                                         int32_t *oldval,
-                                         int32_t change_val);
+NTSTATUS dbwrap_change_uint32_atomic_bystring(struct db_context *db,
+                                             const char *keystr,
+                                             uint32_t *oldval,
+                                             uint32_t change_val);
+NTSTATUS dbwrap_trans_change_uint32_atomic_bystring(struct db_context *db,
+                                                   const char *keystr,
+                                                   uint32_t *oldval,
+                                                   uint32_t change_val);
+NTSTATUS dbwrap_change_int32_atomic_bystring(struct db_context *db,
+                                            const char *keystr,
+                                            int32_t *oldval,
+                                            int32_t change_val);
+NTSTATUS dbwrap_trans_change_int32_atomic_bystring(struct db_context *db,
+                                                  const char *keystr,
+                                                  int32_t *oldval,
+                                                  int32_t change_val);

 NTSTATUS dbwrap_trans_store(struct db_context *db, TDB_DATA key, TDB_DATA dbuf,
                            int flag);
 NTSTATUS dbwrap_trans_delete(struct db_context *db, TDB_DATA key);
 NTSTATUS dbwrap_trans_store(struct db_context *db, TDB_DATA key, TDB_DATA dbuf,
                            int flag);
 NTSTATUS dbwrap_trans_delete(struct db_context *db, TDB_DATA key);

-NTSTATUS dbwrap_trans_store_int32(struct db_context *db, const char *keystr,
-                                 int32_t v);
-NTSTATUS dbwrap_trans_store_uint32(struct db_context *db, const char *keystr,
-                                  uint32_t v);
+NTSTATUS dbwrap_trans_store_int32_bystring(struct db_context *db,
+                                          const char *keystr,
+                                          int32_t v);
+NTSTATUS dbwrap_trans_store_uint32_bystring(struct db_context *db,
+                                           const char *keystr,
+                                           uint32_t v);

 NTSTATUS dbwrap_trans_store_bystring(struct db_context *db, const char *key,
                                     TDB_DATA data, int flags);
 NTSTATUS dbwrap_trans_delete_bystring(struct db_context *db, const char *key);
 NTSTATUS dbwrap_trans_store_bystring(struct db_context *db, const char *key,
                                     TDB_DATA data, int flags);
 NTSTATUS dbwrap_trans_delete_bystring(struct db_context *db, const char *key);


@@ -128,4 +142,18 @@ NTSTATUS dbwrap_store_bystring_upper(struct db_context *db, const char *key,
 NTSTATUS dbwrap_fetch_bystring_upper(struct db_context *db, TALLOC_CTX *mem_ctx,
                                     const char *key, TDB_DATA *value);
 
 NTSTATUS dbwrap_fetch_bystring_upper(struct db_context *db, TALLOC_CTX *mem_ctx,
                                     const char *key, TDB_DATA *value);
 

+/**
+ * This opens an ntdb or tdb file: you can hand it a .ntdb or .tdb extension
+ * and it will decide (based on parameter settings, or else what exists) which
+ * to use.
+ *
+ * For backwards compatibility, it takes tdb-style open flags, not ntdb!
+ */
+struct db_context *dbwrap_local_open(TALLOC_CTX *mem_ctx,
+                                    struct loadparm_context *lp_ctx,
+                                    const char *name,
+                                    int hash_size, int tdb_flags,
+                                    int open_flags, mode_t mode,
+                                    enum dbwrap_lock_order lock_order);
+

 #endif /* __DBWRAP_H__ */
 #endif /* __DBWRAP_H__ */