X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb1_tdb.c;h=0a4f8b5503a7841fe0420e523a27a3d3ae42fd31;hb=ceb2f3eacbad917ee990afbc3dd800bfb0607887;hp=400c9866e88ed32f7c675e445d6f5061e4b6fdcb;hpb=bbeb528e74c0e234e1f724ac8d54be404cfc6f9a;p=ccan

diff --git a/ccan/tdb2/tdb1_tdb.c b/ccan/tdb2/tdb1_tdb.c
index 400c9866..0a4f8b55 100644
--- a/ccan/tdb2/tdb1_tdb.c
+++ b/ccan/tdb2/tdb1_tdb.c
@@ -26,6 +26,7 @@
 */
 
 #include "tdb1_private.h"
+#include <assert.h>
 
 TDB_DATA tdb1_null;
 
@@ -200,11 +201,12 @@ static TDB_DATA _tdb1_fetch(struct tdb_context *tdb, TDB_DATA key)
 	return ret;
 }
 
-TDB_DATA tdb1_fetch(struct tdb_context *tdb, TDB_DATA key)
+enum TDB_ERROR tdb1_fetch(struct tdb_context *tdb, TDB_DATA key, TDB_DATA *data)
 {
-	TDB_DATA ret = _tdb1_fetch(tdb, key);
-
-	return ret;
+	*data = _tdb1_fetch(tdb, key);
+	if (data->dptr == NULL)
+		return tdb->last_error;
+	return TDB_SUCCESS;
 }
 
 /*
@@ -273,6 +275,7 @@ int tdb1_exists(struct tdb_context *tdb, TDB_DATA key)
 	uint32_t hash = tdb_hash(tdb, key.dptr, key.dsize);
 	int ret;
 
+	assert(tdb->flags & TDB_VERSION1);
 	ret = tdb1_exists_hash(tdb, key, hash);
 	return ret;
 }
@@ -432,6 +435,7 @@ int tdb1_delete(struct tdb_context *tdb, TDB_DATA key)
 	uint32_t hash = tdb_hash(tdb, key.dptr, key.dsize);
 	int ret;
 
+	assert(tdb->flags & TDB_VERSION1);
 	ret = tdb1_delete_hash(tdb, key, hash);
 	return ret;
 }
@@ -601,6 +605,8 @@ int tdb1_store(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, int flag)
 	uint32_t hash;
 	int ret;
 
+	assert(tdb->flags & TDB_VERSION1);
+
 	if ((tdb->flags & TDB_RDONLY) || tdb->tdb1.traverse_read) {
 		tdb->last_error = TDB_ERR_RDONLY;
 		return -1;
@@ -623,6 +629,8 @@ int tdb1_append(struct tdb_context *tdb, TDB_DATA key, TDB_DATA new_dbuf)
 	TDB_DATA dbuf;
 	int ret = -1;
 
+	assert(tdb->flags & TDB_VERSION1);
+
 	/* find which hash bucket it is in */
 	hash = tdb_hash(tdb, key.dptr, key.dsize);
 	if (tdb1_lock(tdb, TDB1_BUCKET(hash), F_WRLCK) == -1)
@@ -681,11 +689,6 @@ int tdb1_get_seqnum(struct tdb_context *tdb)
 	return seqnum;
 }
 
