wip: porting to pgproee 14

Mikhail Rutman · Mikhail Rutman · commit 77a38b202575 · 2022-01-30T13:01:23.000+07:00
diff --git a/Makefile b/Makefile
@@ -69,7 +69,7 @@ all: multimaster.so
 
 submake-regress:
 	$(MAKE) -C $(top_builddir)/src/test/regress all
-	$(MAKE) -C $(top_builddir)/src/test/regress tablespace-setup
+#	$(MAKE) -C $(top_builddir)/src/test/regress tablespace-setup
 
 # all .pl tests should pass now, but let's see what the buildfarm says
 # ifndef MTM_ALL
diff --git a/src/commit.c b/src/commit.c
@@ -482,9 +482,9 @@ MtmTwoPhaseCommit(void)
 		 * XXX: check the same xact block stuff in case of cleanup
 		 */
 #ifdef PGPRO_EE
-		if (IsTransactionState())
-			SuspendTransaction();
-		else
+//		if (IsTransactionState())
+//			SuspendTransaction();
+//		else
 #endif
 			StartTransactionCommand();
 
diff --git a/src/ddl.c b/src/ddl.c
@@ -119,7 +119,7 @@ static void MtmSeqNextvalHook(Oid seqid, int64 next);
 static void MtmExecutorStart(QueryDesc *queryDesc, int eflags);
 static void MtmExecutorFinish(QueryDesc *queryDesc);
 
-static void MtmProcessUtility(PlannedStmt *pstmt, const char *queryString,
+static void MtmProcessUtility(PlannedStmt *pstmt, const char *queryString, bool readOnlyTree,
 							  ProcessUtilityContext context, ParamListInfo params,
 							  QueryEnvironment *queryEnv, DestReceiver *dest,
 							  QueryCompletion *qc);
@@ -359,7 +359,7 @@ MtmGucInit(void)
 	MtmGucHash = hash_create("MtmGucHash",
 							 MTM_GUC_HASHSIZE,
 							 &hash_ctl,
-							 HASH_ELEM | HASH_CONTEXT);
+							 HASH_ELEM | HASH_CONTEXT | HASH_STRINGS);
 
 	/*
 	 * If current role is not equal to MtmDatabaseUser, than set it before any
@@ -661,7 +661,7 @@ MtmFinishDDLCommand()
 
 
 static void
-MtmProcessUtility(PlannedStmt *pstmt, const char *queryString,
+MtmProcessUtility(PlannedStmt *pstmt, const char *queryString, bool readOnlyTree,
 				  ProcessUtilityContext context, ParamListInfo params,
 				  QueryEnvironment *queryEnv, DestReceiver *dest,
 				  QueryCompletion *qc)
@@ -677,13 +677,13 @@ MtmProcessUtility(PlannedStmt *pstmt, const char *queryString,
 	{
 		if (PreviousProcessUtilityHook != NULL)
 		{
-			PreviousProcessUtilityHook(pstmt, queryString,
+			PreviousProcessUtilityHook(pstmt, queryString, readOnlyTree,
 									   context, params, queryEnv,
 									   dest, qc);
 		}
 		else
 		{
-			standard_ProcessUtility(pstmt, queryString,
+			standard_ProcessUtility(pstmt, queryString, readOnlyTree,
 									context, params, queryEnv,
 									dest, qc);
 		}
@@ -841,13 +841,17 @@ MtmProcessUtilityReceiver(PlannedStmt *pstmt, const char *queryString,
 
 	if (PreviousProcessUtilityHook != NULL)
 	{
-		PreviousProcessUtilityHook(pstmt, queryString,
+		bool readOnlyTree = false;
+
+		PreviousProcessUtilityHook(pstmt, queryString, readOnlyTree,
 								   context, params, queryEnv,
 								   dest, qc);
 	}
 	else
 	{
-		standard_ProcessUtility(pstmt, queryString,
+		bool readOnlyTree = false;
+
+		standard_ProcessUtility(pstmt, queryString, readOnlyTree,
 								context, params, queryEnv,
 								dest, qc);
 	}
@@ -1188,13 +1192,17 @@ MtmProcessUtilitySender(PlannedStmt *pstmt, const char *queryString,
 
 	if (PreviousProcessUtilityHook != NULL)
 	{
-		PreviousProcessUtilityHook(pstmt, queryString,
+		bool readOnlyTree = false;
+
+		PreviousProcessUtilityHook(pstmt, queryString, readOnlyTree,
 								   context, params, queryEnv,
 								   dest, qc);
 	}
 	else
 	{
-		standard_ProcessUtility(pstmt, queryString,
+		bool readOnlyTree = false;
+
+		standard_ProcessUtility(pstmt, queryString, readOnlyTree,
 								context, params, queryEnv,
 								dest, qc);
 	}
@@ -1312,11 +1320,17 @@ MtmExecutorFinish(QueryDesc *queryDesc)
 		if (operation == CMD_INSERT || operation == CMD_UPDATE ||
 			operation == CMD_DELETE || pstmt->hasModifyingCTE)
 		{
-			int			i;
+//			int			i;
 
-			for (i = 0; i < estate->es_num_result_relations; i++)
-			{
-				Relation	rel = estate->es_result_relations[i].ri_RelationDesc;
+//			for (i = 0; i < estate->es_num_result_relations; i++)
+//			{
+//
+			ListCell   *l;
+
+			foreach(l, estate->es_opened_result_relations)                                                                                                                                             
+			{                                                                                                                                                                                          
+				ResultRelInfo *resultRelInfo = lfirst(l);                                                                                                                                              
+				Relation	rel = resultRelInfo->ri_RelationDesc;
 
 				/*
 				 * Don't run 3pc unless we modified at least one non-local table.
@@ -1710,7 +1724,7 @@ MtmInitializeRemoteFunctionsMap()
 		if (q != NULL)
 			*q++ = '\0';
 
-		clist = FuncnameGetCandidates(stringToQualifiedNameList(p), -1, NIL, false, false, true);
+		clist = FuncnameGetCandidates(stringToQualifiedNameList(p), -1, NIL, false, false, true, true);
 		if (clist == NULL)
 			mtm_log(DEBUG1, "Can't resolve function '%s', postponing that", p);
 		else
@@ -1725,7 +1739,7 @@ MtmInitializeRemoteFunctionsMap()
 		p = q;
 	} while (p != NULL);
 
-	clist = FuncnameGetCandidates(stringToQualifiedNameList("mtm.alter_sequences"), -1, NIL, false, false, true);
+	clist = FuncnameGetCandidates(stringToQualifiedNameList("mtm.alter_sequences"), -1, NIL, false, false, true, true);
 	if (clist != NULL)
 		hash_search(MtmRemoteFunctions, &clist->oid, HASH_ENTER, NULL);
 
diff --git a/src/dmq.c b/src/dmq.c
@@ -367,7 +367,7 @@ dmq_shmem_startup_hook(void)
 									  DMQ_MAX_SUBS_PER_BACKEND * MaxBackends,
 									  DMQ_MAX_SUBS_PER_BACKEND * MaxBackends,
 									  &hash_info,
-									  HASH_ELEM);
+									  HASH_ELEM | HASH_STRINGS);
 
 	LWLockRelease(AddinShmemInitLock);
 }
@@ -388,6 +388,7 @@ dmq_init(int send_timeout, int connect_timeout)
 {
 	BackgroundWorker worker;
 
+	mtm_log(LOG, "------> dmq_init starting");
 	if (!process_shared_preload_libraries_in_progress)
 		return;
 
@@ -414,6 +415,7 @@ dmq_init(int send_timeout, int connect_timeout)
 	/* Register shmem hooks */
 	PreviousShmemStartupHook = shmem_startup_hook;
 	shmem_startup_hook = dmq_shmem_startup_hook;
