clean up headers

Author: kelvich

src/bgwpool.c

@@ -15,7 +15,7 @@
 #include "tcop/tcopprot.h"
 
 #include "bgwpool.h"
-#include "mm.h"
+#include "multimaster.h"
 #include "logger.h"
 
 bool MtmIsPoolWorker;
@@ -145,7 +145,7 @@ void BgwPoolInit(BgwPool* pool, BgwPoolExecutor executor, char const* dbname,  c
 	pool->bgwhandles = (BackgroundWorkerHandle **) ShmemAlloc(MtmMaxWorkers * sizeof(BackgroundWorkerHandle *));
     pool->queue = (char*)ShmemAlloc(queueSize);
 	if (pool->queue == NULL) { 
-		elog(PANIC, "Failed to allocate memory for background workers pool: %lld bytes requested", (long64)queueSize);
+		elog(PANIC, "Failed to allocate memory for background workers pool: %zd bytes requested", queueSize);
 	}
     pool->executor = executor;
 	pool->available = PGSemaphoreCreate();

src/bkb.c

@@ -1,9 +1,12 @@
 #include <stdint.h>
 #include "bkb.h"
 
+#define BIT_CHECK(mask, bit) (((mask) & ((nodemask_t)1 << (bit))) != 0)
+#define BIT_SET(mask, bit)   (mask |= ((nodemask_t)1 << (bit)))
+
 /*
  * Bron–Kerbosch algorithm to find maximum clique in graph
- */  
+ */
 
 typedef struct {
 	int size;

src/ddd.c

@@ -402,8 +402,8 @@ MtmDetectGlobalDeadLockForXid(TransactionId xid)
 	}
 	MtmGetGtid(xid, &gtid);
 	hasDeadlock = MtmGraphFindLoop(&graph, &gtid);
-	mtm_log(DeadlockCheck, "Distributed deadlock check by backend %d for %u:%llu = %d",
-		MyProcPid, gtid.node, (long64)gtid.xid, hasDeadlock);
+	mtm_log(DeadlockCheck, "Distributed deadlock check by backend %d for %u:" XID_FMT " = %d",
+		MyProcPid, gtid.node, gtid.xid, hasDeadlock);
 	// if (!hasDeadlock) {
 	// 	/* There is no deadlock loop in graph, but deadlock can be caused by lack of apply workers: if all of them are busy, then some transactions
 	// 	 * can not be appied just because there are no vacant workers and it cause additional dependency between transactions which is not
@@ -423,8 +423,8 @@ MtmDetectGlobalDeadLockForXid(TransactionId xid)
 	if (!hasDeadlock)
 	{
 		// TimestampTz start_time = get_timeout_start_time(DEADLOCK_TIMEOUT);
-		mtm_log(DeadlockCheck, "Enable deadlock timeout in backend %d for transaction %llu",
-				MyProcPid, (long64)xid);
+		mtm_log(DeadlockCheck, "Enable deadlock timeout in backend %d for transaction " XID_FMT,
+				MyProcPid, xid);
 		enable_timeout_after(DEADLOCK_TIMEOUT, DeadlockTimeout);
 		// set_timeout_start_time(DEADLOCK_TIMEOUT, start_time);
 	}
@@ -437,7 +437,7 @@ MtmDetectGlobalDeadLock(PGPROC* proc)
 {
 	PGXACT* pgxact = &ProcGlobal->allPgXact[proc->pgprocno];
 
-	mtm_log(DeadlockCheck, "Detect global deadlock for %llu by backend %d", (long64)pgxact->xid, MyProcPid);
+	mtm_log(DeadlockCheck, "Detect global deadlock for " XID_FMT " by backend %d", pgxact->xid, MyProcPid);
 
 	if (Mtm->status != MTM_ONLINE || !TransactionIdIsValid(pgxact->xid))
 		return false;
@@ -468,10 +468,10 @@ mtm_dump_lock_graph(PG_FUNCTION_ARGS)
 			appendStringInfo(s, "node-%d lock graph: ", i+1);
 			while (gtid != last) {
 				GlobalTransactionId *src = gtid++;
-				appendStringInfo(s, "%d:%llu -> ", src->node, (long64)src->xid);
+				appendStringInfo(s, "%d:"XID_FMT" -> ", src->node, src->xid);
 				while (gtid->node != 0) {
 					GlobalTransactionId *dst = gtid++;
-					appendStringInfo(s, "%d:%llu, ", dst->node, (long64)dst->xid);
+					appendStringInfo(s, "%d:"XID_FMT", ", dst->node, dst->xid);
 				}
 				gtid += 1;
 			}

src/include/bgwpool.h

@@ -6,9 +6,8 @@
 #include "storage/pg_sema.h"
 #include "postmaster/bgworker.h"
 #include "storage/condition_variable.h"
-#include "bkb.h" // XXX
 
-#include "mm.h"
+#include "receiver.h"
 
 typedef void(*BgwPoolExecutor)(void* work, size_t size, MtmReceiverContext *ctx);
 
@@ -23,8 +22,6 @@ typedef long timestamp_t;
 extern timestamp_t MtmGetSystemTime(void);   /* non-adjusted current system time */
 extern timestamp_t MtmGetCurrentTime(void);  /* adjusted current system time */
 
-extern int  MtmMaxWorkers;
-
 typedef struct
 {
     BgwPoolExecutor executor;

src/include/bkb.h

@@ -4,7 +4,10 @@
 #ifndef __BKB_H__
 #define __BKB_H__
 
-#include "mm.h"
+#include "postgres.h" /* nodemask_t */
+
+#define MAX_NODES sizeof(nodemask_t)
+typedef uint64 nodemask_t;
 
 extern nodemask_t MtmFindMaxClique(nodemask_t* matrix, int n_modes, int* clique_size);
 

src/include/ddl.h

@@ -14,6 +14,7 @@
 
 #include "utils/relcache.h"
 
+/* GUCs */
 extern bool		MtmMonotonicSequences;
 extern char	   *MtmRemoteFunctionsList;
 extern bool		MtmVolksWagenMode;

src/include/mm.h

@@ -1,85 +1,8 @@
-/*-------------------------------------------------------------------------
- *
- * mm.h
- *	General definitions
- *
- *
- * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- *-------------------------------------------------------------------------
- */
+
 #ifndef MM_H
 #define MM_H
 
-#include "postgres.h"
-
-#include "access/xact.h"
-
-#define MULTIMASTER_SCHEMA_NAME          "mtm"
-#define MULTIMASTER_LOCAL_TABLES_TABLE   "local_tables"
-
-#define MAX_NODES 64
-
-typedef char pgid_t[GIDSIZE];
-
-/* Identifier of global transaction */
-typedef struct
-{
-	int node;          /* One based id of node initiating transaction */
-	TransactionId xid; /* Transaction ID at this node */
-} GlobalTransactionId;
-
-typedef struct {
-	TransactionId xid;	  /* local transaction ID	*/
-	bool  isTwoPhase;	  /* user level 2PC */
-	bool  isDistributed;  /* transaction performed INSERT/UPDATE/DELETE and has to be replicated to other nodes */
-	bool  containsDML;	  /* transaction contains DML statements */
-	pgid_t gid;			  /* global transaction identifier (used by 2pc) */
-} MtmCurrentTrans;
-
-
-typedef struct MtmSeqPosition
-{
-	Oid		seqid;
-	int64	next;
-} MtmSeqPosition;
-
-typedef struct
-{
-	int node_id;
-	bool is_recovery;
-	bool parallel_allowed;
-	TimestampTz session_id;
-	// XXX
-	XLogRecPtr end_lsn;
-} MtmReceiverContext;
-
-/* XXX: drop that */
-typedef long long long64; /* we are not using int64 here because we want to use %lld format for this type */
-typedef unsigned long long ulong64; /* we are not using uint64 here because we want to use %lld format for this type */
-
-typedef ulong64 nodemask_t;
-
-
-#define BIT_CHECK(mask, bit) (((mask) & ((nodemask_t)1 << (bit))) != 0)
-#define BIT_CLEAR(mask, bit) (mask &= ~((nodemask_t)1 << (bit)))
-#define BIT_SET(mask, bit)   (mask |= ((nodemask_t)1 << (bit)))
-#define ALL_BITS ((nodemask_t)~0)
-
-extern bool				MtmIsLogicalReceiver;
-extern bool				MtmIsReceiver;
-extern bool				MtmIsPoolWorker;
-
-extern bool				MtmBackgroundWorker;
-extern int				MtmMaxNodes;
-extern int				MtmNodeId;
-extern MtmCurrentTrans	MtmTx;
-extern MemoryContext	MtmApplyContext;
-extern char			   *MtmDatabaseUser;
-
 
-extern bool		MtmTwoPhaseCommit(MtmCurrentTrans* x);