tdb2: unify tdb1_delete into tdb_delete.

Switch on the TDB_VERSION1 flag.

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

diff --git a/lib/tdb2/private.h b/lib/tdb2/private.h
index 97a214f74a3f213759a11f509a9ba0fb7757527c..851e0e3a3d6c99ebd39be724d30c20bfae69c55f 100644 (file)
--- a/lib/tdb2/private.h
+++ b/lib/tdb2/private.h
@@ -663,6 +663,7 @@ 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);
+int tdb1_delete(struct tdb_context *tdb, TDB_DATA key);
 
 /* 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 be2ff0d67614ce7c531db80da5335bbd6cfd1b2f..28d0e03f7d1b609cbd7cfdc38f8ec2fa99c98b96 100644 (file)
--- a/lib/tdb2/tdb.c
+++ b/lib/tdb2/tdb.c
@@ -304,6 +304,12 @@ enum TDB_ERROR tdb_delete(struct tdb_context *tdb, struct tdb_data key)
        struct hash_info h;
        enum TDB_ERROR ecode;
 
+       if (tdb->flags & TDB_VERSION1) {
+               if (tdb1_delete(tdb, key) == -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 62b94da44afd05ebe0a2f90f0303b8cf2c1a1ce8..77d673ae089247b72b72f524da5526217ca3bf4e 100644 (file)
--- a/lib/tdb2/tdb1.h
+++ b/lib/tdb2/tdb1.h
@@ -45,8 +45,6 @@ int tdb1_parse_record(struct tdb_context *tdb, TDB_DATA key,
                                            void *private_data),
                              void *private_data);
 
-int tdb1_delete(struct tdb_context *tdb, TDB_DATA key);
-
 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 895a8c2ae59218ab43778905df0787c31a96b104..16e945974eaf9e2bcbf6ed213c6e5096bfb18c49 100644 (file)
--- a/lib/tdb2/tdb1_tdb.c
+++ b/lib/tdb2/tdb1_tdb.c
@@ -434,6 +434,7 @@ int tdb1_delete(struct tdb_context *tdb, TDB_DATA key)
        uint32_t hash = tdb_hash(tdb, key.dptr, key.dsize);
        int ret;
 
+       assert(tdb->flags & TDB_VERSION1);
        ret = tdb1_delete_hash(tdb, key, hash);
        return ret;
 }

diff --git a/lib/tdb2/test/run-tdb1-3G-file.c b/lib/tdb2/test/run-tdb1-3G-file.c
index 5e0e64e8155331d7c42a67291d74c1cf1909b294..116c655438106fdffed0c74a35ea62b618701b33 100644 (file)
--- a/lib/tdb2/test/run-tdb1-3G-file.c
+++ b/lib/tdb2/test/run-tdb1-3G-file.c
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
        ok1(tdb1_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);
 

diff --git a/lib/tdb2/test/run-tdb1-incompatible.c b/lib/tdb2/test/run-tdb1-incompatible.c
index d2e07107aaacea36f2097f591fad768c1eae34b4..e6b2994e203ed57e0f45d3e95d32a8a9cc97ddf0 100644 (file)
--- a/lib/tdb2/test/run-tdb1-incompatible.c
+++ b/lib/tdb2/test/run-tdb1-incompatible.c
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
                               O_RDWR, 0600, &jhash_attr);
                ok1(tdb);
                ok1(log_count == 0);
-               ok1(tdb1_fetch(tdb, d, &d) == TDB_SUCCESS);
+               ok1(tdb_fetch(tdb, d, &d) == TDB_SUCCESS);
                ok1(d.dsize == 5);
                free(d.dptr);
                ok1(tdb1_check(tdb, NULL, NULL) == 0);
@@ -202,7 +202,7 @@ int main(int argc, char *argv[])
                               &dumbhash_attr);
                ok1(tdb);
                ok1(log_count == 0);
-               ok1(tdb1_fetch(tdb, d, &d) == TDB_SUCCESS);
+               ok1(tdb_fetch(tdb, d, &d) == TDB_SUCCESS);
                ok1(d.dsize == 5);
                free(d.dptr);
                ok1(tdb1_check(tdb, NULL, NULL) == 0);

diff --git a/lib/tdb2/test/run-tdb1-nested-transactions.c b/lib/tdb2/test/run-tdb1-nested-transactions.c
index 89e47d3fbf5ef4bb7a289dcfd358759398df4aae..645b4bc1470a23a541b459e9c1ff6f375b394ab1 100644 (file)
--- a/lib/tdb2/test/run-tdb1-nested-transactions.c
+++ b/lib/tdb2/test/run-tdb1-nested-transactions.c
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
 
        ok1(tdb1_transaction_start(tdb) == 0);
        ok1(tdb1_transaction_start(tdb) == 0);
-       ok1(tdb1_delete(tdb, key) == 0);
+       ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
        ok1(tdb1_transaction_commit(tdb) == 0);
        ok1(!tdb1_exists(tdb, key));
        ok1(tdb1_transaction_cancel(tdb) == 0);
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
 
        ok1(tdb1_transaction_start(tdb) == 0);
        ok1(tdb1_transaction_start(tdb) == 0);
-       ok1(tdb1_delete(tdb, key) == 0);
+       ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
        ok1(tdb1_transaction_commit(tdb) == 0);
        ok1(!tdb1_exists(tdb, key));
        ok1(tdb1_transaction_commit(tdb) == 0);

diff --git a/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c b/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c
index 94c125dcadb8be9817cd6078e2637e6366809eda..383b74cb87d59965b5ec194aa6cedac8a6a01c6d 100644 (file)
--- a/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c
+++ b/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c
@@ -40,7 +40,7 @@ static void delete_entries(struct tdb_context *tdb)
                key.dsize = sizeof(i);
                key.dptr = (void *)&i;
 
-               ok1(tdb1_delete(tdb, key) == 0);
+               ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
        }
 }
 
@@ -52,7 +52,7 @@ static int delete_other(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
        memcpy(&i, key.dptr, 4);
        i = (i + 1) % NUM_ENTRIES;
        key.dptr = (void *)&i;
-       if (tdb1_delete(tdb, key) != 0)
+       if (tdb_delete(tdb, key) != TDB_SUCCESS)
                (*(int *)private_data)++;
        return 0;
 }
@@ -60,7 +60,7 @@ static int delete_other(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
 static int delete_self(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
                        void *private_data)
 {
-       ok1(tdb1_delete(tdb, key) == 0);
+       ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
        return 0;
 }