+	mtm_log(LOG, "------> dmq_init started");
 }
 
 static Size
@@ -516,6 +518,8 @@ dmq_sender_main(Datum main_arg)
 	 */
 	int			sconn_cnt[DMQ_MAX_DESTINATIONS];
 	double		prev_timer_at = dmq_now();
+	
+	mtm_log(LOG, "------> dmq_sender starting");
 
 	MtmBackgroundWorker = true; /* includes bgw name in mtm_log */
 
@@ -562,6 +566,7 @@ dmq_sender_main(Datum main_arg)
 
 	got_SIGHUP = true;
 
+	mtm_log(LOG, "------> dmq_sender 1");
 	for (;;)
 	{
 		WaitEvent	event;
@@ -570,6 +575,7 @@ dmq_sender_main(Datum main_arg)
 		double		now_millisec;
 		bool		timer_event = false;
 
+		mtm_log(LOG, "------> dmq_sender 2");
 		if (ProcDiePending)
 			break;
 
@@ -1444,7 +1450,7 @@ dmq_receiver_loop(PG_FUNCTION_ARGS)
 		extra = dmq_receiver_start_hook(sender_name);
 
 	/* do not hold globalxmin. XXX: try to carefully release snaps */
-	MyPgXact->xmin = InvalidTransactionId;
+//	MyPgXact->xmin = InvalidTransactionId;
 
 	for (;;)
 	{
diff --git a/src/global_tx.c b/src/global_tx.c
@@ -185,7 +185,7 @@ MtmGlobalTxShmemStartup(void)
 		gtx_shared->lock = &(GetNamedLWLockTranche("mtm-gtx-lock"))->lock;
 
 	gtx_shared->gid2gtx = ShmemInitHash("gid2gtx", 2*MaxConnections, 2*MaxConnections,
-							&info, HASH_ELEM);
+							&info, HASH_ELEM | HASH_STRINGS);
 
 	LWLockRelease(AddinShmemInitLock);
 }
