tdb2: unify tdb1_append into tdb_append

Switch on the TDB_VERSION1 flag.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit 8bc38cb177928ef739440c32e33a8eaf23a5dd22)

diff --git a/lib/tdb2/private.h b/lib/tdb2/private.h
index 1c794753f932d0085dd915c7130d04284429ee69..97a214f74a3f213759a11f509a9ba0fb7757527c 100644 (file)
--- a/lib/tdb2/private.h
+++ b/lib/tdb2/private.h
@@ -662,6 +662,7 @@ int tdb1_transaction_cancel(struct tdb_context *tdb);
 int tdb1_store(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, int flag);
 enum TDB_ERROR tdb1_fetch(struct tdb_context *tdb, TDB_DATA key,
                          TDB_DATA *data);
+int tdb1_append(struct tdb_context *tdb, TDB_DATA key, TDB_DATA new_dbuf);
 
 /* tdb.c: */
 enum TDB_ERROR COLD tdb_logerr(struct tdb_context *tdb,

diff --git a/lib/tdb2/tdb.c b/lib/tdb2/tdb.c
index c9c95c602c252cd4bf586372b2759c49f2fe53d6..be2ff0d67614ce7c531db80da5335bbd6cfd1b2f 100644 (file)
--- a/lib/tdb2/tdb.c
+++ b/lib/tdb2/tdb.c
@@ -185,6 +185,12 @@ enum TDB_ERROR tdb_append(struct tdb_context *tdb,
        struct tdb_data new_dbuf;
        enum TDB_ERROR ecode;
 
+       if (tdb->flags & TDB_VERSION1) {
+               if (tdb1_append(tdb, key, dbuf) == -1)
+                       return tdb->last_error;
+               return TDB_SUCCESS;
+       }
+
        off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL);
        if (TDB_OFF_IS_ERR(off)) {
                return tdb->last_error = off;

diff --git a/lib/tdb2/tdb1.h b/lib/tdb2/tdb1.h
index e3204283853c516dfab63a8d9202faee2e90a3f1..62b94da44afd05ebe0a2f90f0303b8cf2c1a1ce8 100644 (file)
--- a/lib/tdb2/tdb1.h
+++ b/lib/tdb2/tdb1.h
@@ -47,8 +47,6 @@ int tdb1_parse_record(struct tdb_context *tdb, TDB_DATA key,
 
 int tdb1_delete(struct tdb_context *tdb, TDB_DATA key);
 
-int tdb1_append(struct tdb_context *tdb, TDB_DATA key, TDB_DATA new_dbuf);
-
 TDB_DATA tdb1_firstkey(struct tdb_context *tdb);
 
 TDB_DATA tdb1_nextkey(struct tdb_context *tdb, TDB_DATA key);

diff --git a/lib/tdb2/tdb1_tdb.c b/lib/tdb2/tdb1_tdb.c
index bba16338e97ec937dd66d1b41e1ac0e02eb96003..895a8c2ae59218ab43778905df0787c31a96b104 100644 (file)
--- a/lib/tdb2/tdb1_tdb.c
+++ b/lib/tdb2/tdb1_tdb.c
@@ -627,6 +627,8 @@ int tdb1_append(struct tdb_context *tdb, TDB_DATA key, TDB_DATA new_dbuf)
        TDB_DATA dbuf;
        int ret = -1;
 
+       assert(tdb->flags & TDB_VERSION1);
+
        /* find which hash bucket it is in */
        hash = tdb_hash(tdb, key.dptr, key.dsize);
        if (tdb1_lock(tdb, TDB1_BUCKET(hash), F_WRLCK) == -1)

diff --git a/lib/tdb2/test/run-tdb1-zero-append.c b/lib/tdb2/test/run-tdb1-zero-append.c
index 560b5bc8dd7ce336ce7e60eb3f6c7ea6adbd2832..fdc9cdce35bb5370a5901b619cad4e81675ee713 100644 (file)
--- a/lib/tdb2/test/run-tdb1-zero-append.c
+++ b/lib/tdb2/test/run-tdb1-zero-append.c
@@ -25,8 +25,8 @@ int main(int argc, char *argv[])
        data.dptr = (void *)"world";
        data.dsize = 0;
 
-       ok1(tdb1_append(tdb, key, data) == 0);
-       ok1(tdb1_append(tdb, key, data) == 0);
+       ok1(tdb_append(tdb, key, data) == TDB_SUCCESS);
+       ok1(tdb_append(tdb, key, data) == TDB_SUCCESS);
        ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
        ok1(data.dsize == 0);
        free(data.dptr);