Add 6 more OID typeds at portable plan

Author: danolivo

contrib/pg_execplan/tests/regress

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This script performs regress tests at a master and mirrored it into the slave.
-U=`whoami`
+U=regression
 export LC_ALL=C
 export LANGUAGE="en_US:en"
 
@@ -12,6 +12,7 @@ LD_LIBRARY_PATH=$PGINSTALL/lib
 remoteSrvName=fdwremote
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 export PATH=$PGINSTALL/bin:$PATH
+export PGDATABASE=regression
 
 pkill -9 postgres || true
 sleep 1
@@ -41,7 +42,7 @@ createdb -p 5433 $U
 createdb -p 5432 $U
 
 psql -p 5432 -c "CREATE EXTENSION postgres_fdw;"
-psql -p 5432 -c "CREATE SERVER $remoteSrvName FOREIGN DATA WRAPPER postgres_fdw OPTIONS (port '5433', use_remote_estimate 'on');"
+psql -p 5432 -c "CREATE SERVER $remoteSrvName FOREIGN DATA WRAPPER postgres_fdw OPTIONS (port '5433', dbname 'regression', use_remote_estimate 'on');"
 psql -p 5432 -c "CREATE USER MAPPING FOR PUBLIC SERVER $remoteSrvName;"
 
 # Prepare plan execution
@@ -59,4 +60,4 @@ rm -rf $PGINSTALL/lib/regress.so
 cp `pwd`/src/test/regress/regress.so $PGINSTALL/lib
 cp `pwd`/src/test/regress/regress.so $PGINSTALL/lib/postgresql/
 cd src/test/regress
-./pg_regress --schedule=$SCRIPTS/serial_schedule --load-extension=postgres_fdw --load-extension=pg_execplan --load-extension=pg_repeater --dbname=andrey --use-existing
+./pg_regress --schedule=$SCRIPTS/serial_schedule --load-extension=postgres_fdw --load-extension=pg_execplan --load-extension=pg_repeater --dbname=regression --use-existing

contrib/pg_execplan/tests/rpl.sh

@@ -78,3 +78,17 @@ psql -p 5433 -c "SELECT oid, oprname, oprnamespace FROM pg_operator WHERE oprnam
 # Test
 psql -p 5432 -c "SELECT pg_store_query_plan('../test.txt', 'SELECT id ### 1 FROM tests.ttest1;');"
 psql -p 5433 -c "SELECT pg_exec_stored_plan('../test.txt');"
+
+#ENUMOID -----------------------------------------------------------------------
+psql -p 5432 -c "CREATE TYPE mood AS ENUM ('sad', 'ok', 'happy');"
+psql -p 5432 -c "CREATE TABLE person ( name text, current_mood mood);"
+psql -p 5433 -c "CREATE TYPE mood AS ENUM ('sad', 'ok', 'happy');"
+psql -p 5433 -c "CREATE TABLE person ( name text, current_mood mood);"
+
+psql -p 5432 -c "SELECT pg_store_query_plan('../test.txt', 'INSERT INTO person VALUES (''Moe'', ''happy'');');"
+psql -p 5432 -c "SELECT pg_exec_stored_plan('../test.txt');"
+psql -p 5433 -c "SELECT pg_exec_stored_plan('../test.txt');"
+
+psql -p 5432 -c "SELECT * FROM person WHERE current_mood = 'happy';"
+psql -p 5433 -c "SELECT * FROM person WHERE current_mood = 'happy';"
+

contrib/pg_repeater/pg_repeater.c

@@ -13,6 +13,7 @@
 
 #include "postgres.h"
 
+#include "access/parallel.h"
 #include "access/xact.h"
 #include "commands/extension.h"
 #include "executor/executor.h"
@@ -184,6 +185,7 @@ HOOK_ExecStart_injection(QueryDesc *queryDesc, int eflags)
 	 */
 		if (ExtensionIsActive() &&
 			queryDesc->plannedstmt->canSetTag &&
+			!IsParallelWorker() &&
 			((parsetree == NULL) || (nodeTag(parsetree) != T_CreatedbStmt)) &&
 			!(eflags & EXEC_FLAG_EXPLAIN_ONLY))
 		{

src/backend/commands/opclasscmds.c

@@ -1589,6 +1589,58 @@ RemoveOpFamilyById(Oid opfamilyOid)
 	heap_close(rel, RowExclusiveLock);
 }
 
