bdr: Add synchronize parameter to bdr_subscribe

The new parameter controls what part of db should be synchronized
(copied). Currently supported values are 'none' for no synchronization
and 'full' for full dump/restore.

diff --git a/Makefile.in b/Makefile.in
index 98300b4882eb58a35e0f98fb0aa2ccf0482b6de6..ef68253626bcaaf6944d521f2ed6cd533c7ed6b7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,7 +21,8 @@ DATA = \
    extsql/bdr--0.8.0.5--0.8.0.6.sql \
    extsql/bdr--0.8.0.6--0.8.0.7.sql \
    extsql/bdr--0.8.0.7--0.9.0.0.sql \
-   extsql/bdr--0.9.0.0--0.9.0.1.sql
+   extsql/bdr--0.9.0.0--0.9.0.1.sql \
+   extsql/bdr--0.9.0.1--0.9.0.2.sql
 
 DATA_built = \
    extsql/bdr--0.8.0.1.sql \
@@ -32,7 +33,8 @@ DATA_built = \
    extsql/bdr--0.8.0.6.sql \
    extsql/bdr--0.8.0.7.sql \
    extsql/bdr--0.9.0.0.sql \
-   extsql/bdr--0.9.0.1.sql
+   extsql/bdr--0.9.0.1.sql \
+   extsql/bdr--0.9.0.2.sql
 
 DOCS = bdr.conf.sample README.bdr
 SCRIPTS = scripts/bdr_initial_load bdr_init_copy bdr_resetxlog bdr_dump
@@ -147,6 +149,10 @@ extsql/bdr--0.9.0.1.sql: extsql/bdr--0.9.0.0.sql extsql/bdr--0.9.0.0--0.9.0.1.sq
    mkdir -p extsql
    cat $^ > $@
 
+extsql/bdr--0.9.0.2.sql: extsql/bdr--0.9.0.1.sql extsql/bdr--0.9.0.1--0.9.0.2.sql
+   mkdir -p extsql
+   cat $^ > $@
+
 bdr_resetxlog: pg_resetxlog.o
    $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(libpq_pgport) $(LIBS) -o $@$(X)
 

diff --git a/bdr.control b/bdr.control
index b3faa319e2cc5dafa75683be3ff66bff7954b758..7f72eb2f4c14c93a55cf2e7afce1604a8cfb0685 100644 (file)
--- a/bdr.control
+++ b/bdr.control
@@ -1,6 +1,6 @@
 # bdr extension
 comment = 'Bi-directional replication for PostgreSQL'
-default_version = '0.9.0.1'
+default_version = '0.9.0.2'
 module_pathname = '$libdir/bdr'
 relocatable = false
 requires = btree_gist

diff --git a/expected/upgrade.out b/expected/upgrade.out
index 7f1fb1a35fab4d3d33a606ee5dc0f4ac96950da6..0b3a3c0ea3cfcac123140b4665a9f502c75bab57 100644 (file)
--- a/expected/upgrade.out
+++ b/expected/upgrade.out
@@ -27,6 +27,8 @@ CREATE EXTENSION bdr VERSION '0.9.0.0';
 DROP EXTENSION bdr;
 CREATE EXTENSION bdr VERSION '0.9.0.1';
 DROP EXTENSION bdr;
+CREATE EXTENSION bdr VERSION '0.9.0.2';
+DROP EXTENSION bdr;
 -- evolve version one by one from the oldest to the newest one
 CREATE EXTENSION bdr VERSION '0.8.0';
 ALTER EXTENSION bdr UPDATE TO '0.8.0.1';
@@ -38,8 +40,9 @@ ALTER EXTENSION bdr UPDATE TO '0.8.0.6';
 ALTER EXTENSION bdr UPDATE TO '0.8.0.7';
 ALTER EXTENSION bdr UPDATE TO '0.9.0.0';
 ALTER EXTENSION bdr UPDATE TO '0.9.0.1';
+ALTER EXTENSION bdr UPDATE TO '0.9.0.2';
 -- Should never have to do anything: You missed adding the new version above.
 ALTER EXTENSION bdr UPDATE;
-NOTICE:  version "0.9.0.1" of extension "bdr" is already installed
+NOTICE:  version "0.9.0.2" of extension "bdr" is already installed
 \c postgres
 DROP DATABASE extension_upgrade;

