X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-traverse.c;h=583e649dbd3a23727640a87eb368a07d8b67cf8b;hp=e3c2a895ff190beb9a2e03eeccee617943f8a1bc;hb=dc9da1e34fe6a9d113fd57e116ebbc6d5bd54819;hpb=5e8b9af5e7fe5f1ccac407873a3b782b8a629782;ds=sidebyside

diff --git a/ccan/tdb2/test/run-traverse.c b/ccan/tdb2/test/run-traverse.c
index e3c2a895..583e649d 100644
--- a/ccan/tdb2/test/run-traverse.c
+++ b/ccan/tdb2/test/run-traverse.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>
@@ -38,9 +39,9 @@ struct trav_data {
 	enum TDB_ERROR delete_error;
 };
 
-static int trav(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, void *p)
+static int trav(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf,
+		struct trav_data *td)
 {
-	struct trav_data *td = p;
 	int val;
 
 	td->calls++;
@@ -56,9 +57,8 @@ static int trav(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, void *p)
 		td->high = val;
 
 	if (td->delete) {
-
-		if (tdb_delete(tdb, key) != 0) {
-			td->delete_error = tdb_error(tdb);
+		td->delete_error = tdb_delete(tdb, key);
+		if (td->delete_error != TDB_SUCCESS) {
 			return -1;
 		}
 	}
@@ -76,9 +76,8 @@ struct trav_grow_data {
 };
 
 static int trav_grow(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf,
-		     void *p)
+		     struct trav_grow_data *tgd)	     
 {
-	struct trav_grow_data *tgd = p;
 	int val;
 	unsigned char buffer[128] = { 0 };
 
@@ -96,8 +95,8 @@ static int trav_grow(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf,
 	/* Make a big difference to the database. */
 	dbuf.dptr = buffer;
 	dbuf.dsize = sizeof(buffer);
-	if (tdb_append(tdb, key, dbuf) != 0) {
-		tgd->error = tdb_error(tdb);
+	tgd->error = tdb_append(tdb, key, dbuf);
+	if (tgd->error != TDB_SUCCESS) {
 		return -1;
 	}
 	return 0;
@@ -115,12 +114,12 @@ int main(int argc, char *argv[])
 			TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT, 
 			TDB_NOMMAP|TDB_CONVERT };
 	union tdb_attribute hattr = { .hash = { .base = { TDB_ATTRIBUTE_HASH },
-						.hash_fn = fixedhash,
-						.hash_private = &seed } };
+						.fn = fixedhash,
+						.data = &seed } };
 
 	hattr.base.next = &tap_log_attr;
 
-	plan_tests(sizeof(flags) / sizeof(flags[0]) * 50 + 1);
+	plan_tests(sizeof(flags) / sizeof(flags[0]) * 32 + 1);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
 		tdb = tdb_open("run-traverse.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, &hattr);
@@ -128,30 +127,12 @@ int main(int argc, char *argv[])
 		if (!tdb)
 			continue;
 
-		ok1(tdb_traverse_read(tdb, NULL, NULL) == 0);
 		ok1(tdb_traverse(tdb, NULL, NULL) == 0);
 
 		ok1(store_records(tdb));
-		num = tdb_traverse_read(tdb, NULL, NULL);
-		ok1(num == NUM_RECORDS);
 		num = tdb_traverse(tdb, NULL, NULL);
 		ok1(num == NUM_RECORDS);
 
-		/* Full traverse (read-only). */
-		td.calls = 0;
-		td.call_limit = UINT_MAX;
-		td.low = INT_MAX;
-		td.high = INT_MIN;
-		td.mismatch = false;
-		td.delete = false;
-
-		num = tdb_traverse_read(tdb, trav, &td);
-		ok1(num == NUM_RECORDS);
-		ok1(!td.mismatch);
-		ok1(td.calls == NUM_RECORDS);
-		ok1(td.low == 0);
-		ok1(td.high == NUM_RECORDS-1);
-
 		/* Full traverse. */
 		td.calls = 0;
 		td.call_limit = UINT_MAX;
@@ -182,34 +163,7 @@ int main(int argc, char *argv[])
 		ok1(td.low <= NUM_RECORDS / 2);
 		ok1(td.high > NUM_RECORDS / 2);
 		ok1(tdb_check(tdb, NULL, NULL) == 0);
-
-		/* Growing traverse.  Expect failure on r/o traverse. */
-		tgd.calls = 0;
-		tgd.num_large = 0;
-		tgd.mismatch = false;
-		tgd.error = TDB_SUCCESS;
-		num = tdb_traverse_read(tdb, trav_grow, &tgd);
-		ok1(num == 1);
-		ok1(tgd.error == TDB_ERR_RDONLY);
-		ok1(tgd.calls == 1);
-		ok1(!tgd.mismatch);
-		ok1(tdb_check(tdb, NULL, NULL) == 0);
-
-		/* Deleting traverse.  Expect failure on r/o traverse. */
-		td.calls = 0;
-		td.call_limit = UINT_MAX;
-		td.low = INT_MAX;
-		td.high = INT_MIN;
-		td.mismatch = false;
-		td.delete = true;
-		td.delete_error = TDB_SUCCESS;
-		num = tdb_traverse_read(tdb, trav, &td);
-		ok1(num == 1);
-		ok1(td.delete_error == TDB_ERR_RDONLY);
-		ok1(!td.mismatch);
-		ok1(td.calls == 1);
-		ok1(td.low == td.high);
-		ok1(tdb_check(tdb, NULL, NULL) == 0);
+		ok1(tap_log_messages == 0);
 
 		/* Deleting traverse (delete everything). */
 		td.calls = 0;
@@ -229,12 +183,11 @@ int main(int argc, char *argv[])
 		ok1(tdb_check(tdb, NULL, NULL) == 0);
 
 		/* Now it's empty! */
-		ok1(tdb_traverse_read(tdb, NULL, NULL) == 0);
 		ok1(tdb_traverse(tdb, NULL, NULL) == 0);
 
 		/* Re-add. */
 		ok1(store_records(tdb));
-		ok1(tdb_traverse_read(tdb, NULL, NULL) == NUM_RECORDS);
+		ok1(tdb_traverse(tdb, NULL, NULL) == NUM_RECORDS);
 		ok1(tdb_check(tdb, NULL, NULL) == 0);
 
 		/* Grow.  This will cause us to be reshuffled. */