X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-04-basichash.c;h=b3a5d1c5bd0b8d2b1d1ffe6d03cee05e429ec110;hp=db895b6c6fca3c850bb927e13f9d0cc7d2b45935;hb=a97da100b00206544c7a68593b64a49f2b854f7e;hpb=bee60dd0ffe0b1b5821061b4384000c4246f2051

diff --git a/ccan/tdb2/test/run-04-basichash.c b/ccan/tdb2/test/run-04-basichash.c
index db895b6c..b3a5d1c5 100644
--- a/ccan/tdb2/test/run-04-basichash.c
+++ b/ccan/tdb2/test/run-04-basichash.c
@@ -1,8 +1,10 @@
 #include <ccan/tdb2/tdb.c>
+#include <ccan/tdb2/open.c>
 #include <ccan/tdb2/free.c>
 #include <ccan/tdb2/lock.c>
 #include <ccan/tdb2/io.c>
 #include <ccan/tdb2/hash.c>
+#include <ccan/tdb2/transaction.c>
 #include <ccan/tdb2/check.c>
 #include <ccan/tap/tap.h>
 #include "logging.h"
@@ -58,23 +60,24 @@ int main(int argc, char *argv[])
 		ok1(h.hlock_start == 0);
 		ok1(h.hlock_range == 
 		    1ULL << (64-(TDB_TOPLEVEL_HASH_BITS-TDB_HASH_GROUP_BITS)));
-		ok1((tdb->flags & TDB_NOLOCK) || tdb->num_lockrecs == 1);
+		ok1((tdb->flags & TDB_NOLOCK) || tdb->file->num_lockrecs == 1);
 		ok1((tdb->flags & TDB_NOLOCK)
-		    || tdb->lockrecs[0].off == TDB_HASH_LOCK_START);
+		    || tdb->file->lockrecs[0].off == TDB_HASH_LOCK_START);
 		/* FIXME: Check lock length */
 
 		/* Allocate a new record. */
-		new_off = alloc(tdb, key.dsize, dbuf.dsize, h.h, false);
-		ok1(new_off != TDB_OFF_ERR);
+		new_off = alloc(tdb, key.dsize, dbuf.dsize, h.h,
+				TDB_USED_MAGIC, false);
+		ok1(!TDB_OFF_IS_ERR(new_off));
 
 		/* We should be able to add it now. */
 		ok1(add_to_hash(tdb, &h, new_off) == 0);
 
 		/* Make sure we fill it in for later finding. */
 		off = new_off + sizeof(struct tdb_used_record);
-		ok1(!tdb->methods->write(tdb, off, key.dptr, key.dsize));
+		ok1(!tdb->methods->twrite(tdb, off, key.dptr, key.dsize));
 		off += key.dsize;
-		ok1(!tdb->methods->write(tdb, off, dbuf.dptr, dbuf.dsize));
+		ok1(!tdb->methods->twrite(tdb, off, dbuf.dptr, dbuf.dsize));
 
 		/* We should be able to unlock that OK. */
 		ok1(tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range,
@@ -98,9 +101,9 @@ int main(int argc, char *argv[])
 		ok1(h.hlock_start == 0);
 		ok1(h.hlock_range == 
 		    1ULL << (64-(TDB_TOPLEVEL_HASH_BITS-TDB_HASH_GROUP_BITS)));
-		ok1((tdb->flags & TDB_NOLOCK) || tdb->num_lockrecs == 1);
+		ok1((tdb->flags & TDB_NOLOCK) || tdb->file->num_lockrecs == 1);
 		ok1((tdb->flags & TDB_NOLOCK)
-		    || tdb->lockrecs[0].off == TDB_HASH_LOCK_START);
+		    || tdb->file->lockrecs[0].off == TDB_HASH_LOCK_START);
 		/* FIXME: Check lock length */
 
 		ok1(tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range,
@@ -124,9 +127,9 @@ int main(int argc, char *argv[])
 		ok1(h.hlock_start == 0);
 		ok1(h.hlock_range == 
 		    1ULL << (64-(TDB_TOPLEVEL_HASH_BITS-TDB_HASH_GROUP_BITS)));
-		ok1((tdb->flags & TDB_NOLOCK) || tdb->num_lockrecs == 1);
+		ok1((tdb->flags & TDB_NOLOCK) || tdb->file->num_lockrecs == 1);
 		ok1((tdb->flags & TDB_NOLOCK)
-		    || tdb->lockrecs[0].off == TDB_HASH_LOCK_START);
+		    || tdb->file->lockrecs[0].off == TDB_HASH_LOCK_START);
 		/* FIXME: Check lock length */
 
 		/* Make it expand 0'th bucket. */
