Add pg_repeater and functionality for passing regression tests

Author: danolivo

contrib/Makefile

@@ -39,6 +39,7 @@ SUBDIRS = \
 		pgrowlocks	\
 		pgstattuple	\
 		pg_execplan \
+		pg_repeater \
 		pg_visibility	\
 		postgres_fdw	\
 		seg		\

contrib/pg_execplan/Makefile

@@ -7,9 +7,7 @@ PGFILEDESC = "pg_execplan"
 MODULES = pg_execplan
 OBJS = pg_execplan.o $(WIN32RES)
 
-fdw_srcdir = $(top_srcdir)/contrib/postgres_fdw/
-
-PG_CPPFLAGS = -I$(libpq_srcdir) -I$(fdw_srcdir) -L$(fdw_srcdir)
+PG_CPPFLAGS = -I$(libpq_srcdir)
 SHLIB_LINK_INTERNAL = $(libpq)
 
 DATA_built = $(EXTENSION)--$(EXTVERSION).sql
@@ -19,12 +17,10 @@ PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 else
-EXTRA_INSTALL = contrib/postgres_fdw
 SHLIB_PREREQS = submake-libpq
 subdir = contrib/pg_execplan
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
-#include $(top_builddir)/contrib/postgres_fdw/Makefile
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 

contrib/pg_execplan/pg_execplan.c

@@ -117,31 +117,31 @@ exec_plan(char *query_string, char *plan_string)
 	}
 	PG_CATCH();
 	{
-		elog(INFO, "BAD PLAN: %s", plan_string);
+		elog(INFO, "BAD PLAN: %s. Query: %s", plan_string, query_string);
 		PG_RE_THROW();
 	}
 	PG_END_TRY();
 
-	psrc = CreateCachedPlan(NULL, query_string, query_string);
-	CompleteCachedPlan(psrc, NIL, NULL, NULL, 0, NULL, NULL,
-							   CURSOR_OPT_GENERIC_PLAN, false);
-	StorePreparedStatement(query_string, psrc, false);
-	SetRemoteSubplan(psrc, pstmt);
-	cplan = GetCachedPlan(psrc, paramLI, false);
-
 	if (EXPLAN_DEBUG_LEVEL > 0)
 		elog(INFO, "query: %s\n", query_string);
 	if (EXPLAN_DEBUG_LEVEL > 1)
 		elog(INFO, "\nplan: %s\n", plan_string);
 
-	receiver = CreateDestReceiver(DestDebug);
+	psrc = CreateCachedPlan(NULL, query_string, NULL);
+	CompleteCachedPlan(psrc, NIL, NULL, NULL, 0, NULL, NULL,
+							   CURSOR_OPT_GENERIC_PLAN, false);
+
+	SetRemoteSubplan(psrc, pstmt);
+	cplan = GetCachedPlan(psrc, paramLI, false);
+
+	receiver = CreateDestReceiver(DestNone);
 	portal = CreateNewPortal();
 	portal->visible = false;
 	PortalDefineQuery(portal,
 					  NULL,
 					  query_string,
-					  query_string,
-					  cplan->stmt_list,
+					  NULL,
+					  NULL,
 					  cplan);
 	PG_TRY();
 	{
@@ -156,14 +156,14 @@ exec_plan(char *query_string, char *plan_string)
 	}
 	PG_CATCH();
 	{
-		elog(INFO, "BAD QUERY: %s", query_string);
+		elog(INFO, "BAD QUERY: '%s'.", query_string);
+		PortalDrop(portal, false);
 		PG_RE_THROW();
 	}
 	PG_END_TRY();
 
 	receiver->rDestroy(receiver);
 	PortalDrop(portal, false);
-	DropPreparedStatement(query_string, false);
 
 	if (EXPLAN_DEBUG_LEVEL > 0)
 		elog(INFO, "query execution finished.\n");
@@ -175,9 +175,29 @@ pg_exec_plan(PG_FUNCTION_ARGS)
 	char	*query_string = TextDatumGetCString(PG_GETARG_DATUM(0));
 	char	*plan_string = TextDatumGetCString(PG_GETARG_DATUM(1));
 
