Add PROCOID, COLLOID, OPEROID translation

Author: danolivo

contrib/pg_execplan/init.sql

@@ -11,5 +11,5 @@ RETURNS VOID AS 'pg_execplan'
 LANGUAGE C;
 
 CREATE OR REPLACE FUNCTION @extschema@.pg_exec_query_plan(filename TEXT)
-RETURNS VOID AS 'pg_execplan'
+RETURNS BOOL AS 'pg_execplan'
 LANGUAGE C;

contrib/pg_execplan/pg_execplan.c

@@ -9,6 +9,7 @@
 #include "commands/extension.h"
 #include "commands/prepare.h"
 #include "executor/executor.h"
+#include "nodes/nodes.h"
 #include "nodes/plannodes.h"
 #include "tcop/pquery.h"
 #include "tcop/utility.h"
@@ -146,7 +147,7 @@ pg_exec_query_plan(PG_FUNCTION_ARGS)
 	}
 	PG_CATCH();
 	{
-		elog(INFO, "!!!BAD PLAN: %s", plan_string);
+		elog(INFO, "BAD PLAN: %s", plan_string);
 		PG_RE_THROW();
 	}
 	PG_END_TRY();
@@ -172,6 +173,8 @@ pg_exec_query_plan(PG_FUNCTION_ARGS)
 					  query_string,
 					  cplan->stmt_list,
 					  cplan);
+	PG_TRY();
+	{
 	PortalStart(portal, paramLI, eflags, InvalidSnapshot);
 	PortalSetResultFormat(portal, 0, &format);
 	(void) PortalRun(portal,
@@ -180,12 +183,20 @@ pg_exec_query_plan(PG_FUNCTION_ARGS)
 					 receiver,
 					 receiver,
 					 query_string);
+	}
+	PG_CATCH();
+	{
+		elog(INFO, "BAD QUERY: %s", query_string);
+		PG_RETURN_BOOL(false);
+	}
+	PG_END_TRY();
+
 	receiver->rDestroy(receiver);
 	PortalDrop(portal, false);
 	DropPreparedStatement(query_string, false);
 
 	if (EXPLAN_DEBUG_LEVEL > 0)
 		elog(INFO, "query execution finished.\n");
 
-	PG_RETURN_VOID();
+	PG_RETURN_BOOL(true);
 }

contrib/pg_execplan/tests/create_objects.sql

@@ -1,3 +1,7 @@
+CREATE SCHEMA tests;
+SET search_path = 'tests';
+
+CREATE TYPE int42;
 -- Make dummy I/O routines using the existing internal support for int4, text
 CREATE FUNCTION int42_in(cstring)
    RETURNS int42
@@ -17,4 +21,29 @@ CREATE TYPE int42 (
    passedbyvalue
 );
 
-CREATE TABLE t1 (id int42);
+-- RELOID, TYPEOID
+CREATE TABLE tests.t1 (id int42);
+CREATE TABLE t2 (id int, payload TEXT, par1 INT);
+
+CREATE FUNCTION select1(tid INT) RETURNS VOID AS $$
+BEGIN
+    INSERT INTO tests.t2 (id, payload, par1) VALUES (1, 'qwe', 2);
+END;
+$$ LANGUAGE plpgsql;
+
+-- COLLOID
+CREATE COLLATION test1 (locale = 'en_US.utf8');
+CREATE TABLE ttest1 (
+	id serial,
+    a text COLLATE test1,
+    b text COLLATE test1
+);
+INSERT INTO ttest1 (a, b) VALUES ('one', 'one');
+INSERT INTO ttest1 (a, b) VALUES ('one', 'two');
+
+-- OPEROID
+CREATE OPERATOR public.### (
+   leftarg = numeric,
+   rightarg = numeric,
+   procedure = numeric_add
+);

contrib/pg_execplan/tests/rpl.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
-# Script for the plan passing between separate instances
+# This script to pass some plans between separate instances.
 U=`whoami`
