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, 30 insertions, 0 deletions

diff --git a/src/include/postgres.h b/src/include/postgres.h
index 02b7056b54..c0e43643c2 100644
--- a/src/include/postgres.h
+++ b/src/include/postgres.h
@@ -89,6 +89,23 @@ typedef struct varatt_indirect
 }	varatt_indirect;
 
 /*
+ * struct varatt_expanded is a "TOAST pointer" representing an out-of-line
+ * Datum that is stored in memory, in some type-specific, not necessarily
+ * physically contiguous format that is convenient for computation not
+ * storage.  APIs for this, in particular the definition of struct
+ * ExpandedObjectHeader, are in src/include/utils/expandeddatum.h.
+ *
+ * Note that just as for struct varatt_external, this struct is stored
+ * unaligned within any containing tuple.
+ */
+typedef struct ExpandedObjectHeader ExpandedObjectHeader;
+
+typedef struct varatt_expanded
+{
+	ExpandedObjectHeader *eohptr;
+} varatt_expanded;
+
+/*
  * Type tag for the various sorts of "TOAST pointer" datums.  The peculiar
  * value for VARTAG_ONDISK comes from a requirement for on-disk compatibility
  * with a previous notion that the tag field was the pointer datum's length.
@@ -96,11 +113,18 @@ typedef struct varatt_indirect
 typedef enum vartag_external
 {
 	VARTAG_INDIRECT = 1,
+	VARTAG_EXPANDED_RO = 2,
+	VARTAG_EXPANDED_RW = 3,
 	VARTAG_ONDISK = 18
 } vartag_external;
 
+/* this test relies on the specific tag values above */
+#define VARTAG_IS_EXPANDED(tag) \
+	(((tag) & ~1) == VARTAG_EXPANDED_RO)
+
 #define VARTAG_SIZE(tag) \
 	((tag) == VARTAG_INDIRECT ? sizeof(varatt_indirect) : \
+	 VARTAG_IS_EXPANDED(tag) ? sizeof(varatt_expanded) : \
 	 (tag) == VARTAG_ONDISK ? sizeof(varatt_external) : \
 	 TrapMacro(true, "unrecognized TOAST vartag"))
 
@@ -295,6 +319,12 @@ typedef struct
 	(VARATT_IS_EXTERNAL(PTR) && VARTAG_EXTERNAL(PTR) == VARTAG_ONDISK)
 #define VARATT_IS_EXTERNAL_INDIRECT(PTR) \
 	(VARATT_IS_EXTERNAL(PTR) && VARTAG_EXTERNAL(PTR) == VARTAG_INDIRECT)
+#define VARATT_IS_EXTERNAL_EXPANDED_RO(PTR) \
+	(VARATT_IS_EXTERNAL(PTR) && VARTAG_EXTERNAL(PTR) == VARTAG_EXPANDED_RO)
+#define VARATT_IS_EXTERNAL_EXPANDED_RW(PTR) \
+	(VARATT_IS_EXTERNAL(PTR) && VARTAG_EXTERNAL(PTR) == VARTAG_EXPANDED_RW)
+#define VARATT_IS_EXTERNAL_EXPANDED(PTR) \
+	(VARATT_IS_EXTERNAL(PTR) && VARTAG_IS_EXPANDED(VARTAG_EXTERNAL(PTR)))
 #define VARATT_IS_SHORT(PTR)				VARATT_IS_1B(PTR)
 #define VARATT_IS_EXTENDED(PTR)				(!VARATT_IS_4B_U(PTR))