From: Gregor Beck <gbeck@sernet.de>
Date: Thu, 22 Sep 2011 11:58:24 +0000 (+0200)
Subject: s3:dbwrap: traverse records created within this transaction.
X-Git-Url: http://git.samba.org/?p=obnox%2Fsamba%2Fsamba-obnox.git;a=commitdiff_plain;h=a6cd71da858062a66f83775cf655b79b6c8d75e7

s3:dbwrap: traverse records created within this transaction.

Signed-off-by: Michael Adam <obnox@samba.org>
---

diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 5823ab4695d..95c23eeb425 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -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;
 	}