X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-3G-file.c;h=074901857faf3d25d03d0dfb8fbe6ef1ff436981;hp=6121b4de48f7ee35693b220d9e5729d2dad4269f;hb=cc2d609dfca7192305ad477b8c2b52cfdc1aa9be;hpb=8a47d50d72ea62e378dc92b150c92c1317c73fa3

diff --git a/ccan/tdb2/test/run-tdb1-3G-file.c b/ccan/tdb2/test/run-tdb1-3G-file.c
index 6121b4de..07490185 100644
--- a/ccan/tdb2/test/run-tdb1-3G-file.c
+++ b/ccan/tdb2/test/run-tdb1-3G-file.c
@@ -4,23 +4,23 @@
 #include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <err.h>
-#include "tdb1-logging.h"
+#include "logging.h"
 
-static int tdb1_expand_file_sparse(struct tdb1_context *tdb,
+static int tdb1_expand_file_sparse(struct tdb_context *tdb,
 				  tdb1_off_t size,
 				  tdb1_off_t addition)
 {
-	if (tdb->read_only || tdb->traverse_read) {
+	if ((tdb->flags & TDB_RDONLY) || tdb->tdb1.traverse_read) {
 		tdb->last_error = TDB_ERR_RDONLY;
 		return -1;
 	}
 
-	if (ftruncate(tdb->fd, size+addition) == -1) {
+	if (ftruncate(tdb->file->fd, size+addition) == -1) {
 		char b = 0;
-		ssize_t written = pwrite(tdb->fd,  &b, 1, (size+addition) - 1);
+		ssize_t written = pwrite(tdb->file->fd,  &b, 1, (size+addition) - 1);
 		if (written == 0) {
 			/* try once more, potentially revealing errno */
-			written = pwrite(tdb->fd,  &b, 1, (size+addition) - 1);
+			written = pwrite(tdb->file->fd,  &b, 1, (size+addition) - 1);
 		}
 		if (written == 0) {
 			/* again - give up, guessing errno */
@@ -46,7 +46,7 @@ static const struct tdb1_methods large_io_methods = {
 	tdb1_expand_file_sparse
 };
 
-static int test_traverse(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data,
+static int test_traverse(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
 			 void *_data)
 {
 	TDB_DATA *expect = _data;
@@ -59,18 +59,23 @@ static int test_traverse(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA data,
 
 int main(int argc, char *argv[])
 {
-	struct tdb1_context *tdb;
+	struct tdb_context *tdb;
 	TDB_DATA key, orig_data, data;
 	uint32_t hash;
 	tdb1_off_t rec_ptr;
 	struct tdb1_record rec;
+	union tdb_attribute hsize;
 
-	plan_tests(24);
-	tdb = tdb1_open_ex("run-36-file.tdb", 1024, TDB1_CLEAR_IF_FIRST,
-			  O_CREAT|O_TRUNC|O_RDWR, 0600, &taplogctx, NULL);
+	hsize.base.attr = TDB_ATTRIBUTE_TDB1_HASHSIZE;
+	hsize.base.next = &tap_log_attr;
+	hsize.tdb1_hashsize.hsize = 1024;
+
+	plan_tests(26);
+	tdb = tdb_open("run-36-file.tdb1", TDB_VERSION1,
+		       O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
 
 	ok1(tdb);
-	tdb->methods = &large_io_methods;
+	tdb->tdb1.io = &large_io_methods;
 
 	/* Enlarge the file (internally multiplies by 2). */
 	ok1(tdb1_expand(tdb, 1500000000) == 0);
@@ -81,40 +86,40 @@ int main(int argc, char *argv[])
 	orig_data.dsize = strlen("world");
 	orig_data.dptr = (void *)"world";
 
-	ok1(tdb1_store(tdb, key, orig_data, TDB_INSERT) == 0);
+	ok1(tdb_store(tdb, key, orig_data, TDB_INSERT) == TDB_SUCCESS);
 
-	data = tdb1_fetch(tdb, key);
+	ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
 	ok1(data.dsize == strlen("world"));
 	ok1(memcmp(data.dptr, "world", strlen("world")) == 0);
 	free(data.dptr);
 
 	/* That currently fills at the end, make sure that's true. */
-	hash = tdb->hash_fn(&key);
+	hash = tdb_hash(tdb, key.dptr, key.dsize);
 	rec_ptr = tdb1_find_lock_hash(tdb, key, hash, F_RDLCK, &rec);
 	ok1(rec_ptr);
 	ok1(rec_ptr > 2U*1024*1024*1024);
 	tdb1_unlock(tdb, TDB1_BUCKET(rec.full_hash), F_RDLCK);
 
 	/* Traverse must work. */
-	ok1(tdb1_traverse(tdb, test_traverse, &orig_data) == 1);
+	ok1(tdb_traverse(tdb, test_traverse, &orig_data) == 1);
 
 	/* Delete should work. */
-	ok1(tdb1_delete(tdb, key) == 0);
+	ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
 
-	ok1(tdb1_traverse(tdb, test_traverse, NULL) == 0);
+	ok1(tdb_traverse(tdb, test_traverse, NULL) == 0);
 
 	/* Transactions should work. */
 	ok1(tdb1_transaction_start(tdb) == 0);
-	ok1(tdb1_store(tdb, key, orig_data, TDB_INSERT) == 0);
+	ok1(tdb_store(tdb, key, orig_data, TDB_INSERT) == TDB_SUCCESS);
 
-	data = tdb1_fetch(tdb, key);
+	ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
 	ok1(data.dsize == strlen("world"));
 	ok1(memcmp(data.dptr, "world", strlen("world")) == 0);
 	free(data.dptr);
 	ok1(tdb1_transaction_commit(tdb) == 0);
 
-	ok1(tdb1_traverse(tdb, test_traverse, &orig_data) == 1);
-	tdb1_close(tdb);
+	ok1(tdb_traverse(tdb, test_traverse, &orig_data) == 1);
+	tdb_close(tdb);
 
 	return exit_status();
 }