-int tdb1_hash_size(struct tdb_context *tdb)
-{
-	return tdb->tdb1.header.hash_size;
-}
-
 
 /*
   add a region of the file to the freelist. Length is the size of the region in bytes,
@@ -729,7 +732,7 @@ int tdb1_wipe_all(struct tdb_context *tdb)
 	tdb1_off_t recovery_head;
 	tdb1_len_t recovery_size = 0;
 
-	if (tdb1_lockall(tdb) != 0) {
+	if (tdb_lockall(tdb) != TDB_SUCCESS) {
 		return -1;
 	}
 
@@ -798,16 +801,11 @@ int tdb1_wipe_all(struct tdb_context *tdb)
 		}
 	}
 
-	if (tdb1_unlockall(tdb) != 0) {
-		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
-			   "tdb1_wipe_all: failed to unlock");
-		goto failed;
-	}
-
+	tdb_unlockall(tdb);
 	return 0;
 
 failed:
-	tdb1_unlockall(tdb);
+	tdb_unlockall(tdb);
 	return -1;
 }
 
@@ -836,6 +834,11 @@ int tdb1_repack(struct tdb_context *tdb)
 {
 	struct tdb_context *tmp_db;
 	struct traverse_state state;
+	union tdb_attribute hsize;
+
+	hsize.base.attr = TDB_ATTRIBUTE_TDB1_HASHSIZE;
+	hsize.base.next = NULL;
+	hsize.tdb1_hashsize.hsize = tdb->tdb1.header.hash_size;
 
 	if (tdb1_transaction_start(tdb) != 0) {
 		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
@@ -843,7 +846,7 @@ int tdb1_repack(struct tdb_context *tdb)
 		return -1;
 	}
 
-	tmp_db = tdb1_open("tmpdb", tdb1_hash_size(tdb), TDB_INTERNAL, O_RDWR|O_CREAT, 0);
+	tmp_db = tdb_open("tmpdb", TDB_INTERNAL, O_RDWR|O_CREAT, 0, &hsize);
 	if (tmp_db == NULL) {
 		tdb->last_error = tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
 					__location__ " Failed to create tmp_db");
@@ -854,11 +857,11 @@ int tdb1_repack(struct tdb_context *tdb)
 	state.error = TDB_SUCCESS;
 	state.dest_db = tmp_db;
 
-	if (tdb1_traverse_read(tdb, repack_traverse, &state) == -1) {
+	if (tdb1_traverse(tdb, repack_traverse, &state) == -1) {
 		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
 			   __location__ " Failed to traverse copying out");
 		tdb1_transaction_cancel(tdb);
-		tdb1_close(tmp_db);
+		tdb_close(tmp_db);
 		return -1;
 	}
 
@@ -866,7 +869,7 @@ int tdb1_repack(struct tdb_context *tdb)
 		tdb->last_error = tdb_logerr(tdb, state.error, TDB_LOG_ERROR,
 					__location__ " Error during traversal");
 		tdb1_transaction_cancel(tdb);
-		tdb1_close(tmp_db);
+		tdb_close(tmp_db);
 		return -1;
 	}
 
@@ -874,18 +877,18 @@ int tdb1_repack(struct tdb_context *tdb)
 		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
 			   __location__ " Failed to wipe database\n");
 		tdb1_transaction_cancel(tdb);
-		tdb1_close(tmp_db);
+		tdb_close(tmp_db);
 		return -1;
 	}
 
 	state.error = TDB_SUCCESS;
 	state.dest_db = tdb;
 
-	if (tdb1_traverse_read(tmp_db, repack_traverse, &state) == -1) {
+	if (tdb1_traverse(tmp_db, repack_traverse, &state) == -1) {
 		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
 			   __location__ " Failed to traverse copying back");
 		tdb1_transaction_cancel(tdb);
-		tdb1_close(tmp_db);
+		tdb_close(tmp_db);
 		return -1;
 	}
 
@@ -893,11 +896,11 @@ int tdb1_repack(struct tdb_context *tdb)
 		tdb->last_error = tdb_logerr(tdb, state.error, TDB_LOG_ERROR,
 					__location__ " Error during second traversal");
 		tdb1_transaction_cancel(tdb);
-		tdb1_close(tmp_db);
+		tdb_close(tmp_db);
 		return -1;
 	}
 
-	tdb1_close(tmp_db);
+	tdb_close(tmp_db);
 
 	if (tdb1_transaction_commit(tdb) != 0) {
 		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,