tdb2: unify tdb1_traverse into tdb_traverse

[ccan] / ccan / tdb2 / test / run-tdb1-nested-traverse.c

diff --git a/ccan/tdb2/test/run-tdb1-nested-traverse.c b/ccan/tdb2/test/run-tdb1-nested-traverse.c
index b6f6ac63d96bda40a2089461d315cedb4abfd05a..cf5aa4a2f458834bfc2ad0d2ea42ee519e0a1ccc 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-nested-traverse.c
+++ b/ccan/tdb2/test/run-tdb1-nested-traverse.c
@@ -7,23 +7,23 @@
 #include <stdbool.h>
 #include <err.h>
 #include "tdb1-external-agent.h"
-#include "tdb1-logging.h"
+#include "logging.h"
 
 static struct agent *agent;
 
-static bool correct_key(TDB1_DATA key)
+static bool correct_key(TDB_DATA key)
 {
        return key.dsize == strlen("hi")
                && memcmp(key.dptr, "hi", key.dsize) == 0;
 }
 
-static bool correct_data(TDB1_DATA data)
+static bool correct_data(TDB_DATA data)
 {
        return data.dsize == strlen("world")
                && memcmp(data.dptr, "world", data.dsize) == 0;
 }
 
-static int traverse2(struct tdb1_context *tdb, TDB1_DATA key, TDB1_DATA data,
+static int traverse2(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
                     void *p)
 {
        ok1(correct_key(key));
@@ -31,39 +31,44 @@ static int traverse2(struct tdb1_context *tdb, TDB1_DATA key, TDB1_DATA data,
        return 0;
 }
 
-static int traverse1(struct tdb1_context *tdb, TDB1_DATA key, TDB1_DATA data,
+static int traverse1(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
                     void *p)
 {
        ok1(correct_key(key));
        ok1(correct_data(data));
-       ok1(external_agent_operation1(agent, TRANSACTION_START, tdb1_name(tdb))
+       ok1(external_agent_operation1(agent, TRANSACTION_START, tdb->name)
            == WOULD_HAVE_BLOCKED);
-       tdb1_traverse(tdb, traverse2, NULL);
+       tdb_traverse(tdb, traverse2, NULL);
 
        /* That should *not* release the transaction lock! */
-       ok1(external_agent_operation1(agent, TRANSACTION_START, tdb1_name(tdb))
+       ok1(external_agent_operation1(agent, TRANSACTION_START, tdb->name)
            == WOULD_HAVE_BLOCKED);
        return 0;
 }
 
 int main(int argc, char *argv[])
 {
-       struct tdb1_context *tdb;
-       TDB1_DATA key, data;
+       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(17);
        agent = prepare_external_agent1();
        if (!agent)
                err(1, "preparing agent");
 
-       tdb = tdb1_open_ex("run-nested-traverse.tdb", 1024, TDB1_CLEAR_IF_FIRST,
-                         O_CREAT|O_TRUNC|O_RDWR, 0600, &taplogctx, NULL);
+       tdb = tdb_open("run-nested-traverse.tdb1", TDB_VERSION1,
+                      O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
        ok1(tdb);
 
-       ok1(external_agent_operation1(agent, OPEN, tdb1_name(tdb)) == SUCCESS);
-       ok1(external_agent_operation1(agent, TRANSACTION_START, tdb1_name(tdb))
+       ok1(external_agent_operation1(agent, OPEN, tdb->name) == SUCCESS);
+       ok1(external_agent_operation1(agent, TRANSACTION_START, tdb->name)
            == SUCCESS);
-       ok1(external_agent_operation1(agent, TRANSACTION_COMMIT, tdb1_name(tdb))
+       ok1(external_agent_operation1(agent, TRANSACTION_COMMIT, tdb->name)
            == SUCCESS);
 
        key.dsize = strlen("hi");
@@ -71,10 +76,12 @@ int main(int argc, char *argv[])
        data.dptr = (void *)"world";
        data.dsize = strlen("world");
 
-       ok1(tdb1_store(tdb, key, data, TDB1_INSERT) == 0);
-       tdb1_traverse(tdb, traverse1, NULL);
-       tdb1_traverse_read(tdb, traverse1, NULL);
-       tdb1_close(tdb);
+       ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS);
+       tdb_traverse(tdb, traverse1, NULL);
+       tdb_add_flag(tdb, TDB_RDONLY);
+       tdb_traverse(tdb, traverse1, NULL);
+       tdb_remove_flag(tdb, TDB_RDONLY);
+       tdb_close(tdb);
 
        return exit_status();
 }