Change xit_t to 32 bit

knizhnik · knizhnik · commit 036037267fad · 2015-10-14T13:04:38.000+03:00
diff --git a/contrib/pg_dtm/dtmd/include/clog.h b/contrib/pg_dtm/dtmd/include/clog.h
@@ -10,7 +10,7 @@
 
 #define INVALID_XID 0
 #define MIN_XID 42
-#define MAX_XID 0xdeadbeefcafebabe
+#define MAX_XID ~0
 
 #define BLANK    0
 #define POSITIVE 1
diff --git a/contrib/pg_dtm/dtmd/include/int.h b/contrib/pg_dtm/dtmd/include/int.h
@@ -1,6 +1,6 @@
 #ifndef INT_H
 #define INT_H
 
-typedef unsigned long long xid_t;
+typedef unsigned xid_t;
 
 #endif
diff --git a/contrib/pg_dtm/dtmd/src/clog.c b/contrib/pg_dtm/dtmd/src/clog.c
@@ -120,7 +120,7 @@ int clog_read(clog_t clog, xid_t xid) {
 		return status;
 	} else {
 		shout(
-			"xid %016llx status is out of range, "
+			"xid %016x status is out of range, "
 			"you might be experiencing a bug in backend\n",
 			xid
 		);
diff --git a/contrib/pg_dtm/dtmd/src/main.c b/contrib/pg_dtm/dtmd/src/main.c
@@ -117,7 +117,7 @@ static void ondisconnect(client_t client) {
 					transactions_count--;
 				} else {
 					shout(
-						"[%d] DISCONNECT: transaction %llu"
+						"[%d] DISCONNECT: transaction %u"
 						" failed to abort O_o\n",
 						CLIENT_ID(client), t->xid
 					);
@@ -128,7 +128,7 @@ static void ondisconnect(client_t client) {
 
 		if (i < 0) {
 			shout(
-				"[%d] DISCONNECT: transaction %llu not found O_o\n",
+				"[%d] DISCONNECT: transaction %u not found O_o\n",
 				CLIENT_ID(client), CLIENT_XID(client)
 			);
 		}
@@ -154,7 +154,7 @@ static void debug_cmd(client_t client, int argc, xid_t *argv) {
 	debug("[%d] %s", CLIENT_ID(client), cmdname);
 	int i;
 	for (i = 1; i < argc; i++) {
-		debug(" %llu", argv[i]);
+		debug(" %u", argv[i]);
 	}
 	debug("\n");
 }
@@ -209,14 +209,14 @@ static void onreserve(client_t client, int argc, xid_t *argv) {
 	xid_t maxxid = minxid + minsize - 1;
 
 	debug(
-		"[%d] RESERVE: asked for range %llu-%llu\n",
+		"[%d] RESERVE: asked for range %u-%u\n",
 		CLIENT_ID(client),
 		minxid, maxxid
 	);
 
 	if ((prev_gxid >= minxid) || (maxxid >= next_gxid)) {
 		debug(
-			"[%d] RESERVE: local range %llu-%llu is not between global range %llu-%llu\n",
+			"[%d] RESERVE: local range %u-%u is not between global range %u-%u\n",
 			CLIENT_ID(client),
 			minxid, maxxid,
 			prev_gxid, next_gxid
@@ -227,7 +227,7 @@ static void onreserve(client_t client, int argc, xid_t *argv) {
 		next_gxid = maxxid + 1;
 	}
 	debug(
-		"[%d] RESERVE: allocating range %llu-%llu\n",
+		"[%d] RESERVE: allocating range %u-%u\n",
 		CLIENT_ID(client),
 		minxid, maxxid
 	);
@@ -289,7 +289,7 @@ static void onbegin(client_t client, int argc, xid_t *argv) {
 
 	if (!clog_write(clg, t->xid, DOUBT)) {
 		shout(
-			"[%d] BEGIN: transaction %llu failed"
+			"[%d] BEGIN: transaction %u failed"
 			" to initialize clog bits O_o\n",
 			CLIENT_ID(client), t->xid
 		);
@@ -335,7 +335,7 @@ static bool queue_for_transaction_finish(client_t client, xid_t xid, char cmd) {
 	Transaction *t = find_transaction(xid);
 	if (t == NULL) {
 		shout(
-			"[%d] QUEUE: xid %llu not found\n",
+			"[%d] QUEUE: xid %u not found\n",
 			CLIENT_ID(client), xid
 		);
 		client_message_shortcut(client, RES_FAILED);
@@ -366,7 +366,7 @@ static void onvote(client_t client, int argc, xid_t *argv, int vote) {
 	Transaction *t = find_transaction(xid);
 	if (t == NULL) {
 		shout(
-			"[%d] VOTE: xid %llu not found\n",
+			"[%d] VOTE: xid %u not found\n",
 			CLIENT_ID(client), xid
 		);
 		client_message_shortcut(client, RES_FAILED);
@@ -441,7 +441,7 @@ static void onsnapshot(client_t client, int argc, xid_t *argv) {
 	Transaction *t = find_transaction(xid);
 	if (t == NULL) {
 		shout(
-			"[%d] SNAPSHOT: xid %llu not found\n",
+			"[%d] SNAPSHOT: xid %u not found\n",
 			CLIENT_ID(client), xid
 		);
 		client_message_shortcut(client, RES_FAILED);
@@ -529,7 +529,7 @@ static void onstatus(client_t client, int argc, xid_t *argv) {
 
 static void onnoise(client_t client, int argc, xid_t *argv) {
 	shout(
-		"[%d] NOISE: unknown command '%c' (%lld)\n",
+		"[%d] NOISE: unknown command '%c' (%d)\n",
 		CLIENT_ID(client),
 		(char)argv[0], argv[0]
 	);
diff --git a/contrib/pg_dtm/dtmd/src/snapshot.c b/contrib/pg_dtm/dtmd/src/snapshot.c
@@ -10,7 +10,7 @@
 //}
 
 static void append_hex16(char **cursorp, xid_t value) {
-	int written = sprintf(*cursorp, "%016llx", value);
+	int written = sprintf(*cursorp, "%016x", value);
 	assert(written == 16);
 	*cursorp += written;
 }
diff --git a/contrib/pg_dtm/libdtm.c b/contrib/pg_dtm/libdtm.c
@@ -31,7 +31,7 @@ static char *dtmhost = NULL;
 static int dtmport = 0;
 static char* dtm_unix_sock_dir;
 
-typedef unsigned long long xid_t;
+typedef unsigned xid_t;
 
 // Connects to the specified DTM.
 static DTMConn DtmConnect(char *host, int port)
diff --git a/contrib/pg_dtm/tests/transfers.sh b/contrib/pg_dtm/tests/transfers.sh
@@ -5,6 +5,6 @@ go run transfers.go \
 	-d 'dbname=postgres port=5433' \
 	-v \
 	-m \
-	-u 1000 \
+	-u 10000 \
 	-w 10 \
 	-g

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`//}`
`11`	`11`
`12`	`12`	`static void append_hex16(char **cursorp, xid_t value) {`
`13`		`- int written = sprintf(*cursorp, "%016llx", value);`
	`13`	`+ int written = sprintf(*cursorp, "%016x", value);`
`14`	`14`	`assert(written == 16);`
`15`	`15`	`*cursorp += written;`
`16`	`16`	`}`