+export LC_ALL=C
+export LANGUAGE="en_US:en"
 
 # Paths
 PGINSTALL=`pwd`/tmp_install/
@@ -25,8 +27,8 @@ make -C contrib install > /dev/null
 
 mkdir PGDATA_Master
 mkdir PGDATA_Slave
-initdb -D PGDATA_Master
-initdb -D PGDATA_Slave
+initdb -D PGDATA_Master -E UTF8 --locale=C
+initdb -D PGDATA_Slave -E UTF8 --locale=C
 echo "shared_preload_libraries = 'postgres_fdw, pg_execplan'" >> PGDATA_Master/postgresql.conf
 echo "shared_preload_libraries = 'postgres_fdw, pg_execplan'" >> PGDATA_Slave/postgresql.conf
 
@@ -47,8 +49,39 @@ psql -p 5433 -c "DROP TABLE t0;"
 #create database objects for check of oid switching
 psql -p 5432 -f contrib/pg_execplan/tests/create_objects.sql
 psql -p 5433 -f contrib/pg_execplan/tests/create_objects.sql
+psql -p 5433 -c "SELECT current_schemas(true);"
 
 # TEST ON RELOID and TYPEOID objects.
-psql -p 5432 -c "SELECT pg_store_query_plan('../test.txt', 'SELECT * FROM t1;');"
+psql -p 5432 -c "SELECT pg_store_query_plan('../test.txt', 'SELECT * FROM tests.t1;');"
+psql -p 5433 -c "SELECT pg_exec_query_plan('../test.txt');"
+
+psql -p 5432 -c "SELECT pg_store_query_plan('../test.txt', 'SELECT tests.select1(42);');"
+psql -p 5433 -c "SELECT pg_exec_query_plan('../test.txt');"
+psql -p 5432 -c "SELECT pg_exec_query_plan('../test.txt');"
+
+psql -p 5432 -c "SELECT * FROM tests.t2;"
+psql -p 5433 -c "SELECT * FROM tests.t2;"
+
+# COLLOID ----------------------------------------------------------------------
+# Check on different oids
+psql -p 5432 -c "SELECT oid, * FROM pg_collation WHERE collname LIKE 'test%';"
+psql -p 5433 -c "SELECT oid, * FROM pg_collation WHERE collname LIKE 'test%';"
+
+psql -p 5432 -c "SELECT pg_store_query_plan('../test.txt', 'SELECT max(id) FROM tests.ttest1 WHERE a < b COLLATE tests.test1');"
+psql -p 5433 -c "SELECT pg_exec_query_plan('../test.txt');"
+
+# OPEROID ----------------------------------------------------------------------
+# Check on different oids
+psql -p 5432 -c "SELECT oid, oprname, oprnamespace FROM pg_operator WHERE oprname LIKE '###';"
+psql -p 5433 -c "SELECT oid, oprname, oprnamespace FROM pg_operator WHERE oprname LIKE '###';"
+
+# 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_query_plan('../test.txt');"
+
+psql -p 5433 -c "SELECT pg_store_query_plan('../test.txt', 'SELECT collname, nspname
+    FROM pg_collation JOIN pg_namespace ON (collnamespace = pg_namespace.oid)
+    WHERE collname LIKE ''test%''
+    ORDER BY 1;');"
 psql -p 5433 -c "SELECT pg_exec_query_plan('../test.txt');"
 

src/backend/nodes/outfuncs.c

@@ -34,8 +34,9 @@
 #include "utils/rel.h"
 #include "utils/syscache.h"
 
-#define OID_TYPES_NUM	(2)
-static const Oid oid_types[OID_TYPES_NUM] = {RELOID, TYPEOID};
+#define NSP_NAME(nspoid) (get_namespace_name(nspoid))
+#define OID_TYPES_NUM	(5)
+static const Oid oid_types[OID_TYPES_NUM] = {RELOID, TYPEOID, PROCOID, COLLOID, OPEROID};
 
 static bool portable_output = false;
 void
