Merge remote-tracking branch 'remotes/PGSQL/master' into XL_NEW_MASTER

Conflicts:
	.gitignore
	contrib/Makefile
	src/backend/access/common/heaptuple.c
	src/backend/access/transam/rmgr.c
	src/backend/access/transam/xact.c
	src/backend/catalog/Makefile
	src/backend/catalog/catalog.c
	src/backend/catalog/genbki.pl
	src/backend/catalog/namespace.c
	src/backend/commands/sequence.c
	src/backend/executor/execMain.c
	src/backend/executor/functions.c
	src/backend/executor/nodeAgg.c
	src/backend/executor/nodeModifyTable.c
	src/backend/nodes/copyfuncs.c
	src/backend/nodes/outfuncs.c
	src/backend/nodes/readfuncs.c
	src/backend/optimizer/plan/createplan.c
	src/backend/optimizer/plan/planner.c
	src/backend/optimizer/plan/setrefs.c
	src/backend/optimizer/util/pathnode.c
	src/backend/parser/gram.y
	src/backend/parser/parse_agg.c
	src/backend/parser/parse_utilcmd.c
	src/backend/postmaster/postmaster.c
	src/backend/replication/logical/decode.c
	src/backend/storage/file/fd.c
	src/backend/storage/ipc/procsignal.c
	src/backend/tcop/utility.c
	src/backend/utils/adt/lockfuncs.c
	src/backend/utils/adt/ruleutils.c
	src/backend/utils/sort/tuplesort.c
	src/backend/utils/time/snapmgr.c
	src/include/access/rmgrlist.h
	src/include/catalog/pg_aggregate.h
	src/include/catalog/pg_proc.h
	src/include/nodes/execnodes.h
	src/include/nodes/plannodes.h
	src/include/nodes/primnodes.h
	src/include/nodes/relation.h
	src/include/storage/lwlock.h
	src/include/storage/procsignal.h
	src/include/utils/plancache.h
	src/include/utils/snapshot.h
	src/test/regress/expected/foreign_key.out
	src/test/regress/expected/triggers.out
	src/test/regress/expected/with.out
	src/test/regress/input/constraints.source
	src/test/regress/output/constraints.source
	src/test/regress/pg_regress.c
	src/test/regress/serial_schedule
	src/test/regress/sql/returning.sql

1 files changed, 8 insertions, 12 deletions

diff --git a/src/include/access/commit_ts.h b/src/include/access/commit_ts.h
index 93d1217f76..bd05ab4d5c 100644
--- a/src/include/access/commit_ts.h
+++ b/src/include/access/commit_ts.h
@@ -13,26 +13,22 @@
 
 #include "access/xlog.h"
 #include "datatype/timestamp.h"
+#include "replication/origin.h"
 #include "utils/guc.h"
 
 
-extern PGDLLIMPORT bool	track_commit_timestamp;
+extern PGDLLIMPORT bool track_commit_timestamp;
 
 extern bool check_track_commit_timestamp(bool *newval, void **extra,
 							 GucSource source);
 
-typedef uint32 CommitTsNodeId;
-#define InvalidCommitTsNodeId 0
-
-extern void CommitTsSetDefaultNodeId(CommitTsNodeId nodeid);
-extern CommitTsNodeId CommitTsGetDefaultNodeId(void);
 extern void TransactionTreeSetCommitTsData(TransactionId xid, int nsubxids,
 							   TransactionId *subxids, TimestampTz timestamp,
-							   CommitTsNodeId nodeid, bool do_xlog);
+							   RepOriginId nodeid, bool do_xlog);
 extern bool TransactionIdGetCommitTsData(TransactionId xid,
-							 TimestampTz *ts, CommitTsNodeId *nodeid);
+							 TimestampTz *ts, RepOriginId *nodeid);
 extern TransactionId GetLatestCommitTsData(TimestampTz *ts,
-					  CommitTsNodeId *nodeid);
+					  RepOriginId *nodeid);
 
 extern Size CommitTsShmemBuffers(void);
 extern Size CommitTsShmemSize(void);
@@ -57,9 +53,9 @@ extern void AdvanceOldestCommitTs(TransactionId oldestXact);
 
 typedef struct xl_commit_ts_set
 {
-	TimestampTz		timestamp;
-	CommitTsNodeId	nodeid;
-	TransactionId	mainxid;
+	TimestampTz timestamp;
+	RepOriginId nodeid;
+	TransactionId mainxid;
 	/* subxact Xids follow */
 } xl_commit_ts_set;