REL_14_STABLE-pg_pathman-core.diff

diff --git a/contrib/Makefile b/contrib/Makefile
index f27e458482..ea47c341c1 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -32,6 +32,7 @@ SUBDIRS = \
 		passwordcheck	\
 		pg_buffercache	\
 		pg_freespacemap \
+		pg_pathman \
 		pg_prewarm	\
 		pg_stat_statements \
 		pg_surgery	\
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index bf551b0395..10d2044ae6 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -76,7 +76,7 @@ int			DefaultXactIsoLevel = XACT_READ_COMMITTED;
 int			XactIsoLevel;
 
 bool		DefaultXactReadOnly = false;
-bool		XactReadOnly;
+bool		XactReadOnly = false;
 
 bool		DefaultXactDeferrable = false;
 bool		XactDeferrable;
diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c
index bdf59a10fc..972453d9a5 100644
--- a/src/backend/executor/execExprInterp.c
+++ b/src/backend/executor/execExprInterp.c
@@ -1799,6 +1799,16 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 	}
 
 out:
+
+	/*
+	 * pg_pathman: pass 'tts_tableOid' to result tuple to determine from
+	 * which partition the tuple was read
+	 */
+	if (resultslot)
+	{
+		resultslot->tts_tableOid = scanslot ? scanslot->tts_tableOid :
+			(innerslot ? innerslot->tts_tableOid : (outerslot ? outerslot->tts_tableOid : InvalidOid));
+	}
 	*isnull = state->resnull;
 	return state->resvalue;
 }
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index b3ce4bae53..8f2bb12542 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -824,6 +824,13 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 
 	estate->es_plannedstmt = plannedstmt;
 
+	/*
+	 * Fields "es_result_relation_info", "es_original_tuple" are used for
+	 * pg_pathman only:
+	 */
+	estate->es_result_relation_info = NULL;
+	estate->es_original_tuple = NULL;
+
 	/*
 	 * Next, build the ExecRowMark array from the PlanRowMark(s), if any.
 	 */
@@ -2713,6 +2720,13 @@ EvalPlanQualStart(EPQState *epqstate, Plan *planTree)
 	rcestate->es_junkFilter = parentestate->es_junkFilter;
 	rcestate->es_output_cid = parentestate->es_output_cid;
 
+	/*
+	 * Fields "es_result_relation_info", "es_original_tuple" are used for
+	 * pg_pathman only:
+	 */
+	rcestate->es_result_relation_info = NULL;
+	rcestate->es_original_tuple = NULL;
+
 	/*
 	 * ResultRelInfos needed by subplans are initialized from scratch when the
 	 * subplans themselves are initialized.
diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
index 55c430c9ec..21d9e6304a 100644
--- a/src/backend/executor/nodeModifyTable.c
+++ b/src/backend/executor/nodeModifyTable.c
@@ -510,7 +510,7 @@ ExecInitInsertProjection(ModifyTableState *mtstate,
  * This is also a convenient place to verify that the output of an UPDATE
  * matches the target table (ExecBuildUpdateProjection does that).
  */
