X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-open-during-transaction.c;h=fbd539a4367c3bb786e40b81a8ca1dc05806d397;hb=49475d68deecd0b31597ed6094229171d2699b11;hp=875fc3ca9e6ffee46293c4e3d82ad95e46357bf2;hpb=22d0e0dc59fc9d7e0046fec6971ef478c2d604fd;p=ccan diff --git a/ccan/tdb2/test/run-tdb1-open-during-transaction.c b/ccan/tdb2/test/run-tdb1-open-during-transaction.c index 875fc3ca..fbd539a4 100644 --- a/ccan/tdb2/test/run-tdb1-open-during-transaction.c +++ b/ccan/tdb2/test/run-tdb1-open-during-transaction.c @@ -18,7 +18,7 @@ static int ftruncate_check(int fd, off_t length); #include #include #include "tdb1-external-agent.h" -#include "tdb1-logging.h" +#include "logging.h" static struct agent *agent; static bool opened; @@ -131,8 +131,13 @@ int main(int argc, char *argv[]) const int flags[] = { TDB_DEFAULT, TDB_NOMMAP }; int i; - struct tdb1_context *tdb; + struct tdb_context *tdb; TDB_DATA key, data; + union tdb_attribute hsize; + + hsize.base.attr = TDB_ATTRIBUTE_TDB1_HASHSIZE; + hsize.base.next = &tap_log_attr; + hsize.tdb1_hashsize.hsize = 1024; plan_tests(10); agent = prepare_external_agent1(); @@ -145,9 +150,9 @@ int main(int argc, char *argv[]) "DEFAULT", (flags[i] & TDB_NOMMAP) ? "no mmap" : "mmap"); unlink(TEST_DBNAME); - tdb = tdb1_open_ex(TEST_DBNAME, 1024, flags[i], - O_CREAT|O_TRUNC|O_RDWR, 0600, - &taplogctx, NULL); + tdb = tdb1_open(TEST_DBNAME, flags[i], + O_CREAT|O_TRUNC|O_RDWR, 0600, + &hsize); ok1(tdb); opened = true;