Add PROCOID, COLLOID, OPEROID translation

Author: danolivo

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;

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);
 }

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
+);

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');"