Sort snapshot when it is generated instead of inside the serialization procedure.

kvap · kvap · commit aad5eaef2258 · 2015-09-09T22:04:29.000+03:00
diff --git a/contrib/pg_xtm/dtmd/include/snapshot.h b/contrib/pg_xtm/dtmd/include/snapshot.h
@@ -15,5 +15,6 @@ typedef struct Snapshot {
 } Snapshot;
 
 char *snapshot_serialize(Snapshot *s);
+void snapshot_sort(Snapshot *s);
 
 #endif
diff --git a/contrib/pg_xtm/dtmd/src/main.c b/contrib/pg_xtm/dtmd/src/main.c
@@ -255,6 +255,7 @@ static void gen_snapshot(Snapshot *s, int node) {
 			s->active[s->nactive++] = t->xid;
 		}
 	}
+	snapshot_sort(s);
 	s->seqno++;
 }
 
diff --git a/contrib/pg_xtm/dtmd/src/snapshot.c b/contrib/pg_xtm/dtmd/src/snapshot.c
@@ -15,11 +15,14 @@ static void append_hex16(char **cursorp, xid_t value) {
 	*cursorp += written;
 }
 
-static int compare_xid(void const* x, void const* y, size_t size)
-{
-    xid_t xid1 = *(xid_t*)x; 
-    xid_t xid2 = *(xid_t*)y;
-    return xid1 < xid2 ? -1 : xid1 == xid2 ? 0 : 1;
+static int compare_xid(void const* x, void const* y) {
+	xid_t xid1 = *(xid_t*)x;
+	xid_t xid2 = *(xid_t*)y;
+	return xid1 < xid2 ? -1 : xid1 == xid2 ? 0 : 1;
+}
+
+void snapshot_sort(Snapshot *s) {
+	qsort(s->active, s->nactive, sizeof(xid_t), compare_xid);
 }
    
 char *snapshot_serialize(Snapshot *s) {
@@ -37,7 +40,6 @@ char *snapshot_serialize(Snapshot *s) {
 	append_hex16(&cursor, s->xmax);
 	append_hex16(&cursor, s->nactive);
 
-    qsort(s->active, s->nactive, sizeof(xid_t), compare_xid);
 	int i;
 	for (i = 0; i < s->nactive; i++) {
 		append_hex16(&cursor, s->active[i]);

Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,7 @@ static void gen_snapshot(Snapshot *s, int node) {`
`255`	`255`	`s->active[s->nactive++] = t->xid;`
`256`	`256`	`}`
`257`	`257`	`}`
	`258`	`+ snapshot_sort(s);`
`258`	`259`	`s->seqno++;`
`259`	`260`	`}`
`260`	`261`