+Oid
+get_family_oid(const char *opfname, const char *nspname, const char *ammth)
+{
+	Oid			nspoid,
+				amoid,
+				opfoid = InvalidOid;
+	HeapTuple	htup = NULL;
+
+	nspoid = LookupNamespaceNoError(nspname);
+	amoid = get_am_oid(ammth, false);
+
+	if (OidIsValid(nspoid) && OidIsValid(amoid))
+		htup = SearchSysCache3(OPFAMILYAMNAMENSP,
+							   ObjectIdGetDatum(amoid),
+							   PointerGetDatum(opfname),
+							   ObjectIdGetDatum(nspoid));
+
+	if (HeapTupleIsValid(htup))
+	{
+		opfoid = HeapTupleGetOid(htup);
+		ReleaseSysCache(htup);
+	}
+
+	return opfoid;
+}
+
+char *
+get_opfamily_name(Oid opfamilyOid, char **nspname, char **opfmethod)
+{
+	HeapTuple	tup;
+	char		*opfname;
+	Oid			nspoid,
+				mthoid;
+
+	Assert(nspname != NULL);
+
+
+	tup = SearchSysCache1(OPFAMILYOID, ObjectIdGetDatum(opfamilyOid));
+	if (!HeapTupleIsValid(tup)) /* should not happen */
+		elog(ERROR, "cache lookup failed for opfamily %u", opfamilyOid);
+
+	opfname = pstrdup(NameStr(((Form_pg_opfamily) GETSTRUCT(tup))->opfname));
+	nspoid = ((Form_pg_opfamily) GETSTRUCT(tup))->opfnamespace;
+	*nspname = get_namespace_name(nspoid);
+
+	mthoid = ((Form_pg_opfamily) GETSTRUCT(tup))->opfmethod;
+	*opfmethod = get_am_name(mthoid);
+
+	ReleaseSysCache(tup);
+	return opfname;
+}
+
 void
 RemoveOpClassById(Oid opclassOid)
 {

src/backend/nodes/outfuncs.c

@@ -25,8 +25,12 @@
 
 #include <ctype.h>
 
+#include "catalog/pg_type.h"
+#include "commands/dbcommands.h"
+#include "commands/defrem.h"
 #include "commands/user.h"
 #include "lib/stringinfo.h"
+#include "miscadmin.h"
 #include "nodes/extensible.h"
 #include "nodes/plannodes.h"
 #include "nodes/relation.h"
@@ -36,10 +40,13 @@
 #include "utils/syscache.h"
 
 #define NSP_NAME(nspoid) (get_namespace_name(nspoid))
-#define OID_TYPES_NUM	(6)
-static const Oid oid_types[OID_TYPES_NUM] = {RELOID, TYPEOID, PROCOID, COLLOID,
-											OPEROID, AUTHOID};
+#define OID_TYPES_NUM	(12)
 
+static const Oid oid_types[OID_TYPES_NUM] = {RELOID, TYPEOID, PROCOID, COLLOID,
+											OPEROID, AUTHOID, LANGOID, AMOID,
+											NAMESPACEOID, DATABASEOID, RULEOID,
+											OPFAMILYOID};
+static void _printDatum(StringInfo str, Datum value, Oid typid);
 static bool portable_output = false;
 void
 set_portable_output(bool value)
@@ -50,7 +57,9 @@ set_portable_output(bool value)
 static void
 write_oid_field(StringInfo str, Oid oid)
 {
-	int i;
+	int		i;
+	char	*rulename;
+	Oid		ev_class = InvalidOid;
 
 	if (!portable_output)
 	{
@@ -63,18 +72,23 @@ write_oid_field(StringInfo str, Oid oid)
 	if (!OidIsValid(oid))
 	{
 		/* Special case for invalid oid fields. For example, checkAsUser. */
-		appendStringInfo(str, "%u %u)", 0, oid);
+		appendStringInfo(str, "0 %u)", oid);
 		return;
 	}
 
 	for (i = 0; i < OID_TYPES_NUM; i++)
-		if (SearchSysCacheExists1(oid_types[i], oid))
+		if (oid_types[i] != RULEOID)
+		{
+			if (SearchSysCacheExists1(oid_types[i], oid))
+				break;
+		}
+		else if ((rulename = get_rule_name(oid, &ev_class)) != NULL)
 			break;
 
 	if (i == OID_TYPES_NUM)
 	{
-		elog(INFO, "Unexpected oid type %d!", oid);
-		appendStringInfo(str, "%u %u)", 0, oid);
+		elog(LOG, "Unexpected oid type %d!", oid);
+		appendStringInfo(str, "0 %u)", oid);
 		return;
 	}
 
@@ -147,6 +161,42 @@ write_oid_field(StringInfo str, Oid oid)
 		appendStringInfo(str, "%u %s", AUTHOID, get_rolename(oid));
 		break;
 
+	case LANGOID:
+		appendStringInfo(str, "%u %s", LANGOID, get_language_name(oid, false));
+		break;
+
+	case AMOID:
+		appendStringInfo(str, "%u %s", AMOID, get_am_name(oid));
+		break;
+
+	case NAMESPACEOID:
+		appendStringInfo(str, "%u %s", NAMESPACEOID, get_namespace_name_or_temp(oid));
+		break;
+
+	case DATABASEOID:
+		appendStringInfo(str, "%u %s", DATABASEOID, get_database_name(oid));
+		break;
+
+	case RULEOID:
+		Assert(rulename != NULL);
+		appendStringInfo(str, "%u %s %s %s", RULEOID, rulename,
+											NSP_NAME(get_rel_namespace(ev_class)),
+											get_rel_name(ev_class));
+		break;
+
+	case OPFAMILYOID:
+	{
+		char	*opfname = NULL,
+				*nspname = NULL,
+				*amname = NULL;
+
+		opfname = get_opfamily_name(oid, &nspname, &amname);
+		Assert(opfname && nspname && amname);
+
+		appendStringInfo(str, "%u %s %s %s", OPFAMILYOID, opfname, nspname, amname);
+	}
+		break;
+
 	default:
 		Assert(0);
 		break;
@@ -1125,6 +1175,8 @@ _outConst(StringInfo str, const Const *node)
 	appendStringInfoString(str, " :constvalue ");
 	if (node->constisnull)
 		appendStringInfoString(str, "<>");
+	else if (portable_output)
+		_printDatum(str, node->constvalue, node->consttype);
 	else
 		outDatum(str, node->constvalue, node->constlen, node->constbyval);
 }
@@ -4125,3 +4177,50 @@ bmsToString(const Bitmapset *bms)
 	outBitmapset(&str, bms);
 	return str.data;
 }
+
+/*
+ * Output value in text format
+ */
+static void
+_printDatum(StringInfo str, Datum value, Oid typid)
+{
+	Oid 		typOutput;
+	bool 		typIsVarlena;
+	FmgrInfo    finfo;
+	Datum		tmpval;
+	char	   *textvalue;
+	int			saveDateStyle;
+
+	/* Get output function for the type */
+	getTypeOutputInfo(typid, &typOutput, &typIsVarlena);
+	fmgr_info(typOutput, &finfo);
+
+	/* Detoast value if needed */
+	if (typIsVarlena)
+		tmpval = PointerGetDatum(PG_DETOAST_DATUM(value));
+	else
+		tmpval = value;
+
+	/*
+	 * It was found that if configuration setting for date style is
+	 * "postgres,ymd" the output dates have format DD-MM-YYYY and they can not
+	 * be parsed correctly by receiving party. So force ISO format YYYY-MM-DD
+	 * in internal cluster communications, these values are always parsed
+	 * correctly.
+	 */
+	saveDateStyle = DateStyle;
+	DateStyle = USE_ISO_DATES;
+
+	if (typid == OIDOID)
+	{
+		/* Const type is "OID". Need to parse. */
+		Oid oid = DatumGetObjectId(value);
+		write_oid_field(str, oid);
+	}
+	else
+	{
+		textvalue = DatumGetCString(FunctionCall1(&finfo, tmpval));
+		outToken(str, textvalue);
+	}
+	DateStyle = saveDateStyle;
+}