fix warnings in clang about long long formats

kelvich · kelvich · commit 2ca51b455f20 · 2016-04-08T17:05:05.000+03:00
diff --git a/contrib/mmts/Makefile b/contrib/mmts/Makefile
@@ -3,15 +3,15 @@ OBJS = multimaster.o raftable.o arbiter.o bytebuf.o bgwpool.o pglogical_output.o
 
 override CPPFLAGS += -I../raftable
 
-SCRIPTS_built = tests/dtmbench
+#SCRIPTS_built = tests/dtmbench
 EXTRA_INSTALL = contrib/raftable contrib/mmts
 
 EXTENSION = multimaster
 DATA = multimaster--1.0.sql
 
 .PHONY: all
 
-all: multimaster.so tests/dtmbench
+all: multimaster.so #tests/dtmbench
 
 tests/dtmbench:
 	make -C tests
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -105,17 +105,18 @@ static int       gateway;
 static void MtmTransSender(Datum arg);
 static void MtmTransReceiver(Datum arg);
 
-static char const* const messageText[] = 
-{
-	"INVALID",
-	"HANDSHAKE",
-	"READY",
-	"PREPARE",
-	"PREPARED",
-	"ABORTED",
-	"STATUS"
-};
-
+/*
+ * static char const* const messageText[] = 
+ * {
+ *	"INVALID",
+ *	"HANDSHAKE",
+ *	"READY",
+ *	"PREPARE",
+ *	"PREPARED",
+ *	"ABORTED",
+ *	"STATUS"
+ *};
+ */
 
 static BackgroundWorker MtmSender = {
 	"mtm-sender",
@@ -715,7 +716,7 @@ static void MtmTransReceiver(Datum arg)
 								/* Coordinator's disabled mask is wider than of this node: so reject such transaction to avoid 
 								   commit on smaller subset of nodes */
 								elog(WARNING, "Coordinator of distributed transaction see less nodes than node %d: %lx instead of %lx",
-									 msg->node, Mtm->disabledNodeMask, msg->disabledNodeMask);
+									 msg->node, (long) Mtm->disabledNodeMask, (long) msg->disabledNodeMask);
 								MtmAbortTransaction(ts);
 							}
 
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -879,7 +879,7 @@ void MtmJoinTransaction(GlobalTransactionId* gtid, csn_t globalSnapshot)
 	if (!TransactionIdIsValid(gtid->xid)) { 
 		/* In case of recovery InvalidTransactionId is passed */
 		if (Mtm->status != MTM_RECOVERY) { 
-			elog(PANIC, "Node %d tries to recover node %d which is in %s mode", MtmReplicationNode, MtmNodeId,  MtmNodeStatusMnem[Mtm->status]);
+			elog(PANIC, "Node %d tries to recover node %d which is in %s mode", MtmReplicationNodeId, MtmNodeId,  MtmNodeStatusMnem[Mtm->status]);
 		}
 	} else if (Mtm->status == MTM_RECOVERY) { 
 		/* When recovery is completed we get normal transaction ID and switch to normal mode */
@@ -1138,7 +1138,7 @@ MtmCheckClusterLock()
 			} else {  
 				/* All lockers are synchronized their logs */
 				/* Remove lock and mark them as receovered */
-				elog(WARNING, "Complete recovery of %d nodes (node mask %lx)", Mtm->nLockers, Mtm->nodeLockerMask);
+				elog(WARNING, "Complete recovery of %d nodes (node mask %lx)", Mtm->nLockers, (long) Mtm->nodeLockerMask);
 				Assert(Mtm->walSenderLockerMask == 0);
 				Assert((Mtm->nodeLockerMask & Mtm->disabledNodeMask) == Mtm->nodeLockerMask);
 				Mtm->disabledNodeMask &= ~Mtm->nodeLockerMask;
@@ -1198,7 +1198,7 @@ bool MtmRefreshClusterStatus(bool nowait)
 
 	clique = MtmFindMaxClique(matrix, MtmNodes, &clique_size);
 	if (clique_size >= MtmNodes/2+1) { /* have quorum */
-		elog(WARNING, "Find clique %lx, disabledNodeMask %lx", clique, Mtm->disabledNodeMask);
+		elog(WARNING, "Find clique %lx, disabledNodeMask %lx", (long) clique, (long) Mtm->disabledNodeMask);
 		MtmLock(LW_EXCLUSIVE);
 		mask = ~clique & (((nodemask_t)1 << MtmNodes)-1) & ~Mtm->disabledNodeMask; /* new disabled nodes mask */
 		for (i = 0; mask != 0; i++, mask >>= 1) {
@@ -1226,7 +1226,7 @@ bool MtmRefreshClusterStatus(bool nowait)
 			MtmSwitchClusterMode(MTM_RECOVERY);
 		}
 	} else { 
-		elog(WARNING, "Clique %lx has no quorum", clique);
+		elog(WARNING, "Clique %lx has no quorum", (long) clique);
 		MtmSwitchClusterMode(MTM_IN_MINORITY);
 	}
 	return true;
@@ -1236,12 +1236,12 @@ void MtmCheckQuorum(void)
 {
 	if (Mtm->nNodes < MtmNodes/2+1) {
 		if (Mtm->status == MTM_ONLINE) { /* out of quorum */
-			elog(WARNING, "Node is in minority: disabled mask %lx", Mtm->disabledNodeMask);
+			elog(WARNING, "Node is in minority: disabled mask %lx", (long) Mtm->disabledNodeMask);
 			MtmSwitchClusterMode(MTM_IN_MINORITY);
 		}
 	} else {
 		if (Mtm->status == MTM_IN_MINORITY) { 
-			elog(WARNING, "Node is in majority: dissbled mask %lx", Mtm->disabledNodeMask);
+			elog(WARNING, "Node is in majority: dissbled mask %lx", (long) Mtm->disabledNodeMask);
 			MtmSwitchClusterMode(MTM_ONLINE);
 		}
 	}
@@ -2229,7 +2229,7 @@ MtmNoticeReceiver(void *i, const PGresult *res)
 	/* Strip "NOTICE:  " from beginning and "\n" from end of error string */
 	strncpy(stripped_notice, notice + 9, len - 1 - 9);
 
-	elog(NOTICE, stripped_notice);
+	elog(NOTICE, "%s", stripped_notice);
 	pfree(stripped_notice);
 }
 
@@ -2273,7 +2273,7 @@ static void MtmBroadcastUtilityStmt(char const* sql, bool ignoreError)
 			if (MtmGUCBufferAllocated && !MtmRunUtilityStmt(conns[i], MtmGUCBuffer->data, &utility_errmsg) && !ignoreError)
 			{
 				errorMsg = "Failed to set GUC variables at node %d";
-				elog(ERROR, utility_errmsg);
+				elog(NOTICE, "%s", utility_errmsg);
 				failedNode = i;
 				break;
 			}
@@ -2289,7 +2289,7 @@ static void MtmBroadcastUtilityStmt(char const* sql, bool ignoreError)
 					errorMsg = utility_errmsg;
 				else
 				{
-					elog(ERROR, utility_errmsg);
+					elog(ERROR, "%s", utility_errmsg);
 					errorMsg = "Failed to run command at node %d";
 				}
 
diff --git a/contrib/mmts/pglogical_output.c b/contrib/mmts/pglogical_output.c
@@ -493,7 +493,6 @@ pg_decode_origin_filter(LogicalDecodingContext *ctx,
 	}
 
 	if (!data->forward_changesets && origin_id != InvalidRepOriginId) {
-		*(int*)0 = 0;
 		return true;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,6 @@ pg_decode_origin_filter(LogicalDecodingContext *ctx,`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`if (!data->forward_changesets && origin_id != InvalidRepOriginId) {`
`496`		`- (int)0 = 0;`
`497`	`496`	`return true;`
`498`	`497`	`}`
`499`	`498`