Add pg_exec_plan() routine

Author: danolivo

contrib/pg_execplan/init.sql

@@ -10,6 +10,12 @@ CREATE OR REPLACE FUNCTION @[email protected]_store_query_plan(
 RETURNS VOID AS 'pg_execplan'
 LANGUAGE C;
 
-CREATE OR REPLACE FUNCTION @[email protected]_exec_query_plan(filename TEXT)
+CREATE OR REPLACE FUNCTION @[email protected]_exec_plan(query TEXT,
+													plan TEXT
+													)
+RETURNS BOOL AS 'pg_execplan'
+LANGUAGE C;
+
+CREATE OR REPLACE FUNCTION @[email protected]_exec_stored_plan(filename TEXT)
 RETURNS BOOL AS 'pg_execplan'
 LANGUAGE C;

contrib/pg_execplan/pg_execplan.c

@@ -24,7 +24,8 @@
 PG_MODULE_MAGIC;
 
 PG_FUNCTION_INFO_V1(pg_store_query_plan);
-PG_FUNCTION_INFO_V1(pg_exec_query_plan);
+PG_FUNCTION_INFO_V1(pg_exec_plan);
+PG_FUNCTION_INFO_V1(pg_exec_stored_plan);
 
 void _PG_init(void);
 
@@ -97,37 +98,8 @@ pg_store_query_plan(PG_FUNCTION_ARGS)
 }
 
 static void
-LoadPlanFromFile(const char *filename, char **query_string, char **plan_string)
-{
-	FILE	*fin;
-	size_t	string_len;
-	int		nelems;
-
-	fin = fopen(filename, "rb");
-	Assert(fin != NULL);
-
-	nelems = fread(&string_len, sizeof(size_t), 1, fin);
-	Assert(nelems == 1);
-	*query_string = palloc0(string_len + 1);
-	nelems = fread(*query_string, sizeof(char), string_len, fin);
-	Assert(nelems == string_len);
-
-	nelems = fread(&string_len, sizeof(size_t), 1, fin);
-	Assert(nelems == 1);
-	*plan_string = palloc0(string_len + 1);
-	nelems = fread(*plan_string, sizeof(char), string_len, fin);
-	Assert(nelems == string_len);
-
-	fclose(fin);
-
-}
-
-Datum
-pg_exec_query_plan(PG_FUNCTION_ARGS)
+exec_plan(char *query_string, char *plan_string)
 {
-	char				*filename = TextDatumGetCString(PG_GETARG_DATUM(0)),
-						*query_string = NULL,
-						*plan_string = NULL;
 	PlannedStmt			*pstmt;
 	ParamListInfo 		paramLI = NULL;
 	CachedPlanSource	*psrc;
@@ -137,8 +109,6 @@ pg_exec_query_plan(PG_FUNCTION_ARGS)
 	int16				format = 0;
 	int					eflags = 0;
 
-	LoadPlanFromFile(filename, &query_string, &plan_string);
-
 	PG_TRY();
 	{
 		set_portable_input(true);
@@ -187,7 +157,7 @@ pg_exec_query_plan(PG_FUNCTION_ARGS)
 	PG_CATCH();
 	{
 		elog(INFO, "BAD QUERY: %s", query_string);
-		PG_RETURN_BOOL(false);
+		PG_RE_THROW();
 	}
 	PG_END_TRY();
 
@@ -197,6 +167,54 @@ pg_exec_query_plan(PG_FUNCTION_ARGS)
 
 	if (EXPLAN_DEBUG_LEVEL > 0)
 		elog(INFO, "query execution finished.\n");
+}
+
+Datum
+pg_exec_plan(PG_FUNCTION_ARGS)
+{
+	char	*query_string = TextDatumGetCString(PG_GETARG_DATUM(0));
+	char	*plan_string = TextDatumGetCString(PG_GETARG_DATUM(1));
 
+	Assert(query_string != NULL);
+	Assert(plan_string != NULL);
+	exec_plan(query_string, plan_string);
+	PG_RETURN_BOOL(true);
+}
+
+static void
+LoadPlanFromFile(const char *filename, char **query_string, char **plan_string)
+{
+	FILE	*fin;
+	size_t	string_len;
+	int		nelems;
+
+	fin = fopen(filename, "rb");
+	Assert(fin != NULL);
+
+	nelems = fread(&string_len, sizeof(size_t), 1, fin);
+	Assert(nelems == 1);
+	*query_string = palloc0(string_len + 1);
+	nelems = fread(*query_string, sizeof(char), string_len, fin);
+	Assert(nelems == string_len);
+
+	nelems = fread(&string_len, sizeof(size_t), 1, fin);
+	Assert(nelems == 1);
+	*plan_string = palloc0(string_len + 1);
+	nelems = fread(*plan_string, sizeof(char), string_len, fin);
+	Assert(nelems == string_len);
+
+	fclose(fin);
+
+}
+
+Datum
+pg_exec_stored_plan(PG_FUNCTION_ARGS)
+{
+	char				*filename = TextDatumGetCString(PG_GETARG_DATUM(0)),
+						*query_string = NULL,
+						*plan_string = NULL;
+
+	LoadPlanFromFile(filename, &query_string, &plan_string);
+	exec_plan(query_string, plan_string);
 	PG_RETURN_BOOL(true);
 }

contrib/pg_execplan/tests/rpl.sh

@@ -53,11 +53,11 @@ 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 tests.t1;');"
-psql -p 5433 -c "SELECT pg_exec_query_plan('../test.txt');"
+psql -p 5433 -c "SELECT pg_exec_stored_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 5433 -c "SELECT pg_exec_stored_plan('../test.txt');"
+psql -p 5432 -c "SELECT pg_exec_stored_plan('../test.txt');"
 
 psql -p 5432 -c "SELECT * FROM tests.t2;"
 psql -p 5433 -c "SELECT * FROM tests.t2;"
@@ -68,7 +68,7 @@ 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');"
+psql -p 5433 -c "SELECT pg_exec_stored_plan('../test.txt');"
 
 # OPEROID ----------------------------------------------------------------------
 # Check on different oids
@@ -77,11 +77,11 @@ 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_query_plan('../test.txt');"
+psql -p 5433 -c "SELECT pg_exec_stored_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');"
+psql -p 5433 -c "SELECT pg_exec_stored_plan('../test.txt');"