-static void
+void
 ExecInitUpdateProjection(ModifyTableState *mtstate,
 						 ResultRelInfo *resultRelInfo)
 {
@@ -2486,6 +2486,7 @@ ExecModifyTable(PlanState *pstate)
 	ItemPointerData tuple_ctid;
 	HeapTupleData oldtupdata;
 	HeapTuple	oldtuple;
+	ResultRelInfo *saved_resultRelInfo;
 
 	CHECK_FOR_INTERRUPTS();
 
@@ -2523,12 +2524,23 @@ ExecModifyTable(PlanState *pstate)
 	resultRelInfo = node->resultRelInfo + node->mt_lastResultIndex;
 	subplanstate = outerPlanState(node);
 
+	saved_resultRelInfo = estate->es_result_relation_info;
+	estate->es_result_relation_info = NULL;
+
 	/*
 	 * Fetch rows from subplan, and execute the required table modification
 	 * for each row.
 	 */
 	for (;;)
 	{
+		/*
+		 * "es_original_tuple" should contains original modified tuple (new
+		 * values of the changed columns plus row identity information such as
+		 * CTID) in case tuple planSlot is replaced in pg_pathman to new value
+		 * in call "ExecProcNode(subplanstate)".
+		 */
+		estate->es_original_tuple = NULL;
+
 		/*
 		 * Reset the per-output-tuple exprcontext.  This is needed because
 		 * triggers expect to use that context as workspace.  It's a bit ugly
@@ -2562,7 +2574,9 @@ ExecModifyTable(PlanState *pstate)
 			bool		isNull;
 			Oid			resultoid;
 
-			datum = ExecGetJunkAttribute(planSlot, node->mt_resultOidAttno,
+			datum = ExecGetJunkAttribute(estate->es_original_tuple ?
+										 estate->es_original_tuple : planSlot,
+										 node->mt_resultOidAttno,
 										 &isNull);
 			if (isNull)
 				elog(ERROR, "tableoid is NULL");
@@ -2581,6 +2595,8 @@ ExecModifyTable(PlanState *pstate)
 		if (resultRelInfo->ri_usesFdwDirectModify)
 		{
 			Assert(resultRelInfo->ri_projectReturning);
+			/* PartitionRouter does not support foreign data wrappers: */
+			Assert(estate->es_original_tuple == NULL);
 
 			/*
 			 * A scan slot containing the data that was actually inserted,
@@ -2590,6 +2606,7 @@ ExecModifyTable(PlanState *pstate)
 			 */
 			slot = ExecProcessReturning(resultRelInfo, NULL, planSlot);
 
+			estate->es_result_relation_info = saved_resultRelInfo;
 			return slot;
 		}
 
@@ -2619,7 +2636,8 @@ ExecModifyTable(PlanState *pstate)
 			{
 				/* ri_RowIdAttNo refers to a ctid attribute */
 				Assert(AttributeNumberIsValid(resultRelInfo->ri_RowIdAttNo));
-				datum = ExecGetJunkAttribute(slot,
+				datum = ExecGetJunkAttribute(estate->es_original_tuple
+											 ? estate->es_original_tuple : slot,
 											 resultRelInfo->ri_RowIdAttNo,
 											 &isNull);
 				/* shouldn't ever get a null result... */
@@ -2649,7 +2667,8 @@ ExecModifyTable(PlanState *pstate)
 			 */
 			else if (AttributeNumberIsValid(resultRelInfo->ri_RowIdAttNo))
 			{
-				datum = ExecGetJunkAttribute(slot,
+				datum = ExecGetJunkAttribute(estate->es_original_tuple
+											 ? estate->es_original_tuple : slot,
 											 resultRelInfo->ri_RowIdAttNo,
 											 &isNull);
 				/* shouldn't ever get a null result... */
@@ -2680,8 +2699,12 @@ ExecModifyTable(PlanState *pstate)
 				/* Initialize projection info if first time for this table */
 				if (unlikely(!resultRelInfo->ri_projectNewInfoValid))
 					ExecInitInsertProjection(node, resultRelInfo);
-				slot = ExecGetInsertNewTuple(resultRelInfo, planSlot);
-				slot = ExecInsert(node, resultRelInfo, slot, planSlot,
+				/* Do nothing in case tuple was modified in pg_pathman: */
+				if (!estate->es_original_tuple)
+					slot = ExecGetInsertNewTuple(resultRelInfo, planSlot);
+				slot = ExecInsert(node, estate->es_result_relation_info ?
+									estate->es_result_relation_info : resultRelInfo,
+								  slot, planSlot,
 								  estate, node->canSetTag);
 				break;
 			case CMD_UPDATE:
@@ -2689,6 +2712,13 @@ ExecModifyTable(PlanState *pstate)
 				if (unlikely(!resultRelInfo->ri_projectNewInfoValid))
 					ExecInitUpdateProjection(node, resultRelInfo);
 
+				/*
+				 * Do not change the indentation for PostgreSQL code to make it
+				 * easier to merge new PostgreSQL changes.
+				 */
+				/* Do nothing in case tuple was modified in pg_pathman: */
+				if (!estate->es_original_tuple)
+				{
 				/*
 				 * Make the new tuple by combining plan's output tuple with
 				 * the old tuple being updated.
@@ -2712,14 +2742,19 @@ ExecModifyTable(PlanState *pstate)
 				}
 				slot = ExecGetUpdateNewTuple(resultRelInfo, planSlot,
 											 oldSlot);
+				}
 
 				/* Now apply the update. */
-				slot = ExecUpdate(node, resultRelInfo, tupleid, oldtuple, slot,
+				slot = ExecUpdate(node, estate->es_result_relation_info ?
+									estate->es_result_relation_info : resultRelInfo,
+								  tupleid, oldtuple, slot,
 								  planSlot, &node->mt_epqstate, estate,
 								  node->canSetTag);
 				break;
 			case CMD_DELETE:
-				slot = ExecDelete(node, resultRelInfo, tupleid, oldtuple,
+				slot = ExecDelete(node, estate->es_result_relation_info ?
+									estate->es_result_relation_info : resultRelInfo,
+								  tupleid, oldtuple,
 								  planSlot, &node->mt_epqstate, estate,
 								  true, /* processReturning */
 								  node->canSetTag,
@@ -2736,7 +2771,10 @@ ExecModifyTable(PlanState *pstate)
 		 * the work on next call.
 		 */
 		if (slot)
+		{
+			estate->es_result_relation_info = saved_resultRelInfo;
 			return slot;
+		}
 	}
 
 	/*
@@ -2752,6 +2790,7 @@ ExecModifyTable(PlanState *pstate)
 
 	node->mt_done = true;
 
+	estate->es_result_relation_info = saved_resultRelInfo;
 	return NULL;
 }
 
@@ -2826,6 +2865,7 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 	ListCell   *l;
 	int			i;
 	Relation	rel;
+	ResultRelInfo *saved_resultRelInfo;
 
 	/* check for unsupported flags */
 	Assert(!(eflags & (EXEC_FLAG_BACKWARD | EXEC_FLAG_MARK)));
@@ -2922,6 +2962,13 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 		i++;
 	}
 
+	/*
+	 * pg_pathman: set "estate->es_result_relation_info" value for take it in
+	 * functions partition_filter_begin(), partition_router_begin()
+	 */
+	saved_resultRelInfo = estate->es_result_relation_info;
+	estate->es_result_relation_info = mtstate->resultRelInfo;
+
 	/*
 	 * Now we may initialize the subplan.
 	 */
@@ -3002,6 +3049,8 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 			ExecInitStoredGenerated(resultRelInfo, estate, operation);
 	}
 
+	estate->es_result_relation_info = saved_resultRelInfo;
+
 	/*
 	 * If this is an inherited update/delete, there will be a junk attribute
 	 * named "tableoid" present in the subplan's targetlist.  It will be used
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index 381d9e548d..0a4657d291 100644
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -25,7 +25,7 @@
 #include "storage/backendid.h"
 
 
-ProtocolVersion FrontendProtocol;
+ProtocolVersion FrontendProtocol = (ProtocolVersion) 0;
 
 volatile sig_atomic_t InterruptPending = false;
 volatile sig_atomic_t QueryCancelPending = false;
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index 5af78bd0dc..0c13bc9d83 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -53,7 +53,9 @@ extern PGDLLIMPORT int XactIsoLevel;
 
 /* Xact read-only state */
 extern bool DefaultXactReadOnly;
-extern bool XactReadOnly;
+
+#define PGPRO_PATHMAN_AWARE_COPY
+extern PGDLLIMPORT bool XactReadOnly;
 
 /* flag for logging statements in this transaction */
 extern bool xact_is_sampled;
diff --git a/src/include/catalog/objectaddress.h b/src/include/catalog/objectaddress.h
index 2b4e104bb9..80d1274efe 100644
--- a/src/include/catalog/objectaddress.h
+++ b/src/include/catalog/objectaddress.h
@@ -28,7 +28,7 @@ typedef struct ObjectAddress
 	int32		objectSubId;	/* Subitem within object (eg column), or 0 */
 } ObjectAddress;
 
-extern const ObjectAddress InvalidObjectAddress;
+extern PGDLLIMPORT const ObjectAddress InvalidObjectAddress;
 
 #define ObjectAddressSubSet(addr, class_id, object_id, object_sub_id) \
 	do { \
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index 3dc03c913e..1002d97499 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -657,5 +657,7 @@ extern ResultRelInfo *ExecLookupResultRelByOid(ModifyTableState *node,
 											   Oid resultoid,
 											   bool missing_ok,
 											   bool update_cache);
+extern void ExecInitUpdateProjection(ModifyTableState *mtstate,
+									 ResultRelInfo *resultRelInfo);
 
 #endif							/* EXECUTOR_H  */
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h
index 4acb1cda6e..fd8d38347d 100644
--- a/src/include/libpq/libpq-be.h
+++ b/src/include/libpq/libpq-be.h
@@ -327,7 +327,7 @@ extern ssize_t be_gssapi_read(Port *port, void *ptr, size_t len);
 extern ssize_t be_gssapi_write(Port *port, void *ptr, size_t len);
 #endif							/* ENABLE_GSS */
 
-extern ProtocolVersion FrontendProtocol;
+extern PGDLLIMPORT ProtocolVersion FrontendProtocol;
 
 /* TCP keepalives configuration. These are no-ops on an AF_UNIX socket. */
 
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index ee5ad3c058..dc474819d7 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -592,6 +592,12 @@ typedef struct EState
 											 * es_result_relations in no
 											 * specific order */
 
+	/* These fields was added for compatibility pg_pathman with 14: */
+	ResultRelInfo *es_result_relation_info; /* currently active array elt */
+	TupleTableSlot *es_original_tuple;	/* original modified tuple (new values
+										 * of the changed columns plus row
+										 * identity information such as CTID) */
+
 	PartitionDirectory es_partition_directory;	/* for PartitionDesc lookup */
 
 	/*
diff --git a/src/include/utils/snapmgr.h b/src/include/utils/snapmgr.h
index 33e6c14e81..abd9bba23e 100644
--- a/src/include/utils/snapmgr.h
+++ b/src/include/utils/snapmgr.h
@@ -53,7 +53,7 @@ extern TimestampTz GetSnapshotCurrentTimestamp(void);
 extern TimestampTz GetOldSnapshotThresholdTimestamp(void);
 extern void SnapshotTooOldMagicForTest(void);
 
-extern bool FirstSnapshotSet;
+extern PGDLLIMPORT bool FirstSnapshotSet;
 
 extern PGDLLIMPORT TransactionId TransactionXmin;
 extern PGDLLIMPORT TransactionId RecentXmin;
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index de22c9ba2c..c8be5323b8 100644
--- a/src/tools/msvc/Install.pm
+++ b/src/tools/msvc/Install.pm
@@ -30,6 +30,18 @@ my @client_program_files = (
 	'pg_receivewal', 'pg_recvlogical', 'pg_restore', 'psql',
 	'reindexdb',     'vacuumdb',       @client_contribs);
 
+sub SubstituteMakefileVariables {
+	local $_ = shift; # Line to substitue
+	my $mf = shift; # Makefile text
+	while (/\$\((\w+)\)/) {
+			my $varname = $1;
+			if ($mf =~ /^$varname\s*=\s*(.*)$/mg) {
+			my $varvalue=$1;
+			s/\$\($varname\)/$varvalue/g;
+			}
+	}
+	return $_;
+}
 sub lcopy
 {
 	my $src    = shift;
@@ -608,7 +620,7 @@ sub ParseAndCleanRule
 		    substr($flist, 0, index($flist, '$(addsuffix '))
 		  . substr($flist, $i + 1);
 	}
-	return $flist;
+	return SubstituteMakefileVariables($flist, $mf);
 }
 
 sub CopyIncludeFiles
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 9b6539fb15..f8a67c6701 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -41,7 +41,10 @@ my @contrib_uselibpq =
 my @contrib_uselibpgport   = ('libpq_pipeline', 'oid2name', 'vacuumlo');
 my @contrib_uselibpgcommon = ('libpq_pipeline', 'oid2name', 'vacuumlo');
 my $contrib_extralibs     = { 'libpq_pipeline' => ['ws2_32.lib'] };
-my $contrib_extraincludes = { 'dblink'         => ['src/backend'] };
+my $contrib_extraincludes = {
+	'dblink' => ['src/backend'],
+	'pg_pathman' => ['contrib/pg_pathman/src/include']
+};
 my $contrib_extrasource   = {
 	'cube' => [ 'contrib/cube/cubescan.l', 'contrib/cube/cubeparse.y' ],
 	'seg'  => [ 'contrib/seg/segscan.l',   'contrib/seg/segparse.y' ],
@@ -973,6 +976,7 @@ sub AddContrib
 		my $dn = $1;
 		my $proj = $solution->AddProject($dn, 'dll', 'contrib', "$subdir/$n");
 		$proj->AddReference($postgres);
+		$proj->RemoveFile("$subdir/$n/src/declarative.c") if $n eq 'pg_pathman';
 		AdjustContribProj($proj);
 	}
 	elsif ($mf =~ /^MODULES\s*=\s*(.*)$/mg)
@@ -1002,6 +1006,19 @@ sub AddContrib
 	return;
 }
 
+sub SubstituteMakefileVariables {
+	local $_ = shift; # Line to substitue
+	my $mf = shift; # Makefile text
+	while (/\$\((\w+)\)/) {
+			my $varname = $1;
+			if ($mf =~ /^$varname\s*=\s*(.*)$/mg) {
+			my $varvalue=$1;
+			s/\$\($varname\)/$varvalue/g;
+			}
+	}
+	return $_;
+}
+
 sub GenerateContribSqlFiles
 {
 	my $n  = shift;
@@ -1026,23 +1043,53 @@ sub GenerateContribSqlFiles
 			  substr($l, 0, index($l, '$(addsuffix ')) . substr($l, $i + 1);
 		}
 
+		$l = SubstituteMakefileVariables($l,$mf);
 		foreach my $d (split /\s+/, $l)
 		{
-			my $in  = "$d.in";
-			my $out = "$d";
-
-			if (Solution::IsNewer("contrib/$n/$out", "contrib/$n/$in"))
-			{
-				print "Building $out from $in (contrib/$n)...\n";
-				my $cont = Project::read_file("contrib/$n/$in");
-				my $dn   = $out;
-				$dn =~ s/\.sql$//;
-				$cont =~ s/MODULE_PATHNAME/\$libdir\/$dn/g;
-				my $o;
-				open($o, '>', "contrib/$n/$out")
-				  || croak "Could not write to contrib/$n/$d";
-				print $o $cont;
-				close($o);
+			if ( -f "contrib/$n/$d.in" ) {
+				my $in  = "$d.in";
+				my $out = "$d";
+				if (Solution::IsNewer("contrib/$n/$out", "contrib/$n/$in"))
+				{
+				    print "Building $out from $in (contrib/$n)...\n";
+					my $cont = Project::read_file("contrib/$n/$in");
+					my $dn   = $out;
+					$dn =~ s/\.sql$//;
+					$cont =~ s/MODULE_PATHNAME/\$libdir\/$dn/g;
+					my $o;
+					open($o, '>', "contrib/$n/$out")
+					|| croak "Could not write to contrib/$n/$d";
+					print $o $cont;
+					close($o);
+				}
+			} else {
+				# Search for makefile rule.
+				# For now we do not process rule command and assume
+				# that we should just concatenate all prerequisites
+				#
+				my @prereq = ();
+				my $target;
+				my @rules = $mf =~ /^(\S+)\s*:\s*([^=].*)$/mg;
+				RULE:
+				while (@rules) {
+					$target = SubstituteMakefileVariables(shift @rules,$mf);
+						@prereq = split(/\s+/,SubstituteMakefileVariables(shift @rules,$mf));
+					last RULE if ($target eq $d);
+					@prereq = ();
+				}
+				croak "Don't know how to build contrib/$n/$d" unless @prereq;
+				if (grep(Solution::IsNewer("contrib/$n/$d","contrib/$n/$_"),
+						 @prereq)) {
+					print STDERR "building $d from @prereq by concatentation\n";
+					my $o;
+					open $o, ">contrib/$n/$d"
+						or croak("Couldn't write to contrib/$n/$d:$!");
+					for my $in (@prereq) {
+						my $data = Project::read_file("contrib/$n/$in");
+						print $o $data;
+					}
+					close $o;
+				}
 			}
 		}
 	}