@@ -162,14 +165,14 @@ int main(int argc, char *argv[])
 		ok1(h.hlock_start == 0);
 		ok1(h.hlock_range == 
 		    1ULL << (64-(TDB_TOPLEVEL_HASH_BITS-TDB_HASH_GROUP_BITS)));
-		ok1((tdb->flags & TDB_NOLOCK) || tdb->num_lockrecs == 1);
+		ok1((tdb->flags & TDB_NOLOCK) || tdb->file->num_lockrecs == 1);
 		ok1((tdb->flags & TDB_NOLOCK)
-		    || tdb->lockrecs[0].off == TDB_HASH_LOCK_START);
+		    || tdb->file->lockrecs[0].off == TDB_HASH_LOCK_START);
 		/* FIXME: Check lock length */
 
 		/* Simple delete should work. */
 		ok1(delete_from_hash(tdb, &h) == 0);
-		ok1(add_free_record(tdb, rec_zone_bits(&rec), new_off,
+		ok1(add_free_record(tdb, new_off,
 				    sizeof(struct tdb_used_record)
 				    + rec_key_length(&rec)
 				    + rec_data_length(&rec)
@@ -193,9 +196,9 @@ int main(int argc, char *argv[])
 		ok1(h.hlock_start == 0);
 		ok1(h.hlock_range == 
 		    1ULL << (64-(TDB_TOPLEVEL_HASH_BITS-TDB_HASH_GROUP_BITS)));
-		ok1((tdb->flags & TDB_NOLOCK) || tdb->num_lockrecs == 1);
+		ok1((tdb->flags & TDB_NOLOCK) || tdb->file->num_lockrecs == 1);
 		ok1((tdb->flags & TDB_NOLOCK)
-		    || tdb->lockrecs[0].off == TDB_HASH_LOCK_START);
+		    || tdb->file->lockrecs[0].off == TDB_HASH_LOCK_START);
 		/* FIXME: Check lock length */
 
 		ok1(expand_group(tdb, &h) == 0);
@@ -224,15 +227,16 @@ int main(int argc, char *argv[])
 
 		/* We should be able to add it now. */
 		/* Allocate a new record. */
-		new_off = alloc(tdb, key.dsize, dbuf.dsize, h.h, false);
-		ok1(new_off != TDB_OFF_ERR);
+		new_off = alloc(tdb, key.dsize, dbuf.dsize, h.h,
+				TDB_USED_MAGIC, false);
+		ok1(!TDB_OFF_IS_ERR(new_off));
 		ok1(add_to_hash(tdb, &h, new_off) == 0);
 
 		/* Make sure we fill it in for later finding. */
 		off = new_off + sizeof(struct tdb_used_record);
-		ok1(!tdb->methods->write(tdb, off, key.dptr, key.dsize));
+		ok1(!tdb->methods->twrite(tdb, off, key.dptr, key.dsize));
 		off += key.dsize;
-		ok1(!tdb->methods->write(tdb, off, dbuf.dptr, dbuf.dsize));
+		ok1(!tdb->methods->twrite(tdb, off, dbuf.dptr, dbuf.dsize));
 
 		/* We should be able to unlock that OK. */
 		ok1(tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range,