+	char	*dec_query,
+			*dec_plan;
+	int		dec_query_len,
+			dec_query_len1,
+			dec_plan_len,
+			dec_plan_len1;
+
 	Assert(query_string != NULL);
 	Assert(plan_string != NULL);
-	exec_plan(query_string, plan_string);
+
+	dec_query_len = b64_dec_len(query_string, strlen(query_string) + 1)+1;
+	dec_query = palloc0(dec_query_len + 1);
+	dec_query_len1 = b64_decode(query_string, strlen(query_string), dec_query);
+	Assert(dec_query_len > dec_query_len1);
+
+	dec_plan_len = b64_dec_len(plan_string, strlen(plan_string) + 1);
+	dec_plan = palloc0(dec_plan_len + 1);
+	dec_plan_len1 = b64_decode(plan_string, strlen(plan_string), dec_plan);
+	Assert(dec_plan_len > dec_plan_len1);
+
+	exec_plan(dec_query, dec_plan);
+	pfree(dec_query);
+	pfree(dec_plan);
 	PG_RETURN_BOOL(true);
 }
 

contrib/pg_execplan/pg_execplan.control

@@ -3,4 +3,3 @@ comment = 'Execute raw query plan on remote node'
 default_version = '0.1'
 module_pathname = '$libdir/pg_execplan'
 relocatable = false
-requires = 'postgres_fdw'

contrib/pg_execplan/tests/regress

@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# This script performs regress tests at a master and mirrored it into the slave.
+U=`whoami`
+export LC_ALL=C
+export LANGUAGE="en_US:en"
+
+# Paths
+PGINSTALL=`pwd`/tmp_install/
+SCRIPTS=`pwd`/contrib/pg_execplan/tests
+LD_LIBRARY_PATH=$PGINSTALL/lib
+remoteSrvName=fdwremote
+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 -E UTF8 --locale=C
+initdb -D PGDATA_Slave -E UTF8 --locale=C
+echo "shared_preload_libraries = 'postgres_fdw, pg_execplan, pg_repeater'" >> PGDATA_Master/postgresql.conf
+echo "shared_preload_libraries = 'pg_execplan'" >> PGDATA_Slave/postgresql.conf
+echo "repeater.fdwname = '$remoteSrvName'" >> PGDATA_Master/postgresql.conf
+
+pg_ctl -c -o "-p 5433" -D PGDATA_Slave -l slave.log start
+pg_ctl -c -o "-p 5432" -D PGDATA_Master -l master.log start
+createdb -p 5433 $U
+createdb -p 5432 $U
+
+psql -p 5432 -c "CREATE EXTENSION postgres_fdw;"
+psql -p 5432 -c "CREATE SERVER $remoteSrvName FOREIGN DATA WRAPPER postgres_fdw OPTIONS (port '5433', use_remote_estimate 'on');"
+psql -p 5432 -c "CREATE USER MAPPING FOR PUBLIC SERVER $remoteSrvName;"
+
+# Prepare plan execution
+psql -p 5432 -c "CREATE EXTENSION pg_execplan;"
+psql -p 5433 -c "CREATE EXTENSION pg_execplan;"
+psql -p 5432 -c "CREATE EXTENSION pg_repeater;"
+
+psql -p 5433 -c "CREATE TABLE t2 (id Serial, b INT, PRIMARY KEY(id));"
+psql -p 5433 -c "DROP TABLE t2;"
+#psql -p 5433 -c "SELECT pg_exec_plan('SELECT * FROM pg_class;','sdadad');"
+
+rm -rf `pwd`/src/test/regress/testtablespace
+mkdir `pwd`/src/test/regress/testtablespace
+rm -rf $PGINSTALL/lib/regress.so
+cp `pwd`/src/test/regress/regress.so $PGINSTALL/lib
+cp `pwd`/src/test/regress/regress.so $PGINSTALL/lib/postgresql/
+cd src/test/regress
+./pg_regress --schedule=$SCRIPTS/serial_schedule --load-extension=postgres_fdw --load-extension=pg_execplan --load-extension=pg_repeater --dbname=andrey --use-existing

