Merge branch 'PGPROEE10' into PGPROEE10_test_xid-64

Author: vbwagner

contrib/rum/expected/array_1.out

@@ -525,7 +525,14 @@ EXPLAIN (COSTS OFF) SELECT * FROM test_array WHERE i && '{1}' ORDER BY add_info
 (4 rows)
 
 SELECT * FROM test_array WHERE i && '{1}' ORDER BY add_info <=> '2016-05-16 14:21:25' LIMIT 10;
-ERROR:  doesn't support order by over pass-by-reference column
+     i     |         add_info         
+-----------+--------------------------
+ {1}       | Thu May 19 14:21:25 2016
+ {1,2}     | Fri May 20 14:21:25 2016
+ {1,2,3}   | Sat May 21 14:21:25 2016
+ {1,2,3,4} | Sun May 22 14:21:25 2016
+(4 rows)
+
 DROP INDEX idx_array;
 /*
  * Sanity checks for popular array types.

contrib/rum/src/rum.h

@@ -1057,4 +1057,20 @@ extern Datum FunctionCall10Coll(FmgrInfo *flinfo, Oid collation,
 				   Datum arg6, Datum arg7, Datum arg8,
 				   Datum arg9, Datum arg10);
 
+/* PostgreSQL version-agnostic creation of memory context */
+#if PG_VERSION_NUM >= 110000
+	#define RumContextCreate(parent, name) \
+		AllocSetContextCreateExtended(parent, name, \
+									  MEMCONTEXT_COPY_NAME, \
+									  ALLOCSET_DEFAULT_MINSIZE, \
+									  ALLOCSET_DEFAULT_INITSIZE, \
+									  ALLOCSET_DEFAULT_MAXSIZE)
+#else
+	#define RumContextCreate(parent, name) \
+		AllocSetContextCreate(parent, name, \
+							  ALLOCSET_DEFAULT_MINSIZE, \
+							  ALLOCSET_DEFAULT_INITSIZE, \
+							  ALLOCSET_DEFAULT_MAXSIZE)
+#endif
+
 #endif   /* __RUM_H__ */

contrib/rum/src/ruminsert.c

@@ -633,17 +633,11 @@ rumbuild(Relation heap, Relation index, struct IndexInfo *indexInfo)
 	 * create a temporary memory context that is reset once for each tuple
 	 * inserted into the index
 	 */
-	buildstate.tmpCtx = AllocSetContextCreate(CurrentMemoryContext,
-											  "Rum build temporary context",
-											  ALLOCSET_DEFAULT_MINSIZE,
-											  ALLOCSET_DEFAULT_INITSIZE,
-											  ALLOCSET_DEFAULT_MAXSIZE);
-
-	buildstate.funcCtx = AllocSetContextCreate(CurrentMemoryContext,
-					 "Rum build temporary context for user-defined function",
-											   ALLOCSET_DEFAULT_MINSIZE,
-											   ALLOCSET_DEFAULT_INITSIZE,
-											   ALLOCSET_DEFAULT_MAXSIZE);
+	buildstate.tmpCtx = RumContextCreate(CurrentMemoryContext,
+										 "Rum build temporary context");
+
+	buildstate.funcCtx = RumContextCreate(CurrentMemoryContext,
+					 "Rum build temporary context for user-defined function");
 
 	buildstate.accum.rumstate = &buildstate.rumstate;
 	rumInitBA(&buildstate.accum);
@@ -813,11 +807,8 @@ ruminsert(Relation index, Datum *values, bool *isnull,
 	Datum		outerAddInfo = (Datum) 0;
 	bool		outerAddInfoIsNull = true;
 
-	insertCtx = AllocSetContextCreate(CurrentMemoryContext,
-									  "Rum insert temporary context",
-									  ALLOCSET_DEFAULT_MINSIZE,
-									  ALLOCSET_DEFAULT_INITSIZE,
-									  ALLOCSET_DEFAULT_MAXSIZE);
+	insertCtx = RumContextCreate(CurrentMemoryContext,
+								 "Rum insert temporary context");
 
 	oldCtx = MemoryContextSwitchTo(insertCtx);
 

contrib/rum/src/rumscan.c

@@ -35,16 +35,10 @@ rumbeginscan(Relation rel, int nkeys, int norderbys)
 	so->firstCall = true;
 	so->totalentries = 0;
 	so->sortedEntries = NULL;
-	so->tempCtx = AllocSetContextCreate(CurrentMemoryContext,
-										"Rum scan temporary context",
-										ALLOCSET_DEFAULT_MINSIZE,
-										ALLOCSET_DEFAULT_INITSIZE,
-										ALLOCSET_DEFAULT_MAXSIZE);
-	so->keyCtx = AllocSetContextCreate(CurrentMemoryContext,
-									   "Rum scan key context",
-									   ALLOCSET_DEFAULT_MINSIZE,
-									   ALLOCSET_DEFAULT_INITSIZE,
-									   ALLOCSET_DEFAULT_MAXSIZE);
+	so->tempCtx = RumContextCreate(CurrentMemoryContext,
+								   "Rum scan temporary context");
+	so->keyCtx = RumContextCreate(CurrentMemoryContext,
+								  "Rum scan key context");
 
 	initRumState(&so->rumstate, scan->indexRelation);
 

contrib/rum/src/rumsort.c

@@ -877,11 +877,7 @@ rum_tuplesort_begin_common(int workMem, bool randomAccess)
 	 * Create a working memory context for this sort operation. All data
 	 * needed by the sort will live inside this context.
 	 */
-	sortcontext = AllocSetContextCreate(CurrentMemoryContext,
-										"TupleSort",
-										ALLOCSET_DEFAULT_MINSIZE,
-										ALLOCSET_DEFAULT_INITSIZE,
-										ALLOCSET_DEFAULT_MAXSIZE);
+	sortcontext = RumContextCreate(CurrentMemoryContext, "TupleSort");
 
 	/*
 	 * Make the Tuplesortstate within the per-sort context.  This way, we

src/bin/psql/Makefile

@@ -21,6 +21,8 @@ REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref
 override CPPFLAGS := -I. -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
 override LDFLAGS := -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) $(LDFLAGS)
 
+# We need product name in the enviroment of create_help.pl
+export PRODUCT_NAME
 OBJS=	command.o common.o conditional.o copy.o crosstabview.o \
 	describe.o help.o input.o large_obj.o mainloop.o \
 	prompt.o psqlscanslash.o sql_help.o startup.o stringutils.o \

src/bin/psql/create_help.pl

@@ -100,6 +100,8 @@
 	open(my $fh, '<', "$docdir/$file") or next;
 	my $filecontent = join('', <$fh>);
 	close $fh;
+	# Substitute &productname; entity
+	$filecontent =~ s/\&productname;/$ENV{PRODUCT_NAME}/gs;
 
 	# Ignore files that are not for SQL language statements
 	$filecontent =~