diff --git a/extsql/bdr--0.9.0.1--0.9.0.2.sql b/extsql/bdr--0.9.0.1--0.9.0.2.sql
new file mode 100644 (file)
index 0000000..219536c
--- /dev/null
+++ b/extsql/bdr--0.9.0.1--0.9.0.2.sql
@@ -0,0 +1,124 @@
+-- Data structures for BDR's dynamic configuration management
+
+SET LOCAL search_path = bdr;
+SET bdr.permit_unsafe_ddl_commands = true;
+SET bdr.skip_ddl_replication = true;
+
+CREATE TYPE bdr.bdr_sync_type AS ENUM
+(
+   'none',
+   'full'
+);
+
+--
+-- The public interface for unidirectional replication setup.
+--
+DROP FUNCTION bdr.bdr_subscribe(text, text, text, integer, text[]);
+
+CREATE FUNCTION bdr.bdr_subscribe(
+    local_node_name text,
+    subscribe_to_dsn text,
+    node_local_dsn text,
+    apply_delay integer DEFAULT NULL,
+    replication_sets text[] DEFAULT ARRAY['default'],
+    synchronize bdr.bdr_sync_type DEFAULT 'full'
+    )
+RETURNS void LANGUAGE plpgsql VOLATILE
+SET search_path = bdr, pg_catalog
+SET bdr.permit_unsafe_ddl_commands = on
+SET bdr.skip_ddl_replication = on
+SET bdr.skip_ddl_locking = on
+AS $body$
+DECLARE
+    localid record;
+    remoteid record;
+BEGIN
+    IF node_local_dsn IS NULL THEN
+        RAISE USING
+            MESSAGE = 'node_local_dsn may not be null',
+            ERRCODE = 'invalid_parameter_value';
+    END IF;
+
+    IF subscribe_to_dsn IS NULL THEN
+        RAISE USING
+            MESSAGE = 'remote may not be null',
+            ERRCODE = 'invalid_parameter_value';
+    END IF;
+
+    SELECT remote_sysid AS sysid, remote_timeline AS timeline,
+           remote_dboid AS dboid INTO remoteid
+    FROM bdr.internal_begin_join('bdr_subscribe',
+         local_node_name || '-subscriber',
+         node_local_dsn, subscribe_to_dsn);
+
+    SELECT sysid, timeline, dboid INTO localid
+    FROM bdr.bdr_get_local_nodeid();
+
+    PERFORM 1 FROM bdr_connections
+    WHERE conn_sysid = remoteid.sysid
+      AND conn_timeline = remoteid.timeline
+      AND conn_dboid = remoteid.dboid
+      AND conn_origin_sysid = localid.sysid
+      AND conn_origin_timeline = localid.timeline
+      AND conn_origin_dboid = localid.dboid
+      AND conn_is_unidirectional = 't';
+
+    IF FOUND THEN
+        RAISE USING
+            MESSAGE = 'This node is already connected to given remote node',
+            ERRCODE = 'object_not_in_prerequisite_state';
+    END IF;
+
+    -- Insert node entry representing remote node
+    PERFORM 1 FROM bdr_nodes
+    WHERE node_sysid = remoteid.sysid
+      AND node_timeline = remoteid.timeline
+      AND node_dboid = remoteid.dboid;
+
+    IF NOT FOUND THEN
+        INSERT INTO bdr_nodes (
+            node_name,
+            node_sysid, node_timeline, node_dboid,
+            node_status
+        ) VALUES (
+            local_node_name,
+            remoteid.sysid, remoteid.timeline, remoteid.dboid,
+           'r'
+        );
+    END IF;
+
+   -- If user does not want synchronization, update the local node status
+   -- to catched up so that the initial dump/restore does not happen
+   IF synchronize = 'none' THEN
+       UPDATE bdr_nodes SET node_status = 'o'
+        WHERE node_sysid = localid.sysid
+          AND node_timeline = localid.timeline
+          AND node_dboid = localid.dboid;
+   END IF;
+
+    -- Null/empty checks are skipped, the underlying constraints on the table
+    -- will catch that for us.
+    INSERT INTO bdr.bdr_connections (
+        conn_sysid, conn_timeline, conn_dboid,
+        conn_origin_sysid, conn_origin_timeline, conn_origin_dboid,
+        conn_dsn, conn_apply_delay, conn_replication_sets,
+        conn_is_unidirectional
+    ) VALUES (
+        remoteid.sysid, remoteid.timeline, remoteid.dboid,
+        localid.sysid, localid.timeline, localid.dboid,
+        subscribe_to_dsn, apply_delay, replication_sets, true
+    );
+
+    -- Now ensure the per-db worker is started if it's not already running.
+    -- This won't actually take effect until commit time, it just adds a commit
+    -- hook to start the worker when we commit.
+    PERFORM bdr.bdr_connections_changed();
+END;
+$body$;
+
+COMMENT ON FUNCTION bdr.bdr_subscribe(text, text, text, integer, text[], bdr.bdr_sync_type)
+IS 'Subscribe to remote logical changes';
+
+RESET bdr.permit_unsafe_ddl_commands;
+RESET bdr.skip_ddl_replication;
+RESET search_path;

diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index b0a4209511041c2a99e4bc09ecfcb42596ff21c0..01f35fc028e9d0ba5364ae5e305948a18aa46c6a 100644 (file)
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -39,6 +39,9 @@ DROP EXTENSION bdr;
 CREATE EXTENSION bdr VERSION '0.9.0.1';
 DROP EXTENSION bdr;
 
+CREATE EXTENSION bdr VERSION '0.9.0.2';
+DROP EXTENSION bdr;
+
 -- evolve version one by one from the oldest to the newest one
 CREATE EXTENSION bdr VERSION '0.8.0';
 ALTER EXTENSION bdr UPDATE TO '0.8.0.1';
@@ -50,6 +53,7 @@ ALTER EXTENSION bdr UPDATE TO '0.8.0.6';
 ALTER EXTENSION bdr UPDATE TO '0.8.0.7';
 ALTER EXTENSION bdr UPDATE TO '0.9.0.0';
 ALTER EXTENSION bdr UPDATE TO '0.9.0.1';
+ALTER EXTENSION bdr UPDATE TO '0.9.0.2';
 
 
 -- Should never have to do anything: You missed adding the new version above.