diff options
author | Volker Lendecke <vl@samba.org> | 2016-09-12 17:30:55 +0200 |
---|---|---|
committer | Ralph Boehme <slow@samba.org> | 2017-07-25 17:43:16 +0200 |
commit | 09915bf8e5d59969cab7de0e75fd327046cffd8d (patch) | |
tree | be507514fa10d9b5d9beff8750b5027357c19e72 /lib/dbwrap | |
parent | f0598e985300afd287487cd4975a309cee6dfaa6 (diff) | |
download | samba-09915bf8e5d59969cab7de0e75fd327046cffd8d.tar.gz |
dbwrap: Convert backend store to storev
Convert all implementors of dbwrap_store to a storev-style call
by using the dbwrap_merge_dbufs call
For dbwrap_tdb, this matches tdb_storev.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'lib/dbwrap')
-rw-r--r-- | lib/dbwrap/dbwrap.c | 2 | ||||
-rw-r--r-- | lib/dbwrap/dbwrap_private.h | 3 | ||||
-rw-r--r-- | lib/dbwrap/dbwrap_rbt.c | 25 | ||||
-rw-r--r-- | lib/dbwrap/dbwrap_tdb.c | 22 |
4 files changed, 37 insertions, 15 deletions
diff --git a/lib/dbwrap/dbwrap.c b/lib/dbwrap/dbwrap.c index 1f45558beb6..85f2213082f 100644 --- a/lib/dbwrap/dbwrap.c +++ b/lib/dbwrap/dbwrap.c @@ -86,7 +86,7 @@ NTSTATUS dbwrap_record_store(struct db_record *rec, TDB_DATA data, int flags) { NTSTATUS status; - status = rec->store(rec, data, flags); + status = rec->storev(rec, &data, 1, flags); if (!NT_STATUS_IS_OK(status)) { return status; } diff --git a/lib/dbwrap/dbwrap_private.h b/lib/dbwrap/dbwrap_private.h index 9b50ccc040e..2858afd8539 100644 --- a/lib/dbwrap/dbwrap_private.h +++ b/lib/dbwrap/dbwrap_private.h @@ -29,7 +29,8 @@ struct tevent_req; struct db_record { struct db_context *db; TDB_DATA key, value; - NTSTATUS (*store)(struct db_record *rec, TDB_DATA data, int flag); + NTSTATUS (*storev)(struct db_record *rec, const TDB_DATA *dbufs, + int num_dbufs, int flag); NTSTATUS (*delete_rec)(struct db_record *rec); void *private_data; }; diff --git a/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c index eb5ef10fddc..d9c743b80e8 100644 --- a/lib/dbwrap/dbwrap_rbt.c +++ b/lib/dbwrap/dbwrap_rbt.c @@ -118,7 +118,8 @@ overflow: return -1; } -static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) +static NTSTATUS db_rbt_storev(struct db_record *rec, + const TDB_DATA *dbufs, int num_dbufs, int flag) { struct db_rbt_ctx *db_ctx = talloc_get_type_abort( rec->db->private_data, struct db_rbt_ctx); @@ -130,12 +131,23 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) struct db_rbt_node *parent_node = NULL; ssize_t reclen; - TDB_DATA this_key, this_val; + TDB_DATA data, this_key, this_val; + void *to_free = NULL; if (db_ctx->traverse_read > 0) { return NT_STATUS_MEDIA_WRITE_PROTECTED; } + if (num_dbufs == 1) { + data = dbufs[0]; + } else { + data = dbwrap_merge_dbufs(rec, dbufs, num_dbufs); + if (data.dptr == NULL) { + return NT_STATUS_NO_MEMORY; + } + to_free = data.dptr; + } + if (rec_priv->node != NULL) { /* @@ -154,17 +166,20 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) */ memcpy(this_val.dptr, data.dptr, data.dsize); rec_priv->node->valuesize = data.dsize; + TALLOC_FREE(to_free); return NT_STATUS_OK; } } reclen = db_rbt_reclen(rec->key.dsize, data.dsize); if (reclen == -1) { + TALLOC_FREE(to_free); return NT_STATUS_INSUFFICIENT_RESOURCES; } node = talloc_zero_size(db_ctx, reclen); if (node == NULL) { + TALLOC_FREE(to_free); return NT_STATUS_NO_MEMORY; } @@ -232,6 +247,8 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag) DLIST_ADD_AFTER(db_ctx->nodes, node, parent_node); rb_insert_color(&node->rb_node, &db_ctx->tree); + TALLOC_FREE(to_free); + return NT_STATUS_OK; } @@ -350,7 +367,7 @@ static struct db_record *db_rbt_fetch_locked(struct db_context *db_ctx, rec_priv = (struct db_rbt_rec *) ((char *)result + DBWRAP_RBT_ALIGN(sizeof(struct db_record))); - result->store = db_rbt_store; + result->storev = db_rbt_storev; result->delete_rec = db_rbt_delete; result->private_data = rec_priv; @@ -425,7 +442,7 @@ static int db_rbt_traverse_internal(struct db_context *db, ZERO_STRUCT(rec); rec.db = db; rec.private_data = &rec_priv; - rec.store = db_rbt_store; + rec.storev = db_rbt_storev; rec.delete_rec = db_rbt_delete; db_rbt_parse_node(rec_priv.node, &rec.key, &rec.value); diff --git a/lib/dbwrap/dbwrap_tdb.c b/lib/dbwrap/dbwrap_tdb.c index e12ec4405d6..9f8a9a602d1 100644 --- a/lib/dbwrap/dbwrap_tdb.c +++ b/lib/dbwrap/dbwrap_tdb.c @@ -35,7 +35,8 @@ struct db_tdb_ctx { } id; }; -static NTSTATUS db_tdb_store(struct db_record *rec, TDB_DATA data, int flag); +static NTSTATUS db_tdb_storev(struct db_record *rec, + const TDB_DATA *dbufs, int num_dbufs, int flag); static NTSTATUS db_tdb_delete(struct db_record *rec); static void db_tdb_log_key(const char *prefix, TDB_DATA key) @@ -137,7 +138,7 @@ static struct db_record *db_tdb_fetch_locked_internal( talloc_set_destructor(state.result, db_tdb_record_destr); state.result->private_data = ctx; - state.result->store = db_tdb_store; + state.result->storev = db_tdb_storev; state.result->delete_rec = db_tdb_delete; DEBUG(10, ("Allocated locked data 0x%p\n", state.result)); @@ -173,7 +174,6 @@ static struct db_record *db_tdb_try_fetch_locked( return db_tdb_fetch_locked_internal(db, mem_ctx, key); } - static int db_tdb_exists(struct db_context *db, TDB_DATA key) { struct db_tdb_ctx *ctx = talloc_get_type_abort( @@ -236,10 +236,12 @@ static NTSTATUS db_tdb_parse(struct db_context *db, TDB_DATA key, return NT_STATUS_OK; } -static NTSTATUS db_tdb_store(struct db_record *rec, TDB_DATA data, int flag) +static NTSTATUS db_tdb_storev(struct db_record *rec, + const TDB_DATA *dbufs, int num_dbufs, int flag) { struct db_tdb_ctx *ctx = talloc_get_type_abort(rec->private_data, struct db_tdb_ctx); + int ret; /* * This has a bug: We need to replace rec->value for correct @@ -247,8 +249,8 @@ static NTSTATUS db_tdb_store(struct db_record *rec, TDB_DATA data, int flag) * anymore after it was stored. */ - return (tdb_store(ctx->wtdb->tdb, rec->key, data, flag) == 0) ? - NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL; + ret = tdb_storev(ctx->wtdb->tdb, rec->key, dbufs, num_dbufs, flag); + return (ret == 0) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL; } static NTSTATUS db_tdb_delete(struct db_record *rec) @@ -282,7 +284,7 @@ static int db_tdb_traverse_func(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, rec.key = kbuf; rec.value = dbuf; - rec.store = db_tdb_store; + rec.storev = db_tdb_storev; rec.delete_rec = db_tdb_delete; rec.private_data = ctx->db->private_data; rec.db = ctx->db; @@ -304,7 +306,9 @@ static int db_tdb_traverse(struct db_context *db, return tdb_traverse(db_ctx->wtdb->tdb, db_tdb_traverse_func, &ctx); } -static NTSTATUS db_tdb_store_deny(struct db_record *rec, TDB_DATA data, int flag) +static NTSTATUS db_tdb_storev_deny(struct db_record *rec, + const TDB_DATA *dbufs, int num_dbufs, + int flag) { return NT_STATUS_MEDIA_WRITE_PROTECTED; } @@ -323,7 +327,7 @@ static int db_tdb_traverse_read_func(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA d rec.key = kbuf; rec.value = dbuf; - rec.store = db_tdb_store_deny; + rec.storev = db_tdb_storev_deny; rec.delete_rec = db_tdb_delete_deny; rec.private_data = ctx->db->private_data; rec.db = ctx->db; |