sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-24 02:04:21 +03:00
Code

s3:dbwrap: traverse records created within this transaction.

Browse Source 
Signed-off-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Gregor Beck 2011-09-22 13:58:24 +02:00 committed by Michael Adam
parent 240d6217dd
commit a6cd71da85
1 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
source3/lib/dbwrap/dbwrap_ctdb.c
View File

@ -1285,6 +1285,13 @@ done:
return ret;
}
/* wrapper to use traverse_persistent_callback with dbwrap */
static int traverse_persistent_callback_dbwrap(struct db_record *rec, void* data)
{
return traverse_persistent_callback(NULL, rec->key, rec->value, data);
}
static int db_ctdb_traverse(struct db_context *db,
int (*fn)(struct db_record *rec,
void *private_data),
@ -1299,9 +1306,40 @@ static int db_ctdb_traverse(struct db_context *db,
state.private_data = private_data;
if (db->persistent) {
struct tdb_context *ltdb = ctx->wtdb->tdb;
int ret;
/* for persistent databases we don't need to do a ctdb traverse,
we can do a faster local traverse */
return tdb_traverse(ctx->wtdb->tdb, traverse_persistent_callback, &state);
ret = tdb_traverse(ltdb, traverse_persistent_callback, &state);
if (ret < 0) {
return ret;
}
if (ctx->transaction && ctx->transaction->m_write) {
/* we now have to handle keys not yet present at transaction start */
struct db_context *newkeys = db_open_rbt(talloc_tos());
struct ctdb_marshall_buffer *mbuf = ctx->transaction->m_write;
struct ctdb_rec_data *rec=NULL;
NTSTATUS status;
int i;
for (i=0; i<mbuf->count; i++) {
TDB_DATA key;
rec =db_ctdb_marshall_loop_next(mbuf, rec,
NULL, NULL,
&key, NULL);
SMB_ASSERT(rec != NULL);
if (!tdb_exists(ltdb, key)) {
dbwrap_store(newkeys, key, tdb_null, 0);
}
}
status = dbwrap_traverse(newkeys,
traverse_persistent_callback_dbwrap,
&state);
ret = NT_STATUS_IS_OK(status) ? 0 : -1;
talloc_free(newkeys);
}
return ret;
}