Merge branch 'PGPROEE10_scheduler' into PGPROEE10

Author: vbwagner

contrib/pgpro_scheduler/Makefile

@@ -2,23 +2,31 @@ MODULE_big = pgpro_scheduler
 OBJS = src/pgpro_scheduler.o src/cron_string.o src/sched_manager_poll.o \
 	src/char_array.o src/scheduler_spi_utils.o src/scheduler_manager.o \
 	src/bit_array.o src/scheduler_job.o src/memutils.o \
-	src/scheduler_executor.o \
+	src/scheduler_executor.o src/scheduler_mtm.o \
 	$(WIN32RES)
 EXTENSION = pgpro_scheduler
 DATA = pgpro_scheduler--2.0.sql pgpro_scheduler--2.0--2.1.sql \
-	pgpro_scheduler--2.1.sql
+	pgpro_scheduler--2.1.sql pgpro_scheduler--2.1--2.2.sql \
+	pgpro_scheduler--2.2.sql
 REGRESS	= install_pgpro_scheduler cron_string
 #REGRESS_OPTS = --user=postgres
 EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
 
+
 ifdef USE_PGXS
 	PG_CONFIG = pg_config
 	PGXS := $(shell $(PG_CONFIG) --pgxs)
+	ifdef WITH_MTM
+		PG_CPPFLAGS = -D_WITH_MTM -I$(WITH_MTM) -I$(libpq_srcdir)
+	endif
 	include $(PGXS)
 else
 	subdir = contrib/pgpro_scheduler
 	top_builddir = ../..
 	include $(top_builddir)/src/Makefile.global
+	ifneq ($(MAJORVERSION),10)
+		PG_CPPFLAGS = -D_WITH_MTM -I$(top_srcdir)/contrib/mmts -I$(libpq_srcdir)
+	endif
 	include $(top_srcdir)/contrib/contrib-global.mk
 endif
 

contrib/pgpro_scheduler/README.md

@@ -28,6 +28,13 @@ Install extension as follows:
 	$ sudo make USE_PGXS=1 install
 	$ psql <DBNAME> -c "CREATE EXTENSION pgpro_scheduler"
 
+Install extension to use it with multimaster(mmts) extension:
+
+	$ cd pgpro_scheduler
+	$ make USE_PGXS=1 WITH_MTM=<path to mmts extension>
+	$ sudo make USE_PGXS=1 install
+	$ psql <DBNAME> -c "CREATE EXTENSION pgpro_scheduler"
+
 ## Configuration
 
 The extension defines a number of PostgreSQL variables (GUC). This variables 

contrib/pgpro_scheduler/pgpro_scheduler--2.1--2.2.sql

@@ -0,0 +1,43 @@
+CREATE TABLE mtm_nodes(
+	node_id int primary key,
+	node_name text,
+	status_set timestamp with time zone
+);
+
+CREATE TYPE scheduler_stat_rec AS(
+	pid int,
+	database text,
+	type text
+);
+
+
+CREATE FUNCTION version()
+	RETURNS text
+	AS 'MODULE_PATHNAME', 'pgpro_scheduler_version'
+	LANGUAGE C IMMUTABLE;
+
+CREATE FUNCTION enable()
+	RETURNS boolean
+	AS 'MODULE_PATHNAME', 'scheduler_enable'
+	LANGUAGE C IMMUTABLE;
+
+CREATE FUNCTION disable()
+	RETURNS boolean
+	AS 'MODULE_PATHNAME', 'scheduler_disable'
+	LANGUAGE C IMMUTABLE;
+
+CREATE FUNCTION start()
+	RETURNS boolean
+	AS 'MODULE_PATHNAME', 'scheduler_start'
+	LANGUAGE C IMMUTABLE;
+	
+CREATE FUNCTION stop()
+	RETURNS boolean
+	AS 'MODULE_PATHNAME', 'scheduler_stop'
+	LANGUAGE C IMMUTABLE;
+
+CREATE FUNCTION status()
+	RETURNS SETOF scheduler_stat_rec
+	AS 'MODULE_PATHNAME', 'scheduler_status'
+	LANGUAGE C STABLE;
+