X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-15-append.c;h=39afaf7cd8ad5c864a43676ec0fc44bfbdf38eaf;hp=545175a4885cb5b3e289fd277ea29b69c8007825;hb=56023cca5f66a40646a1e807c3d10af6e5913623;hpb=c56e2b1b5e51b094d53f4012e226b352a91618f6

diff --git a/ccan/tdb2/test/run-15-append.c b/ccan/tdb2/test/run-15-append.c
index 545175a4..39afaf7c 100644
--- a/ccan/tdb2/test/run-15-append.c
+++ b/ccan/tdb2/test/run-15-append.c
@@ -1,10 +1,4 @@
-#include <ccan/tdb2/tdb.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"
@@ -18,8 +12,14 @@ 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 (unlikely(off == TDB_OFF_ERR))
+	if (TDB_OFF_IS_ERR(off))
 		return 0;
 	tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_RDLCK);
 	return off;
@@ -33,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);
@@ -42,7 +47,7 @@ int main(int argc, char *argv[])
 		buffer[i] = i;
 
 	plan_tests(sizeof(flags) / sizeof(flags[0])
-		   * ((3 + MAX_SIZE/SIZE_STEP * 4) * 2 + 6)
+		   * ((3 + MAX_SIZE/SIZE_STEP * 5) * 2 + 7)
 		   + 1);
 
 	/* Using tdb_store. */
@@ -59,7 +64,7 @@ int main(int argc, char *argv[])
 			data.dsize = j;
 			ok1(tdb_store(tdb, key, data, TDB_REPLACE) == 0);
 			ok1(tdb_check(tdb, NULL, NULL) == 0);
-			data = tdb_fetch(tdb, key);
+			ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
 			ok1(data.dsize == j);
 			ok1(memcmp(data.dptr, buffer, data.dsize) == 0);
 			free(data.dptr);
@@ -68,9 +73,17 @@ int main(int argc, char *argv[])
 				moves++;
 			oldoff = newoff;
 		}
-		ok1(tdb->allrecord_lock.count == 0 && tdb->num_lockrecs == 0);
-		/* We should increase by 50% each time... */
-		ok(moves <= ilog64(j / SIZE_STEP)*2, "Moved %u times", moves);
+		ok1(!tdb->file || (tdb->file->allrecord_lock.count == 0
+				   && tdb->file->num_lockrecs == 0));
+		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);
 	}
 
@@ -89,7 +102,7 @@ int main(int argc, char *argv[])
 			data.dsize = j - prev_len;
 			ok1(tdb_append(tdb, key, data) == 0);
 			ok1(tdb_check(tdb, NULL, NULL) == 0);
-			data = tdb_fetch(tdb, key);
+			ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
 			ok1(data.dsize == j);
 			ok1(memcmp(data.dptr, buffer, data.dsize) == 0);
 			free(data.dptr);
@@ -99,9 +112,17 @@ int main(int argc, char *argv[])
 				moves++;
 			oldoff = newoff;
 		}
-		ok1(tdb->allrecord_lock.count == 0 && tdb->num_lockrecs == 0);
-		/* We should increase by 50% each time... */
-		ok(moves <= ilog64(j / SIZE_STEP)*2, "Moved %u times", moves);
+		ok1(!tdb->file || (tdb->file->allrecord_lock.count == 0
+				   && tdb->file->num_lockrecs == 0));
+		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);
 	}
 
@@ -117,11 +138,12 @@ int main(int argc, char *argv[])
 		data.dsize = MAX_SIZE;
 		ok1(tdb_append(tdb, key, data) == 0);
 		ok1(tdb_check(tdb, NULL, NULL) == 0);
-		data = tdb_fetch(tdb, key);
+		ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
 		ok1(data.dsize == MAX_SIZE);
 		ok1(memcmp(data.dptr, buffer, data.dsize) == 0);
 		free(data.dptr);
-		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);
 	}