X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-15-append.c;h=39afaf7cd8ad5c864a43676ec0fc44bfbdf38eaf;hb=fbae37ba91ec230e34be564084099726cc3a9d47;hp=e11289e99b8493723f0c4a641b34bd15a2fdd829;hpb=1ad66fedf81fdaf0f07a2b00d6787614c58a23ef;p=ccan

diff --git a/ccan/tdb2/test/run-15-append.c b/ccan/tdb2/test/run-15-append.c
index e11289e9..39afaf7c 100644
--- a/ccan/tdb2/test/run-15-append.c
+++ b/ccan/tdb2/test/run-15-append.c
@@ -1,11 +1,4 @@
-#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/check.c>
-#include <ccan/tdb2/transaction.c>
+#include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include <ccan/ilog/ilog.h>
 #include "logging.h"
@@ -19,6 +12,12 @@ static tdb_off_t tdb_offset(struct tdb_context *tdb, struct tdb_data key)
 	struct tdb_used_record rec;
 	struct hash_info h;
 
+	if (tdb_get_flags(tdb) & TDB_VERSION1) {
+		struct tdb1_record rec;
+		return tdb1_find(tdb, key, tdb_hash(tdb, key.dptr, key.dsize),
+				 &rec);
+	}
+
 	off = find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL);
 	if (TDB_OFF_IS_ERR(off))
 		return 0;
@@ -34,8 +33,13 @@ int main(int argc, char *argv[])
 	tdb_off_t oldoff = 0, newoff;
 	int flags[] = { TDB_INTERNAL, TDB_DEFAULT, TDB_NOMMAP,
 			TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT, 
-			TDB_NOMMAP|TDB_CONVERT };
-	struct tdb_data key = { (unsigned char *)"key", 3 };
+			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 };
+	struct tdb_data key = tdb_mkdata("key", 3);
 	struct tdb_data data;
 
 	buffer = malloc(MAX_SIZE);
@@ -71,8 +75,15 @@ int main(int argc, char *argv[])
 		}
 		ok1(!tdb->file || (tdb->file->allrecord_lock.count == 0
 				   && tdb->file->num_lockrecs == 0));
-		/* We should increase by 50% each time... */
-		ok(moves <= ilog64(j / SIZE_STEP)*2, "Moved %u times", moves);
+		if (flags[i] & TDB_VERSION1) {
+			/* TDB1 simply over-size by 25%. */
+			ok(moves <= ilog64(j / SIZE_STEP)*4,
+			   "Moved %u times", moves);
+		} else {
+			/* We should increase by 50% each time... */
+			ok(moves <= ilog64(j / SIZE_STEP)*2,
+			   "Moved %u times", moves);
+		}
 		tdb_close(tdb);
 	}
 
@@ -103,8 +114,15 @@ int main(int argc, char *argv[])
 		}
 		ok1(!tdb->file || (tdb->file->allrecord_lock.count == 0
 				   && tdb->file->num_lockrecs == 0));
-		/* We should increase by 50% each time... */
-		ok(moves <= ilog64(j / SIZE_STEP)*2, "Moved %u times", moves);
+		if (flags[i] & TDB_VERSION1) {
+			/* TDB1 simply over-size by 25%. */
+			ok(moves <= ilog64(j / SIZE_STEP)*4,
+			   "Moved %u times", moves);
+		} else {
+			/* We should increase by 50% each time... */
+			ok(moves <= ilog64(j / SIZE_STEP)*2,
+			   "Moved %u times", moves);
+		}
 		tdb_close(tdb);
 	}