Define constant for precommitted state

knizhnik · kelvich · commit aa6d5cf078ae · 2017-11-13T02:17:34.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -975,7 +975,7 @@ MtmVotingCompleted(MtmTransState* ts)
 				return true;
 			} else if (MtmUseDtm) {
 				ts->votedMask = 0;
-				SetPrepareTransactionState(ts->gid, "precommitted");
+				SetPrepareTransactionState(ts->gid, MULTIMASTER_PRECOMMITTED);
 				//MtmSend2PCMessage(ts, MSG_PRECOMMIT);
 				return false;
 			} else {
@@ -1131,7 +1131,7 @@ MtmCommitPreparedTransaction(MtmCurrentTrans* x)
 		ts->votedMask = 0;
 		ts->procno = MyProc->pgprocno;
 		MTM_TXTRACE(ts, "Coordinator sends MSG_PRECOMMIT");
-		SetPrepareTransactionState(ts->gid, "precommitted");
+		SetPrepareTransactionState(ts->gid, MULTIMASTER_PRECOMMITTED);
 		//MtmSend2PCMessage(ts, MSG_PRECOMMIT);
 
 		Mtm2PCVoting(x, ts);
@@ -1374,7 +1374,7 @@ static void	MtmLoadPreparedTransactions(void)
 			Mtm->nActiveTransactions += 1;
 			ts->isEnqueued = false;
 			ts->isActive = true;
-			ts->status = strcmp(pxacts[i].state_3pc, "precommitted") == 0 ? TRANSACTION_STATUS_UNKNOWN : TRANSACTION_STATUS_IN_PROGRESS;
+			ts->status = strcmp(pxacts[i].state_3pc, MULTIMASTER_PRECOMMITTED) == 0 ? TRANSACTION_STATUS_UNKNOWN : TRANSACTION_STATUS_IN_PROGRESS;
 			ts->isLocal = true;
 			ts->isPrepared = false;
 			ts->isPinned = false;
diff --git a/multimaster.h b/multimaster.h
@@ -10,8 +10,13 @@
 #include "commands/vacuum.h"
 #include "libpq-fe.h"
 
+#ifndef DEBUG_LEVEL
 #define  DEBUG_LEVEL 0
-#define  MTM_TRACE   1
+#endif
+
+#ifndef MTM_TRACE
+#define  MTM_TRACE   0
+#endif
 
 #if DEBUG_LEVEL == 0
 #define MTM_LOG1(fmt, ...) elog(LOG, fmt, ## __VA_ARGS__) 
@@ -35,7 +40,7 @@
 #define MTM_LOG4(fmt, ...) fprintf(stderr, fmt "\n", ## __VA_ARGS__) 
 #endif
 
-#ifndef MTM_TRACE
+#if MTM_TRACE
 #define MTM_TXTRACE(tx, event)
 #else
 #define MTM_TXTRACE(tx, event) \
@@ -58,6 +63,7 @@
 #define MULTIMASTER_LOCK_BUF_INIT_SIZE  4096
 #define MULTIMASTER_BROADCAST_SERVICE   "mtm_broadcast"
 #define MULTIMASTER_ADMIN               "mtm_admin"
+#define MULTIMASTER_PRECOMMITTED        "precommitted"
 
 #define MULTIMASTER_DEFAULT_ARBITER_PORT 5433
 
