use timestamp in GIDs

kelvich · kelvich · commit e75fbe6b2b07 · 2018-01-29T18:22:09.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -4598,7 +4598,7 @@ static void
 MtmGenerateGid(char* gid)
 {
 	static int localCount;
-	sprintf(gid, "MTM-%d-%d-%d", MtmNodeId, MyProcPid, ++localCount);
+	sprintf(gid, "MTM-%d-%d-%d-%ld", MtmNodeId, MyProcPid, ++localCount, (int64) GetCurrentTimestamp());
 }
 
 /*
diff --git a/multimaster.h b/multimaster.h
@@ -64,7 +64,7 @@
 #define MULTIMASTER_SLOT_PATTERN         "mtm_slot_%d"
 #define MULTIMASTER_MIN_PROTO_VERSION    1
 #define MULTIMASTER_MAX_PROTO_VERSION    1
-#define MULTIMASTER_MAX_GID_SIZE         32
+#define MULTIMASTER_MAX_GID_SIZE         42
 #define MULTIMASTER_MAX_SLOT_NAME_SIZE   16
 #define MULTIMASTER_MAX_CONN_STR_SIZE    128
 #define MULTIMASTER_MAX_HOST_NAME_SIZE   64

Original file line number	Diff line number	Diff line change
`@@ -4598,7 +4598,7 @@ static void`
`4598`	`4598`	`MtmGenerateGid(char* gid)`
`4599`	`4599`	`{`
`4600`	`4600`	`static int localCount;`
`4601`		`- sprintf(gid, "MTM-%d-%d-%d", MtmNodeId, MyProcPid, ++localCount);`
	`4601`	`+ sprintf(gid, "MTM-%d-%d-%d-%ld", MtmNodeId, MyProcPid, ++localCount, (int64) GetCurrentTimestamp());`
`4602`	`4602`	`}`
`4603`	`4603`
`4604`	`4604`	`/*`