Merge with changes made for Postgres 14

Author: Andrei Krichinin

Cluster.pm

@@ -233,7 +233,6 @@ sub init
 	{
 		$node->init(allows_streaming => 'logical');
 		$node->append_conf('postgresql.conf', qq{
-			enable_self_join_removal = off
 			max_connections = 50
 			log_line_prefix = '%m [%p] [xid%x] %i '
 			log_statement = all

expected/regression_ee.diff

@@ -135,14 +135,39 @@ mtm_commit_cleanup(int status, Datum arg)
 				/* there was no precommit, we can abort */
 				PG_TRY();
 				{
-					AbortOutOfAnyTransaction();
-					StartTransactionCommand();
+#ifdef PGPRO_EE
+					int atxLevel = DatumGetInt32(arg);
+
+					/*
+					 * If we are inside ATX transaction, we can not call
+					 * AbortOutOfAnyTransaction() because this call will abort
+					 * ALL transactions and we will have problems if the
+					 * calling code is not designed for this case.
+					 */
+					if (atxLevel)
+					{
+						/* Abort (current ATX transaction only): */
+						AbortCurrentTransaction();
+						/* Restart ATX transaction if it was resumed: */
+						if (atxLevel > getNestLevelATX())
+							SuspendTransaction();
+					}
+					else
+#endif
+					{
+						AbortOutOfAnyTransaction();
+						StartTransactionCommand();
+					}
 					FinishPreparedTransaction(mtm_commit_state.gid, false, false);
 					mtm_commit_state.gtx->state.status = GTXAborted;
 					mtm_log(MtmTxFinish, "%s aborted as own orphaned not precomitted",
 							mtm_commit_state.gid);
 					CommitTransactionCommand();
-
+#ifdef PGPRO_EE
+					/* Restart ATX transaction if it was resumed: */
+					if (atxLevel > getNestLevelATX())
+						SuspendTransaction();
+#endif
 				}
 				/*
 				 * this should be extremely unlikely, but if we fail, don't
@@ -218,7 +243,7 @@ MtmBeginTransaction()
 		 * register gtx hook first (it will be called last)
 		 */
 		GlobalTxEnsureBeforeShmemExitHook();
-		before_shmem_exit(mtm_commit_cleanup, Int32GetDatum(1));
+		before_shmem_exit(mtm_commit_cleanup, Int32GetDatum(0));
 		mtm_commit_state.mctx = AllocSetContextCreate(TopMemoryContext,
 													  "MtmCommitContext",
 													  ALLOCSET_DEFAULT_SIZES);
@@ -373,6 +398,9 @@ MtmTwoPhaseCommit(void)
 	MtmGeneration xact_gen;
 	char dmq_stream_name[DMQ_STREAM_NAME_MAXLEN];
 	GTxState gtx_state;
+#ifdef PGPRO_EE
+	int atxLevel = getNestLevelATX();
+#endif
 
 	if (MtmNo3PC)
 	{
@@ -714,7 +742,7 @@ MtmTwoPhaseCommit(void)
 	}
 	PG_CATCH();
 	{
-		mtm_commit_cleanup(0, Int32GetDatum(0));
+		mtm_commit_cleanup(0, Int32GetDatum(atxLevel));
 
 		PG_RE_THROW();
 	}

src/commit.c

@@ -1,7 +1,16 @@
 #ifndef MTMCOMPAT_H
 #define MTMCOMPAT_H
 
+#if 0   /* built-in connection pool ported */
+/* EE pooler gets rid of static variable */
+#ifdef PGPRO_EE
+#define FeBeWaitSetCompat() (MyProcPort->pqcomm_waitset)
+#else
 #define FeBeWaitSetCompat() (FeBeWaitSet)
+#endif
+#else
+#define FeBeWaitSetCompat() (FeBeWaitSet)
+#endif
 
 #ifdef PGPRO_EE /* atx */
 #define BeginTransactionBlockCompat() (BeginTransactionBlock(false, NIL))

src/include/compat.h

@@ -751,12 +751,10 @@ NULL);
 
 	DetectGlobalDeadLock = MtmDetectGlobalDeadLock;
 
-#if 0
 #ifdef PGPRO_EE
 	SuspendTransactionHook = MtmSuspendTransaction;
 	ResumeTransactionHook = MtmResumeTransaction;
 #endif
-#endif
 }
 
 #if PG_VERSION_NUM >= 150000

src/multimaster.c

@@ -166,7 +166,6 @@ create_rel_estate(Relation rel)
 	EState	   *estate;
 	ResultRelInfo *resultRelInfo;
 	RangeTblEntry *rte;
-	List *rangeTable;
 
 	estate = CreateExecutorState();
 
@@ -178,12 +177,8 @@ create_rel_estate(Relation rel)
 	rte->relid = RelationGetRelid(rel);
 	rte->relkind = rel->rd_rel->relkind;
 	rte->rellockmode = AccessShareLock;
-	rangeTable = list_make1(rte);
 	ExecInitRangeTable(estate, list_make1(rte));
 
-	ExecInitRangeTable(estate, rangeTable);
-	ExecInitResultRelation(estate, resultRelInfo, 1);
-
 	estate->es_result_relation_info = resultRelInfo;
 	estate->es_output_cid = GetCurrentCommandId(true);
 

src/pglogical_apply.c

@@ -75,10 +75,6 @@
 	CREATE VIEW pg_prepared_xacts AS
 		select * from _pg_prepared_xacts where gid not like 'MTM-%'
 		ORDER BY transaction::text::bigint;
-	ALTER TABLE pg_publication RENAME TO _pg_publication;
-	CREATE VIEW pg_catalog.pg_publication AS SELECT * FROM pg_catalog._pg_publication WHERE pubname<>'multimaster';
-	ALTER TABLE pg_subscription RENAME TO _pg_subscription;
-	CREATE VIEW pg_catalog.pg_subscription AS SELECT * FROM pg_catalog._pg_subscription WHERE subname NOT LIKE 'mtm_sub_%';
 });
 
 $cluster->{nodes}->[0]->safe_psql('regression', q{
@@ -104,6 +100,7 @@
 $schedule =~ s/test: cfs/#test: cfs/g;
 $schedule =~ s/test: largeobject//; # serial schedule
 $schedule =~ s/largeobject//; # parallel schedule
+$schedule =~ s/atx0//; # parallel schedule
 unlink('parallel_schedule');
 if ($Cluster::pg_15_modules)
 {
@@ -195,6 +192,11 @@
 {
 	$expected_file = "expected/regression_vanilla.diff"
 }
+# Remove lines which contains random data (like ports, users, etc) from output file
+# Remove line which starts with '+ mtm_sub_' from output file because it contains random user
+run [ "sed", "-i.bak", "/+ mtm_sub_/d", "$ENV{TESTDIR}/results/regression.diff" ];
+# Remove line which starts from '+ multimaster' from output file because it contains random port number
+run [ "sed", "-i.bak", "/+ multimaster/d", "$ENV{TESTDIR}/results/regression.diff" ];
 if ($Cluster::pg_15_modules)
 {
 	$diff = PostgreSQL::Test::Utils::system_log("diff -U3 ${expected_file} $ENV{TESTDIR}/results/regression.diff");