merge with twophase_decoding2 branch

Author: kelvich

contrib/Makefile

@@ -35,6 +35,9 @@ SUBDIRS = \
 		pg_stat_statements \
 		pg_trgm		\
 		pgcrypto	\
+		pglogical_output \
+		pglogical_output_plhooks \
+		pglogical	\
 		pgrowlocks	\
 		pgstattuple	\
 		pg_visibility	\

contrib/pglogical/.gitignore

@@ -0,0 +1,5 @@
+results
+tmp_check
+*.o
+*.so
+*~

contrib/pglogical/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "pglogical_output"]
+	path = pglogical_output
+	url = git@github.com:2ndQuadrant/pglogical_output.git

contrib/pglogical/Makefile

@@ -0,0 +1,33 @@
+# contrib/pglogical/Makefile
+
+MODULE_big = pglogical
+EXTENSION = pglogical
+PGFILEDESC = "pglogical - logical replication"
+
+DATA = pglogical--1.0.1.sql
+
+OBJS = pglogical_apply.o pglogical_conflict.o pglogical_manager.o \
+	   pglogical_node.o pglogical_proto.o pglogical_relcache.o \
+	   pglogical.o pglogical_repset.o pglogical_rpc.o \
+	   pglogical_functions.o pglogical_queue.o pglogical_fe.o \
+	   pglogical_worker.o pglogical_hooks.o pglogical_sync.o
+
+PG_CPPFLAGS = -I$(libpq_srcdir) -I$(top_srcdir)/contrib/pglogical_output
+SHLIB_LINK = $(libpq)
+
+REGRESS = preseed infofuncs init_fail init preseed_check basic extended toasted replication_set add_table matview bidirectional primary_key foreign_key functions copy twophase drop
+
+# In-tree builds only
+subdir = contrib/pglogical
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+
+# Disabled because these tests require "wal_level=logical", which
+# typical installcheck users do not have (e.g. buildfarm clients).
+@installcheck: ;
+
+EXTRA_INSTALL += contrib/pglogical_output
+EXTRA_REGRESS_OPTS += --temp-config $(top_srcdir)/contrib/pglogical/regress-postgresql.conf
+
+.PHONY: pglogical_create_subscriber