diff --git a/src/include/compat.h b/src/include/compat.h
@@ -2,25 +2,25 @@
 #define MTMCOMPAT_H
 
 /* EE pooler gets rid of static variable */
-#ifdef PGPRO_EE
+#ifndef PGPRO_EE
 #define FeBeWaitSetCompat() (MyProcPort->pqcomm_waitset)
 #else
 #define FeBeWaitSetCompat() (FeBeWaitSet)
 #endif
 
 #ifdef PGPRO_EE /* atx */
-#define BeginTransactionBlockCompat() (BeginTransactionBlock(false, NIL))
-#define UserAbortTransactionBlockCompat(chain) (UserAbortTransactionBlock(false, (chain)))
+#define BeginTransactionBlockCompat() (BeginTransactionBlock())
+#define UserAbortTransactionBlockCompat(chain) (UserAbortTransactionBlock((chain)))
 #else
 #define BeginTransactionBlockCompat() (BeginTransactionBlock())
 #define UserAbortTransactionBlockCompat(chain) (UserAbortTransactionBlock(chain))
 #endif
 
 /* atx renames this for some reason */
-#ifdef PGPRO_EE
-#define on_commits_compat() (pg_on_commit_actions)
-#else
+//#ifdef PGPRO_EE
+//#define on_commits_compat() (pg_on_commit_actions)
+//#else
 #define on_commits_compat() (on_commits)
-#endif
+//#endif
 
 #endif							/* MTMCOMPAT_H */
diff --git a/src/multimaster.c b/src/multimaster.c
@@ -88,8 +88,8 @@ static void MtmDeserializeTransactionState(void *ctx);
 #endif
 
 #ifdef PGPRO_EE
-static void *MtmSuspendTransaction(void);
-static void MtmResumeTransaction(void *ctx);
+//static void *MtmSuspendTransaction(void);
+//static void MtmResumeTransaction(void *ctx);
 #endif
 
 static void release_pb_holders_xact_cb(XactEvent event, void *arg);
@@ -363,21 +363,21 @@ MtmDeserializeTransactionState(void *ctx)
  * ATX compatibility support.
  */
 #ifdef PGPRO_EE
