Remove portals from pg_execplan, temporarily add DestLog receiver. + pgindent of code processing

Author: danolivo

contrib/pg_execplan/pg_execplan.c

@@ -104,9 +104,8 @@ exec_plan(char *query_string, char *plan_string)
 	ParamListInfo 		paramLI = NULL;
 	CachedPlanSource	*psrc;
 	CachedPlan			*cplan;
-	Portal				portal;
+	QueryDesc			*queryDesc;
 	DestReceiver		*receiver;
-	int16				format = 0;
 	int					eflags = 0;
 
 	PG_TRY();
@@ -134,36 +133,35 @@ exec_plan(char *query_string, char *plan_string)
 	SetRemoteSubplan(psrc, pstmt);
 	cplan = GetCachedPlan(psrc, paramLI, false);
 
-	receiver = CreateDestReceiver(DestNone);
-	portal = CreateNewPortal();
-	portal->visible = false;
-	PortalDefineQuery(portal,
-					  NULL,
-					  query_string,
-					  NULL,
-					  NULL,
-					  cplan);
+	receiver = CreateDestReceiver(DestLog);
+
 	PG_TRY();
 	{
-	PortalStart(portal, paramLI, eflags, InvalidSnapshot);
-	PortalSetResultFormat(portal, 0, &format);
-	(void) PortalRun(portal,
-					 FETCH_ALL,
-					 true,
-					 receiver,
-					 receiver,
-					 query_string);
+		queryDesc = CreateQueryDesc(pstmt,
+									query_string,
+									GetActiveSnapshot(),
+									InvalidSnapshot,
+									receiver,
+									paramLI,
+									0);
+		ExecutorStart(queryDesc, eflags);
+		PushActiveSnapshot(queryDesc->snapshot);
+		ExecutorRun(queryDesc, ForwardScanDirection, 0);
+		PopActiveSnapshot();
+		ExecutorFinish(queryDesc);
+		ExecutorEnd(queryDesc);
+		FreeQueryDesc(queryDesc);
 	}
 	PG_CATCH();
 	{
 		elog(INFO, "BAD QUERY: '%s'.", query_string);
-		PortalDrop(portal, false);
+		ReleaseCachedPlan(cplan, false);
 		PG_RE_THROW();
 	}
 	PG_END_TRY();
 
 	receiver->rDestroy(receiver);
-	PortalDrop(portal, false);
+	ReleaseCachedPlan(cplan, false);
 
 	if (EXPLAN_DEBUG_LEVEL > 0)
 		elog(INFO, "query execution finished.\n");

contrib/pg_execplan/tests/create_objects.sql

@@ -47,3 +47,24 @@ CREATE OPERATOR public.### (
    rightarg = numeric,
    procedure = numeric_add
 );
+
+-- Different types and parameter types
+CREATE TYPE bug_status AS ENUM ('new', 'open', 'closed');
+
+CREATE TABLE public.bug (
+    id serial,
+    description TEXT,
+    status bug_status
+);
+
+INSERT INTO public.bug (description, status) VALUES ('abc', 'open');
+INSERT INTO public.bug (description, status) VALUES ('abc1', 'closed');
+
+CREATE TABLE public.bug1 (
+    id serial,
+    status bug_status
+);
+INSERT INTO public.bug1 (status) VALUES ('new');
+INSERT INTO public.bug1 (status) VALUES ('new');
+INSERT INTO public.bug1 (status) VALUES ('closed');
+

contrib/pg_execplan/tests/rpl.sh

@@ -80,15 +80,18 @@ psql -p 5432 -c "SELECT pg_store_query_plan('../test.txt', 'SELECT id ### 1 FROM
 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 5432 -c "SELECT pg_store_query_plan('../test.txt', 'INSERT INTO bug (description, status) VALUES (''abc3'', ''new''::tests.bug_status);');"
 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';"
+#psql -p 5432 -c "SELECT pg_store_query_plan('../test.txt', 'SELECT * FROM bug WHERE status=''open''');"
+#psql -p 5433 -c "SELECT pg_exec_stored_plan('../test.txt');"
+echo "ENUMOID test"
+#psql -p 5432 -c "INSERT INTO public.bug1 (status) VALUES ('new');"
+psql -p 5432 -c "SELECT pg_store_query_plan('../test.txt', '
+													SELECT A.description, B.id
+													FROM bug as A, bug1 AS B
+													WHERE A.status = B.status;
+				');"
+psql -p 5433 -c "SELECT pg_exec_stored_plan('../test.txt');"
+psql -p 5432 -c "SELECT * FROM bug;"
+psql -p 5432 -c "SELECT * FROM bug1;"