Add RELOID and TYPEOID portbility.

danolivo · danolivo · commit 057683ccb227 · 2019-01-27T15:12:43.000+05:00
diff --git a/init.sql b/init.sql
@@ -4,8 +4,9 @@
 -- query - query string which will be parsed and planned.
 -- filename - path to the file on a disk.
 CREATE OR REPLACE FUNCTION @extschema@.pg_store_query_plan(
-														query TEXT,
-														filename TEXT)
+															filename TEXT,
+															query TEXT
+														  )
 RETURNS VOID AS 'pg_execplan'
 LANGUAGE C;
 
diff --git a/pg_execplan.c b/pg_execplan.c
@@ -83,7 +83,9 @@ pg_store_query_plan(PG_FUNCTION_ARGS)
 	fwrite(&string_len, sizeof(size_t), 1, fout);
 	fwrite(query_string, sizeof(char), string_len, fout);
 
+	set_portable_output(true);
 	plan_string = nodeToString(queryDesc->plannedstmt);
+	set_portable_output(false);
 	string_len = strlen(plan_string);
 	fwrite(&string_len, sizeof(size_t), 1, fout);
 	fwrite(plan_string, sizeof(char), string_len, fout);
@@ -135,7 +137,19 @@ pg_exec_query_plan(PG_FUNCTION_ARGS)
 	int					eflags = 0;
 
 	LoadPlanFromFile(filename, &query_string, &plan_string);
-	pstmt = (PlannedStmt *) stringToNode(plan_string);
+
+	PG_TRY();
+	{
+		set_portable_input(true);
+		pstmt = (PlannedStmt *) stringToNode(plan_string);
+		set_portable_input(false);
+	}
+	PG_CATCH();
+	{
+		elog(INFO, "!!!BAD PLAN: %s", plan_string);
+		PG_RE_THROW();
+	}
+	PG_END_TRY();
 
 	psrc = CreateCachedPlan(NULL, query_string, query_string);
 	CompleteCachedPlan(psrc, NIL, NULL, NULL, 0, NULL, NULL,
diff --git a/tests/create_objects.sql b/tests/create_objects.sql
@@ -0,0 +1,20 @@
+-- Make dummy I/O routines using the existing internal support for int4, text
+CREATE FUNCTION int42_in(cstring)
+   RETURNS int42
+   AS 'int4in'
+   LANGUAGE internal STRICT IMMUTABLE;
+CREATE FUNCTION int42_out(int42)
+   RETURNS cstring
+   AS 'int4out'
+   LANGUAGE internal STRICT IMMUTABLE;
+
+CREATE TYPE int42 (
+   internallength = 4,
+   input = int42_in,
+   output = int42_out,
+   alignment = int4,
+   default = 42,
+   passedbyvalue
+);
+
+CREATE TABLE t1 (id int42);
diff --git a/tests/rpl.sh b/tests/rpl.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# Script for the plan passing between separate instances
+U=`whoami`
+
+# Paths
+PGINSTALL=`pwd`/tmp_install/
+LD_LIBRARY_PATH=$PGINSTALL/lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+export PATH=$PGINSTALL/bin:$PATH
+
+pkill -9 postgres || true
+sleep 1
+rm -rf $PGINSTALL || true
+rm -rf PGDATA_Master || true
+rm -rf PGDATA_Slave || true
+rm -rf master.log || true
+rm -rf slave.log || true
+
+# Building project
+make > /dev/null
+make -C contrib > /dev/null
+make install > /dev/null
+make -C contrib install > /dev/null
+
+mkdir PGDATA_Master
+mkdir PGDATA_Slave
+initdb -D PGDATA_Master
+initdb -D PGDATA_Slave
+echo "shared_preload_libraries = 'postgres_fdw, pg_execplan'" >> PGDATA_Master/postgresql.conf
+echo "shared_preload_libraries = 'postgres_fdw, pg_execplan'" >> PGDATA_Slave/postgresql.conf
+
+pg_ctl -w -D PGDATA_Master -o "-p 5432" -l master.log start
+pg_ctl -w -D PGDATA_Slave -o "-p 5433" -l slave.log start
+createdb $U -p 5432
+createdb $U -p 5433
+
+psql -p 5432 -c "CREATE EXTENSION postgres_fdw;"
+psql -p 5433 -c "CREATE EXTENSION postgres_fdw;"
+psql -p 5432 -c "CREATE EXTENSION pg_execplan;"
+psql -p 5433 -c "CREATE EXTENSION pg_execplan;"
+
+# shift oids
+psql -p 5433 -c "CREATE TABLE t0 (id int);"
+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
+
+# TEST ON RELOID and TYPEOID objects.
+psql -p 5432 -c "SELECT pg_store_query_plan('../test.txt', 'SELECT * FROM t1;');"
+psql -p 5433 -c "SELECT pg_exec_query_plan('../test.txt');"
+
