X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-81-seqnum.c;h=b33d0a218b49198c20fe26ceaf3aa4265f6bb831;hp=f7308e2dbd50128325ba675186e3aea983294707;hb=d9cbd7d4454ae35e4e2f6d18a9469bf26948e4b9;hpb=f367a1dc8573db0a1f6f49fcda474eb51c192241

diff --git a/ccan/tdb2/test/run-81-seqnum.c b/ccan/tdb2/test/run-81-seqnum.c
index f7308e2d..b33d0a21 100644
--- a/ccan/tdb2/test/run-81-seqnum.c
+++ b/ccan/tdb2/test/run-81-seqnum.c
@@ -1,68 +1,72 @@
-#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/traverse.c>
-#include <ccan/tdb2/check.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include "logging.h"
 
 int main(int argc, char *argv[])
 {
-	unsigned int i;
+	unsigned int i, seq;
 	struct tdb_context *tdb;
 	struct tdb_data d = { NULL, 0 }; /* Bogus GCC warning */
 	struct tdb_data key = tdb_mkdata("key", 3);
 	struct tdb_data data = tdb_mkdata("data", 4);
 	int flags[] = { TDB_INTERNAL, TDB_DEFAULT, TDB_NOMMAP,
 			TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT,
-			TDB_NOMMAP|TDB_CONVERT };
+			TDB_NOMMAP|TDB_CONVERT,
+			TDB_INTERNAL|TDB_VERSION1, TDB_VERSION1,
+			TDB_NOMMAP|TDB_VERSION1,
+			TDB_INTERNAL|TDB_CONVERT|TDB_VERSION1,
+			TDB_CONVERT|TDB_VERSION1,
+			TDB_NOMMAP|TDB_CONVERT|TDB_VERSION1 };
 
-	plan_tests(sizeof(flags) / sizeof(flags[0]) * 15 + 4 * 13);
+	plan_tests(sizeof(flags) / sizeof(flags[0]) * 15 + 8 * 13);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
 		tdb = tdb_open("run-new_database.tdb", flags[i]|TDB_SEQNUM,
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
 		if (!ok1(tdb))
 			continue;
 		
-		ok1(tdb_get_seqnum(tdb) == 0);
+		seq = 0;
+		ok1(tdb_get_seqnum(tdb) == seq);
 		ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
-		ok1(tdb_get_seqnum(tdb) == 1);
+		ok1(tdb_get_seqnum(tdb) == ++seq);
 		/* Fetch doesn't change seqnum */
 		if (ok1(tdb_fetch(tdb, key, &d) == TDB_SUCCESS))
 			free(d.dptr);
-		ok1(tdb_get_seqnum(tdb) == 1);
+		ok1(tdb_get_seqnum(tdb) == seq);
 		ok1(tdb_append(tdb, key, data) == TDB_SUCCESS);
-		ok1(tdb_get_seqnum(tdb) == 2);
+		/* Append in tdb1 (or store over value) bumps twice! */
+		if (flags[i] & TDB_VERSION1)
+			seq++;
+		ok1(tdb_get_seqnum(tdb) == ++seq);
 
 		ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
-		ok1(tdb_get_seqnum(tdb) == 3);
+		ok1(tdb_get_seqnum(tdb) == ++seq);
 		/* Empty append works */
 		ok1(tdb_append(tdb, key, data) == TDB_SUCCESS);
-		ok1(tdb_get_seqnum(tdb) == 4);
+		ok1(tdb_get_seqnum(tdb) == ++seq);
 
 		ok1(tdb_wipe_all(tdb) == TDB_SUCCESS);
-		ok1(tdb_get_seqnum(tdb) == 5);
+		ok1(tdb_get_seqnum(tdb) == ++seq);
 
 		if (!(flags[i] & TDB_INTERNAL)) {
 			ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
 			ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
-			ok1(tdb_get_seqnum(tdb) == 6);
+			ok1(tdb_get_seqnum(tdb) == ++seq);
+			/* Append in tdb1 (or store over value) bumps twice! */
+			if (flags[i] & TDB_VERSION1)
+				seq++;
 			ok1(tdb_append(tdb, key, data) == TDB_SUCCESS);
-			ok1(tdb_get_seqnum(tdb) == 7);
+			ok1(tdb_get_seqnum(tdb) == ++seq);
 			ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
-			ok1(tdb_get_seqnum(tdb) == 8);
+			ok1(tdb_get_seqnum(tdb) == ++seq);
 			ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS);
-			ok1(tdb_get_seqnum(tdb) == 8);
+			ok1(tdb_get_seqnum(tdb) == seq);
 
 			ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
 			ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
-			ok1(tdb_get_seqnum(tdb) == 9);
+			ok1(tdb_get_seqnum(tdb) == seq + 1);
 			tdb_transaction_cancel(tdb);
-			ok1(tdb_get_seqnum(tdb) == 8);
+			ok1(tdb_get_seqnum(tdb) == seq);
 		}
 		tdb_close(tdb);
 		ok1(tap_log_messages == 0);