}
new_off += sizeof(struct tdb_used_record);
- ecode = tdb->methods->twrite(tdb, new_off, key.dptr, key.dsize);
+ ecode = tdb->tdb2.io->twrite(tdb, new_off, key.dptr, key.dsize);
if (ecode != TDB_SUCCESS) {
return ecode;
}
new_off += key.dsize;
- ecode = tdb->methods->twrite(tdb, new_off, dbuf.dptr, dbuf.dsize);
+ ecode = tdb->tdb2.io->twrite(tdb, new_off, dbuf.dptr, dbuf.dsize);
if (ecode != TDB_SUCCESS) {
return ecode;
}
{
enum TDB_ERROR ecode;
- ecode = tdb->methods->twrite(tdb, off, dbuf.dptr, dbuf.dsize);
+ ecode = tdb->tdb2.io->twrite(tdb, off, dbuf.dptr, dbuf.dsize);
if (ecode == TDB_SUCCESS && extra) {
/* Put a zero in; future versions may append other data. */
- ecode = tdb->methods->twrite(tdb, off + dbuf.dsize, "", 1);
+ ecode = tdb->tdb2.io->twrite(tdb, off + dbuf.dsize, "", 1);
}
if (tdb->flags & TDB_SEQNUM)
tdb_inc_seqnum(tdb);
struct tdb_used_record rec;
enum TDB_ERROR ecode;
+ if (tdb->flags & TDB_VERSION1) {
+ if (tdb1_store(tdb, key, dbuf, flag) == -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;
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;
+ dbuf.dsize));
goto out;
}
- ecode = tdb->methods->tread(tdb, off + sizeof(rec) + key.dsize,
+ ecode = tdb->tdb2.io->tread(tdb, off + sizeof(rec) + key.dsize,
newdata, old_dlen);
if (ecode != TDB_SUCCESS) {
goto out_free_newdata;
struct hash_info h;
enum TDB_ERROR ecode;
+ if (tdb->flags & TDB_VERSION1)
+ return tdb1_fetch(tdb, key, data);
+
off = find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL);
if (TDB_OFF_IS_ERR(off)) {
return tdb->last_error = off;
struct tdb_used_record rec;
struct hash_info h;
+ if (tdb->flags & TDB_VERSION1) {
+ return tdb1_exists(tdb, key);
+ }
+
off = find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL);
if (TDB_OFF_IS_ERR(off)) {
tdb->last_error = off;
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;
return tdb->flags;
}
+static bool inside_transaction(const struct tdb_context *tdb)
+{
+ if (tdb->flags & TDB_VERSION1)
+ return tdb->tdb1.transaction != NULL;
+ else
+ return tdb->tdb2.transaction != NULL;
+}
+
static bool readonly_changable(struct tdb_context *tdb, const char *caller)
{
- if (tdb->transaction) {
+ if (inside_transaction(tdb)) {
tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL,
TDB_LOG_USE_ERROR,
"%s: can't change"
struct hash_info h;
enum TDB_ERROR ecode;
+ if (tdb->flags & TDB_VERSION1) {
+ return tdb->last_error = tdb1_parse_record(tdb, key, parse,
+ data);
+ }
+
off = find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL);
if (TDB_OFF_IS_ERR(off)) {
return tdb->last_error = off;
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
{
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;
+}