@@ -60,7 +61,6 @@ write_oid_field(StringInfo str, Oid oid)
 	if (!OidIsValid(oid))
 	{
 		/* Special case for invalid oid fields. For example, checkAsUser. */
-		elog(INFO, "oid %d is INVALID OID!", oid);
 		appendStringInfo(str, "%u %u)", 0, oid);
 		return;
 	}
@@ -79,27 +79,69 @@ write_oid_field(StringInfo str, Oid oid)
 	switch (oid_types[i])
 	{
 	case RELOID:
-		elog(INFO, "(RELOID %d): (%s, %s)", oid,
-				get_namespace_name((get_rel_namespace((oid)))),
-				get_rel_name((oid))
-				);
 		appendStringInfo(str, "%u %s %s", RELOID,
 								get_namespace_name((get_rel_namespace((oid)))),
 								get_rel_name((oid)));
 		break;
 
 	case TYPEOID:
-		elog(INFO, "(TYPEOID %d): %s %s", oid,
-				get_namespace_name(get_typ_namespace(oid)),
-			get_typ_name(oid));
 		appendStringInfo(str, "%u %s %s", TYPEOID,
 								get_namespace_name(get_typ_namespace(oid)),
 								get_typ_name(oid));
 
 		break;
 
+	case PROCOID:
+	{
+		Oid *argtypes;
+		int i, nargs;
+
+		get_func_signature(oid, &argtypes, &nargs);
+		appendStringInfo(str, "%u %s", PROCOID, NSP_NAME(get_func_namespace(oid)));
+		appendStringInfo(str, " %s", get_func_name(oid));
+		appendStringInfo(str, " %d", nargs);
+
+		for (i = 0; i < nargs; i++)
+		{
+			appendStringInfoChar(str, ' ');
+			outToken(str, NSP_NAME(get_typ_namespace(argtypes[i])));
+			appendStringInfoChar(str, ' ');
+			outToken(str, get_typ_name(argtypes[i]));
+		}
+	}
+		break;
+	case COLLOID:
+		appendStringInfo(str, "%u ", COLLOID);
+		outToken(str, NSP_NAME(get_collation_namespace(oid)));
+		appendStringInfoChar(str, ' ');
+		outToken(str, get_collation_name(oid));
+		appendStringInfo(str, " %d", get_collation_encoding(oid));
+		break;
+
+	case OPEROID:
+	{
+		Oid oprleft, oprright;
+
+		appendStringInfo(str, "%u ", OPEROID);
+		outToken(str, NSP_NAME(get_opnamespace(oid)));
+		appendStringInfoChar(str, ' ');
+		outToken(str, get_opname(oid));
+		appendStringInfoChar(str, ' ');
+		op_input_types(oid, &oprleft, &oprright);
+		outToken(str, OidIsValid(oprleft) ?
+				NSP_NAME(get_typ_namespace(oprleft)) : NULL);
+		appendStringInfoChar(str, ' ');
+		outToken(str, OidIsValid(oprleft) ? get_typ_name(oprleft) : NULL);
+		appendStringInfoChar(str, ' ');
+		outToken(str, OidIsValid(oprright) ?
+				NSP_NAME(get_typ_namespace(oprright)) : NULL);
+		appendStringInfoChar(str, ' ');
+		outToken(str, OidIsValid(oprright) ? get_typ_name(oprright) : NULL);
+	}
+		break;
+
 	default:
-		elog(ERROR, "oid %d type is %d (NOT DEFINED)!", oid, oid_types[i]);
+		Assert(0);
 		break;
 	}
 	appendStringInfo(str, ")");

src/backend/nodes/readfuncs.c

@@ -35,10 +35,12 @@
 #include "nodes/readfuncs.h"
 
 /* Portable-related dependencies */
-#include "utils/lsyscache.h"
 #include "catalog/namespace.h"
+#include "utils/builtins.h"
+#include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
+#define NSP_OID(nspname) LookupNamespaceNoError(nspname)
 static Oid read_oid_field(char **token, int *length);
 
 static bool portable_input = false;