-static void *
-MtmSuspendTransaction(void)
-{
-	MtmCurrentTrans *ctx = MemoryContextAlloc(CurTransactionContext, sizeof(MtmCurrentTrans));
-
-	*ctx = MtmTx;
-	return ctx;
-}
-
-static void
-MtmResumeTransaction(void *ctx)
-{
-	MtmTx = *(MtmCurrentTrans *) ctx;
-	pfree(ctx);
-}
+//static void *
+//MtmSuspendTransaction(void)
+//{
+//	MtmCurrentTrans *ctx = MemoryContextAlloc(CurTransactionContext, sizeof(MtmCurrentTrans));
+//
+//	*ctx = MtmTx;
+//	return ctx;
+//}
+
+//static void
+//MtmResumeTransaction(void *ctx)
+//{
+//	MtmTx = *(MtmCurrentTrans *) ctx;
+//	pfree(ctx);
+//}
 #endif
 
 /*
@@ -744,8 +744,8 @@ NULL);
 	DetectGlobalDeadLock = MtmDetectGlobalDeadLock;
 
 #ifdef PGPRO_EE
-	SuspendTransactionHook = MtmSuspendTransaction;
-	ResumeTransactionHook = MtmResumeTransaction;
+//	SuspendTransactionHook = MtmSuspendTransaction;
+//	ResumeTransactionHook = MtmResumeTransaction;
 #endif
 }
 
@@ -1712,8 +1712,10 @@ MtmReloadConfig(MtmConfig *old_cfg, mtm_cfg_change_cb node_add_cb,
 	int			i,
 				node_id;
 
+	mtm_log(LOG, "-------> ReloadConfig");
 	new_cfg = MtmLoadConfig(elevel_on_absent);
 
+	mtm_log(LOG, "-------> ReloadConfig. new config %p", new_cfg);
 	/*
 	 * Construct bitmapsets from old and new mtm_config's and find out whether
 	 * some nodes were added or deleted.
@@ -1758,8 +1760,9 @@ MtmReloadConfig(MtmConfig *old_cfg, mtm_cfg_change_cb node_add_cb,
 		}
 
 		node_id = -1;
-		while ((node_id = bms_next_member(created, node_id)) >= 0)
+		while ((node_id = bms_next_member(created, node_id)) >= 0) {
 			node_add_cb(node_id, new_cfg, arg);
+		}
 	}
 
 	if (node_drop_cb)
diff --git a/src/pglogical_apply.c b/src/pglogical_apply.c
@@ -172,8 +172,8 @@ create_rel_estate(Relation rel)
 	resultRelInfo = makeNode(ResultRelInfo);
 	InitResultRelInfo(resultRelInfo, rel, 1, NULL, 0);
 
-	estate->es_result_relations = resultRelInfo;
-	estate->es_num_result_relations = 1;
+	estate->es_result_relations = &resultRelInfo;
+//	estate->es_num_result_relations = 1; // 1375422c7826a2bf387be29895e961614f69de4b
 	estate->es_result_relation_info = resultRelInfo;
 	estate->es_output_cid = GetCurrentCommandId(true);
 
@@ -1238,9 +1238,10 @@ process_remote_insert(StringInfo s, Relation rel)
 			if (relinfo->ri_NumIndices > 0)
 			{
 				List	   *recheckIndexes;
+				ResultRelInfo *resultRelInfo = estate->es_result_relation_info;
 
-				recheckIndexes = ExecInsertIndexTuples(bufferedSlots[i],
-													   estate, false, NULL, NIL);
+				recheckIndexes = ExecInsertIndexTuples(resultRelInfo, bufferedSlots[i],
+													   estate, false, false, NULL, NIL);
 
 				/* AFTER ROW INSERT Triggers */
 				ExecARInsertTriggers(estate, relinfo, bufferedSlots[i],
@@ -1267,11 +1268,12 @@ process_remote_insert(StringInfo s, Relation rel)
 	else
 	{
 		TupleTableSlot *newslot;
+		ResultRelInfo *resultRelInfo = estate->es_result_relation_info;
 
 		newslot = ExecInitExtraTupleSlot(estate, tupDesc, &TTSOpsHeapTuple);
 		tuple_to_slot(estate, rel, &new_tuple, newslot);
 
-		ExecSimpleRelationInsert(estate, newslot);
+		ExecSimpleRelationInsert(resultRelInfo, estate, newslot);
 	}
 	ExecCloseIndices(estate->es_result_relation_info);
 	if (ActiveSnapshotSet())
@@ -1367,6 +1369,7 @@ process_remote_update(StringInfo s, Relation rel)
 	if (found)
 	{
 		HeapTuple	remote_tuple = NULL;
+		ResultRelInfo *resultRelInfo = estate->es_result_relation_info;
 
 		remote_tuple = heap_modify_tuple(ExecFetchSlotHeapTuple(localslot, true, NULL),
 										 tupDesc,
@@ -1376,7 +1379,7 @@ process_remote_update(StringInfo s, Relation rel)
 		ExecStoreHeapTuple(remote_tuple, remoteslot, false);
 
 		EvalPlanQualSetSlot(&epqstate, remoteslot);
-		ExecSimpleRelationUpdate(estate, &epqstate, localslot, remoteslot);
+		ExecSimpleRelationUpdate(resultRelInfo, estate, &epqstate, localslot, remoteslot);
 	}
 	else
 	{
@@ -1444,8 +1447,10 @@ process_remote_delete(StringInfo s, Relation rel)
 
 	if (found)
 	{
+		ResultRelInfo *resultRelInfo = estate->es_result_relation_info;
+		
 		EvalPlanQualSetSlot(&epqstate, localslot);
-		ExecSimpleRelationDelete(estate, &epqstate, localslot);
+		ExecSimpleRelationDelete(resultRelInfo, estate, &epqstate, localslot);
 	}
 	else
 	{
diff --git a/src/pglogical_output.c b/src/pglogical_output.c
diff --git a/src/pglogical_receiver.c b/src/pglogical_receiver.c
diff --git a/src/state.c b/src/state.c
diff --git a/src/syncpoint.c b/src/syncpoint.c

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ MtmGlobalTxShmemStartup(void)`
`185`	`185`	`gtx_shared->lock = &(GetNamedLWLockTranche("mtm-gtx-lock"))->lock;`
`186`	`186`
`187`	`187`	`gtx_shared->gid2gtx = ShmemInitHash("gid2gtx", 2MaxConnections, 2MaxConnections,`
`188`		`- &info, HASH_ELEM);`
	`188`	`+ &info, HASH_ELEM \| HASH_STRINGS);`
`189`	`189`
`190`	`190`	`LWLockRelease(AddinShmemInitLock);`
`191`	`191`	`}`