X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-13-delete.c;h=3b464d927ef9bd9460db9f6405573b618ff72edc;hp=ae01e38bf721c6c5008f0f27807f7c5313255643;hb=dc9da1e34fe6a9d113fd57e116ebbc6d5bd54819;hpb=5e8b9af5e7fe5f1ccac407873a3b782b8a629782

diff --git a/ccan/tdb2/test/run-13-delete.c b/ccan/tdb2/test/run-13-delete.c
index ae01e38b..3b464d92 100644
--- a/ccan/tdb2/test/run-13-delete.c
+++ b/ccan/tdb2/test/run-13-delete.c
@@ -1,4 +1,5 @@
 #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>
@@ -11,7 +12,7 @@
 /* We rig the hash so adjacent-numbered records always clash. */
 static uint64_t clash(const void *key, size_t len, uint64_t seed, void *priv)
 {
-	return ((uint64_t)*(unsigned int *)key)
+	return ((uint64_t)*(const unsigned int *)key)
 		<< (64 - TDB_TOPLEVEL_HASH_BITS - 1);
 }
 
@@ -26,13 +27,15 @@ static bool store_records(struct tdb_context *tdb)
 {
 	int i;
 	struct tdb_data key = { (unsigned char *)&i, sizeof(i) };
-	struct tdb_data data = { (unsigned char *)&i, sizeof(i) };
+	struct tdb_data d, data = { (unsigned char *)&i, sizeof(i) };
 
 	for (i = 0; i < 1000; i++) {
 		if (tdb_store(tdb, key, data, TDB_REPLACE) != 0)
 			return false;
-		if (tdb_fetch(tdb, key).dsize != data.dsize)
+		tdb_fetch(tdb, key, &d);
+		if (!tdb_deq(d, data))
 			return false;
+		free(d.dptr);
 	}
 	return true;
 }
@@ -41,13 +44,12 @@ static void test_val(struct tdb_context *tdb, uint64_t val)
 {
 	uint64_t v;
 	struct tdb_data key = { (unsigned char *)&v, sizeof(v) };
-	struct tdb_data data = { (unsigned char *)&v, sizeof(v) };
+	struct tdb_data d, data = { (unsigned char *)&v, sizeof(v) };
 
 	/* Insert an entry, then delete it. */
 	v = val;
 	/* Delete should fail. */
-	ok1(tdb_delete(tdb, key) == -1);
-	ok1(tdb_error(tdb) == TDB_ERR_NOEXIST);
+	ok1(tdb_delete(tdb, key) == TDB_ERR_NOEXIST);
 	ok1(tdb_check(tdb, NULL, NULL) == 0);
 
 	/* Insert should succeed. */
@@ -65,9 +67,13 @@ static void test_val(struct tdb_context *tdb, uint64_t val)
 	ok1(tdb_check(tdb, NULL, NULL) == 0);
 
 	/* Can find both? */
-	ok1(tdb_fetch(tdb, key).dsize == data.dsize);
+	ok1(tdb_fetch(tdb, key, &d) == TDB_SUCCESS);
+	ok1(d.dsize == data.dsize);
+	free(d.dptr);
 	v = val;
-	ok1(tdb_fetch(tdb, key).dsize == data.dsize);
+	ok1(tdb_fetch(tdb, key, &d) == TDB_SUCCESS);
+	ok1(d.dsize == data.dsize);
+	free(d.dptr);
 
 	/* Delete second one. */
 	v = val + 1;
@@ -85,7 +91,9 @@ static void test_val(struct tdb_context *tdb, uint64_t val)
 
 	/* Can still find second? */
 	v = val + 1;
-	ok1(tdb_fetch(tdb, key).dsize == data.dsize);
+	ok1(tdb_fetch(tdb, key, &d) == TDB_SUCCESS);
+	ok1(d.dsize == data.dsize);
+	free(d.dptr);
 
 	/* Now, this will be ideally placed. */
 	v = val + 2;
@@ -97,11 +105,17 @@ static void test_val(struct tdb_context *tdb, uint64_t val)
 	ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
 
 	/* We can still find them all, right? */
-	ok1(tdb_fetch(tdb, key).dsize == data.dsize);
+	ok1(tdb_fetch(tdb, key, &d) == TDB_SUCCESS);
+	ok1(d.dsize == data.dsize);
+	free(d.dptr);
 	v = val + 1;
-	ok1(tdb_fetch(tdb, key).dsize == data.dsize);
+	ok1(tdb_fetch(tdb, key, &d) == TDB_SUCCESS);
+	ok1(d.dsize == data.dsize);
+	free(d.dptr);
 	v = val + 2;
-	ok1(tdb_fetch(tdb, key).dsize == data.dsize);
+	ok1(tdb_fetch(tdb, key, &d) == TDB_SUCCESS);
+	ok1(d.dsize == data.dsize);
+	free(d.dptr);
 
 	/* And if we delete val + 1, that val + 2 should not move! */
 	v = val + 1;
@@ -109,9 +123,13 @@ static void test_val(struct tdb_context *tdb, uint64_t val)
 	ok1(tdb_check(tdb, NULL, NULL) == 0);
 
 	v = val;
-	ok1(tdb_fetch(tdb, key).dsize == data.dsize);
+	ok1(tdb_fetch(tdb, key, &d) == TDB_SUCCESS);
+	ok1(d.dsize == data.dsize);
+	free(d.dptr);
 	v = val + 2;
-	ok1(tdb_fetch(tdb, key).dsize == data.dsize);
+	ok1(tdb_fetch(tdb, key, &d) == TDB_SUCCESS);
+	ok1(d.dsize == data.dsize);
+	free(d.dptr);
 
 	/* Delete those two, so we are empty. */
 	ok1(tdb_delete(tdb, key) == 0);
@@ -128,11 +146,11 @@ int main(int argc, char *argv[])
 	uint64_t seed = 16014841315512641303ULL;
 	union tdb_attribute clash_hattr
 		= { .hash = { .base = { TDB_ATTRIBUTE_HASH },
-			      .hash_fn = clash } };
+			      .fn = clash } };
 	union tdb_attribute fixed_hattr
 		= { .hash = { .base = { TDB_ATTRIBUTE_HASH },
-			      .hash_fn = fixedhash,
-			      .hash_private = &seed } };
+			      .fn = fixedhash,
+			      .data = &seed } };
 	int flags[] = { TDB_INTERNAL, TDB_DEFAULT, TDB_NOMMAP,
 			TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT,
 			TDB_NOMMAP|TDB_CONVERT };
@@ -143,7 +161,7 @@ int main(int argc, char *argv[])
 	fixed_hattr.base.next = &tap_log_attr;
 
 	plan_tests(sizeof(flags) / sizeof(flags[0])
-		   * (32 * 3 + 5 + sizeof(vals)/sizeof(vals[0])*2) + 1);
+		   * (39 * 3 + 5 + sizeof(vals)/sizeof(vals[0])*2) + 1);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
 		tdb = tdb_open("run-13-delete.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, &clash_hattr);
@@ -160,7 +178,8 @@ int main(int argc, char *argv[])
 		/* Check mixed bitpattern. */
 		test_val(tdb, 0x123456789ABCDEF0ULL);
 
-		ok1(tdb->allrecord_lock.count == 0 && tdb->num_lockrecs == 0);
+		ok1(!tdb->file || (tdb->file->allrecord_lock.count == 0
+				   && tdb->file->num_lockrecs == 0));
 		tdb_close(tdb);
 
 		/* Deleting these entries in the db gave problems. */