@@ -2775,7 +2777,6 @@ read_oid_field(char **token, int *length)
 		*token = pg_strtok(length); /* Switch to relname */
 		relname = nullable_string(*token, *length);
 		oid = get_relname_relid(relname, rel_nsp_oid);
-		elog(INFO, "reloid=%d", oid);
 		break;
 	}
 	case TYPEOID:
@@ -2796,7 +2797,102 @@ read_oid_field(char **token, int *length)
 		}
 		else
 			oid = InvalidOid;
-		elog(INFO, "typeoid=%d", oid);
+	}
+		break;
+
+	case PROCOID:
+	{
+		char       *nspname; /* namespace name */
+		char       *funcname; /* function name */
+		int 		nargs; /* number of arguments */
+		Oid		   *argtypes; /* argument types */
+
+		*token = pg_strtok(length); /* get nspname */
+		nspname = nullable_string(*token, *length);
+		*token = pg_strtok(length); /* get funcname */
+		funcname = nullable_string(*token, *length);
+		*token = pg_strtok(length); /* get nargs */
+		nargs = atoi(*token);
+
+		if (funcname)
+		{
+			int	i;
+			argtypes = palloc(nargs * sizeof(Oid));
+			for (i = 0; i < nargs; i++)
+			{
+				char *typnspname; /* argument type namespace */
+				char *typname; /* argument type name */
+
+				*token = pg_strtok(length); /* get type nspname */
+				typnspname = nullable_string(*token, *length);
+				*token = pg_strtok(length); /* get type name */
+				typname = nullable_string(*token, *length);
+				argtypes[i] = get_typname_typid(typname,
+												NSP_OID(typnspname));
+			}
+			oid = get_funcid(funcname, buildoidvector(argtypes, nargs), NSP_OID(nspname));
+		}
+		else
+			oid = InvalidOid;
+	}
+	break;
+
+	case COLLOID:
+	{
+		char       *nspname; /* namespace name */
+		char       *collname; /* collation name */
+		int 		collencoding; /* collation encoding */
+
+		*token = pg_strtok(length); /* get nspname */
+		nspname = nullable_string(*token, *length);
+		*token = pg_strtok(length); /* get collname */
+		collname = nullable_string(*token, *length);
+		*token = pg_strtok(length); /* get collencoding */
+		collencoding = atoi(*token);
+		if (collname)
+			oid = get_collid(collname, collencoding, NSP_OID(nspname));
+		else
+			oid = InvalidOid;
+	}
+		break;
+
+	case OPEROID:
+	{
+		char       *nspname; /* namespace name */
+		char       *oprname; /* operator name */
+		char	   *leftnspname; /* left type namespace */
+		char	   *leftname; /* left type name */
+		Oid			oprleft; /* left type */
+		char	   *rightnspname; /* right type namespace */
+		char	   *rightname; /* right type name */
+		Oid			oprright; /* right type */
+
+		*token = pg_strtok(length); /* get nspname */
+		nspname = nullable_string(*token, *length);
+		*token = pg_strtok(length); /* get operator name */
+		oprname = nullable_string(*token, *length);
+		*token = pg_strtok(length); /* left type namespace */
+		leftnspname = nullable_string(*token, *length);
+		*token = pg_strtok(length); /* left type name */
+		leftname = nullable_string(*token, *length);
+		*token = pg_strtok(length); /* right type namespace */
+		rightnspname = nullable_string(*token, *length);
+		*token = pg_strtok(length); /* right type name */
+		rightname =nullable_string(*token, *length);
+		if (oprname)
+		{
+			if (leftname)
+				oprleft = get_typname_typid(leftname, NSP_OID(leftnspname));
+			else
+				oprleft = InvalidOid;
+			if (rightname)
+				oprright = get_typname_typid(rightname, NSP_OID(rightnspname));
+			else
+				oprright = InvalidOid;
+			oid = get_operid(oprname, oprleft, oprright, NSP_OID(nspname));
+		}
+		else
+			oid = InvalidOid;
 	}
 		break;