contrib/pg_execplan/tests/rpl.sh

@@ -78,10 +78,3 @@ 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_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_stored_plan('../test.txt');"
-

contrib/pg_execplan/tests/serial_schedule

@@ -0,0 +1,172 @@
+# src/test/regress/serial_schedule
+# This should probably be in an order similar to parallel_schedule.
+test: boolean
+test: char
+test: name
+test: varchar
+test: text
+test: int2
+test: int4
+test: int8
+test: oid
+test: float4
+test: float8
+test: bit
+test: numeric
+test: txid
+test: uuid
+test: enum
+test: money
+test: rangetypes
+test: pg_lsn
+test: regproc
+test: strings
+test: numerology
+test: point
+test: lseg
+test: line
+test: box
+test: path
+test: polygon
+test: circle
+test: date
+test: time
+test: timetz
+test: timestamp
+test: timestamptz
+test: interval
+test: abstime
+test: reltime
+test: tinterval
+test: inet
+test: macaddr
+test: tstypes
+test: comments
+test: geometry
+test: horology
+test: regex
+test: oidjoins
+test: type_sanity
+test: opr_sanity
+test: insert
+test: insert_conflict
+test: create_function_1
+test: create_type
+test: create_table
+test: create_function_2
+test: copy
+test: copyselect
+test: copydml
+test: create_misc
+test: create_operator
+test: create_index
+test: create_view
+test: create_aggregate
+test: create_function_3
+test: create_cast
+test: constraints
+test: triggers
+test: inherit
+test: create_table_like
+test: typed_table
+test: vacuum
+test: drop_if_exists
+test: updatable_views
+test: rolenames
+test: roleattributes
+test: create_am
+test: sanity_check
+test: errors
+test: select
+test: select_into
+test: select_distinct
+test: select_distinct_on
+test: select_implicit
+test: select_having
+test: subselect
+test: union
+test: case
+test: join
+test: aggregates
+test: transactions
+ignore: random
+test: random
+test: portals
+test: arrays
+test: btree_index
+test: hash_index
+test: update
+test: delete
+test: namespace
+test: prepared_xacts
+test: brin
+test: gin
+test: gist
+test: spgist
+test: privileges
+test: init_privs
+test: security_label
+test: collate
+test: matview
+test: lock
+test: replica_identity
+test: rowsecurity
+test: object_address
+test: tablesample
+test: groupingsets
+test: drop_operator
+test: alter_generic
+test: alter_operator
+test: misc
+test: psql
+test: async
+test: dbsize
+test: misc_functions
+test: tsrf
+test: rules
+test: psql_crosstab
+test: select_parallel
+test: publication
+test: subscription
+test: amutils
+test: select_views
+test: portals_p2
+test: foreign_key
+test: cluster
+test: dependency
+test: guc
+test: bitmapops
+test: combocid
+test: tsearch
+test: tsdicts
+test: foreign_data
+test: window
+test: xmlmap
+test: functional_deps
+test: advisory_lock
+test: json
+test: jsonb
+test: json_encoding
+test: indirect_toast
+test: equivclass
+test: plancache
+test: limit
+test: plpgsql
+test: copy2
+test: temp
+test: domain
+test: rangefuncs
+test: prepare
+test: without_oid
+test: conversion
+test: truncate
+test: alter_table
+test: sequence
+test: polymorphism
+test: rowtypes
+test: returning
+test: largeobject
+test: with
+test: xml
+test: event_trigger
+test: stats

contrib/pg_repeater/Makefile

@@ -4,7 +4,7 @@ MODULE_big = pg_repeater
 EXTENSION = pg_repeater
 EXTVERSION = 0.1
 PGFILEDESC = "pg_repeater"
-MODULES = pg_repeater1
+MODULES = pg_repeater
 OBJS = pg_repeater.o $(WIN32RES)
 
 fdw_srcdir = $(top_srcdir)/contrib/postgres_fdw/