X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb.c;h=53e1de624d70d7fe188f1ce9c5a23453aa84fb6f;hb=63afde339fdcc5cbd9df5e3e8419e62a0ad1e579;hp=a3897831068dd99f5d0d67a12824d4a5cba6397b;hpb=3352e4e947777d4a90a2dd4f3037e1e494231b25;p=ccan

diff --git a/ccan/tdb2/tdb.c b/ccan/tdb2/tdb.c
index a3897831..53e1de62 100644
--- a/ccan/tdb2/tdb.c
+++ b/ccan/tdb2/tdb.c
@@ -563,7 +563,20 @@ const char *tdb_name(const struct tdb_context *tdb)
 
 int64_t tdb_get_seqnum(struct tdb_context *tdb)
 {
-	tdb_off_t off = tdb_read_off(tdb, offsetof(struct tdb_header, seqnum));
+	tdb_off_t off;
+
+	if (tdb->flags & TDB_VERSION1) {
+		tdb1_off_t val;
+		tdb->last_error = TDB_SUCCESS;
+		val = tdb1_get_seqnum(tdb);
+
+		if (tdb->last_error != TDB_SUCCESS)
+			return tdb->last_error;
+		else
+			return val;
+	}
+
+	off = tdb_read_off(tdb, offsetof(struct tdb_header, seqnum));
 	if (TDB_OFF_IS_ERR(off))
 		tdb->last_error = off;
 	else
@@ -576,3 +589,64 @@ int tdb_fd(const struct tdb_context *tdb)
 {
 	return tdb->file->fd;
 }
+
+struct traverse_state {
+	enum TDB_ERROR error;
+	struct tdb_context *dest_db;
+};
+
+/*
+  traverse function for repacking
+ */
+static int repack_traverse(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
+			   struct traverse_state *state)
+{
+	state->error = tdb_store(state->dest_db, key, data, TDB_INSERT);
+	if (state->error != TDB_SUCCESS) {
+		return -1;
+	}
+	return 0;
+}
+
+enum TDB_ERROR tdb_repack(struct tdb_context *tdb)
+{
+	struct tdb_context *tmp_db;
+	struct traverse_state state;
+
+	state.error = tdb_transaction_start(tdb);
+	if (state.error != TDB_SUCCESS) {
+		return state.error;
+	}
+
+	tmp_db = tdb_open("tmpdb", TDB_INTERNAL, O_RDWR|O_CREAT, 0, NULL);
+	if (tmp_db == NULL) {
+		state.error = tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
+					 __location__
+					 " Failed to create tmp_db");
+		tdb_transaction_cancel(tdb);
+		return tdb->last_error = state.error;
+	}
+
+	state.dest_db = tmp_db;
+	if (tdb_traverse(tdb, repack_traverse, &state) < 0) {
+		goto fail;
+	}
+
+	state.error = tdb_wipe_all(tdb);
+	if (state.error != TDB_SUCCESS) {
+		goto fail;
+	}
+
+	state.dest_db = tdb;
+	if (tdb_traverse(tmp_db, repack_traverse, &state) < 0) {
+		goto fail;
+	}
+
+	tdb_close(tmp_db);
+	return tdb_transaction_commit(tdb);
+
+fail:
+	tdb_transaction_cancel(tdb);
+	tdb_close(tmp_db);
+	return state.error;
+}