make clang happy about %lld

kelvich · kelvich · commit b07cf6f13f88 · 2016-09-19T19:03:12.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -91,7 +91,7 @@ static void MtmMonitor(Datum arg);
 static void MtmSendHeartbeat(void);
 static bool MtmSendToNode(int node, void const* buf, int size);
 
-
+/*
 static char const* const messageText[] = 
 {
 	"INVALID",
@@ -105,6 +105,7 @@ static char const* const messageText[] =
 	"POLL_REQUEST",
 	"POLL_STATUS"
 };
+*/
 
 static BackgroundWorker MtmSenderWorker = {
 	"mtm-sender",
@@ -362,7 +363,7 @@ static void MtmSendHeartbeat()
 					MTM_LOG2("Send heartbeat to node %d with timestamp %ld", i+1, now);    
 				}
 			} else { 
-				MTM_LOG1("Do not send heartbeat to node %d, busy mask %ld, status %d", i+1, busy_mask, Mtm->status);
+				MTM_LOG1("Do not send heartbeat to node %d, busy mask %lld, status %d", i+1, (long long) busy_mask, Mtm->status);
 			}
 		}
 	}
@@ -935,7 +936,9 @@ static void MtmReceiver(Datum arg)
 									CommitTransactionCommand();
 									Assert(ts->status == TRANSACTION_STATUS_ABORTED);
 								} else {
-									elog(LOG, "Receive response %d for transaction %s for node %d, votedMask=%lx, participantsMask=%lx", msg->status, msg->gid, node, ts->votedMask, ts->participantsMask & ~Mtm->disabledNodeMask);
+									elog(LOG, "Receive response %d for transaction %s for node %d, votedMask=%llx, participantsMask=%llx",
+										msg->status, msg->gid, node, (long long) ts->votedMask,
+										(long long) (ts->participantsMask & ~Mtm->disabledNodeMask) );
 									continue;
 								}
 							} else if (ts->status == TRANSACTION_STATUS_ABORTED && msg->status == TRANSACTION_STATUS_COMMITTED) {
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -1358,8 +1358,8 @@ static void MtmEnableNode(int nodeId)
 void MtmRecoveryCompleted(void)
 {
 	int i;
-	MTM_LOG1("Recovery of node %d is completed, disabled mask=%lx, connectivity mask=%lx, live nodes=%d", 
-			 MtmNodeId, Mtm->disabledNodeMask, Mtm->connectivityMask, Mtm->nLiveNodes);
+	MTM_LOG1("Recovery of node %d is completed, disabled mask=%llx, connectivity mask=%llx, live nodes=%d",
+			 MtmNodeId, (long long) Mtm->disabledNodeMask, (long long) Mtm->connectivityMask, Mtm->nLiveNodes);
 	MtmLock(LW_EXCLUSIVE);
 	Mtm->recoverySlot = 0;
 	BIT_CLEAR(Mtm->disabledNodeMask, MtmNodeId-1);
@@ -1719,7 +1719,7 @@ void MtmOnNodeDisconnect(int nodeId)
 	MtmLock(LW_EXCLUSIVE);
 	BIT_SET(Mtm->connectivityMask, nodeId-1);
 	BIT_SET(Mtm->reconnectMask, nodeId-1);
-	MTM_LOG1("Disconnect node %d connectivity mask %lx", nodeId, Mtm->connectivityMask);
+	MTM_LOG1("Disconnect node %d connectivity mask %llx", nodeId, (long long) Mtm->connectivityMask);
 	MtmUnlock();
 
 	if (!RaftableSet(psprintf("node-mask-%d", MtmNodeId), &Mtm->connectivityMask, sizeof Mtm->connectivityMask, false))
@@ -1764,7 +1764,7 @@ void MtmOnNodeConnect(int nodeId)
 	BIT_CLEAR(Mtm->reconnectMask, nodeId-1);
 	MtmUnlock();
 
-	MTM_LOG1("Reconnect node %d, connectivityMask=%lx", nodeId, Mtm->connectivityMask);
+	MTM_LOG1("Reconnect node %d, connectivityMask=%llx", nodeId, (long long) Mtm->connectivityMask);
 	RaftableSet(psprintf("node-mask-%d", MtmNodeId), &Mtm->connectivityMask, sizeof Mtm->connectivityMask, false); 
 }
 
diff --git a/contrib/raftable/raftable.c b/contrib/raftable/raftable.c
@@ -332,7 +332,7 @@ static RaftableMessage *raftable_try_query(RaftableMessage *msg, size_t size, si
 	RaftableMessage *answer;
 
 	s = get_connection(timeout);
-	if (s < 0) return false;
+	if (s < 0) return NULL;
 
 	if (timeout_happened(timeout))
 	{

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ static void MtmMonitor(Datum arg);`
`91`	`91`	`static void MtmSendHeartbeat(void);`
`92`	`92`	`static bool MtmSendToNode(int node, void const* buf, int size);`
`93`	`93`
`94`		`-`
	`94`	`+/*`
`95`	`95`	`static char const* const messageText[] =`
`96`	`96`	`{`
`97`	`97`	`"INVALID",`
`@@ -105,6 +105,7 @@ static char const* const messageText[] =`
`105`	`105`	`"POLL_REQUEST",`
`106`	`106`	`"POLL_STATUS"`
`107`	`107`	`};`
	`108`	`+*/`
`108`	`109`
`109`	`110`	`static BackgroundWorker MtmSenderWorker = {`
`110`	`111`	`"mtm-sender",`
`@@ -362,7 +363,7 @@ static void MtmSendHeartbeat()`
`362`	`363`	`MTM_LOG2("Send heartbeat to node %d with timestamp %ld", i+1, now);`
`363`	`364`	`}`
`364`	`365`	`} else {`
`365`		`- MTM_LOG1("Do not send heartbeat to node %d, busy mask %ld, status %d", i+1, busy_mask, Mtm->status);`
	`366`	`+ MTM_LOG1("Do not send heartbeat to node %d, busy mask %lld, status %d", i+1, (long long) busy_mask, Mtm->status);`
`366`	`367`	`}`
`367`	`368`	`}`
`368`	`369`	`}`
`@@ -935,7 +936,9 @@ static void MtmReceiver(Datum arg)`
`935`	`936`	`CommitTransactionCommand();`
`936`	`937`	`Assert(ts->status == TRANSACTION_STATUS_ABORTED);`
`937`	`938`	`} else {`
`938`		`- elog(LOG, "Receive response %d for transaction %s for node %d, votedMask=%lx, participantsMask=%lx", msg->status, msg->gid, node, ts->votedMask, ts->participantsMask & ~Mtm->disabledNodeMask);`
	`939`	`+ elog(LOG, "Receive response %d for transaction %s for node %d, votedMask=%llx, participantsMask=%llx",`
	`940`	`+ msg->status, msg->gid, node, (long long) ts->votedMask,`
	`941`	`+ (long long) (ts->participantsMask & ~Mtm->disabledNodeMask) );`
`939`	`942`	`continue;`
`940`	`943`	`}`
`941`	`944`	`} else if (ts->status == TRANSACTION_STATUS_ABORTED && msg->status == TRANSACTION_STATUS_COMMITTED) {`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ static RaftableMessage raftable_try_query(RaftableMessage msg, size_t size, si`
`332`	`332`	`RaftableMessage *answer;`
`333`	`333`
`334`	`334`	`s = get_connection(timeout);`
`335`		`- if (s < 0) return false;`
	`335`	`+ if (s < 0) return NULL;`
`336`	`336`
`337`	`337`	`if (timeout_happened(timeout))`
`338`	`338`	`{`