From 195f331ff3e8968818538b6f892de55e070409fd Mon Sep 17 00:00:00 2001 From: Craig Ringer Date: Tue, 23 Feb 2016 15:55:01 +0800 Subject: [PATCH 6/8] Add 'failover' to pg_replication_slots --- contrib/test_decoding/expected/ddl.out | 38 ++++++++++++++++++++++++++++------ contrib/test_decoding/sql/ddl.sql | 15 ++++++++++++-- doc/src/sgml/catalogs.sgml | 10 +++++++++ src/backend/catalog/system_views.sql | 1 + src/backend/replication/slotfuncs.c | 6 +++++- src/include/catalog/pg_proc.h | 2 +- src/test/regress/expected/rules.out | 3 ++- 7 files changed, 64 insertions(+), 11 deletions(-) diff --git a/contrib/test_decoding/expected/ddl.out b/contrib/test_decoding/expected/ddl.out index 5fed500..5b2f34a 100644 --- a/contrib/test_decoding/expected/ddl.out +++ b/contrib/test_decoding/expected/ddl.out @@ -61,11 +61,37 @@ SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_d SELECT slot_name, plugin, slot_type, active, NOT catalog_xmin IS NULL AS catalog_xmin_set, xmin IS NULl AS data_xmin_not_set, - pg_xlog_location_diff(restart_lsn, '0/01000000') > 0 AS some_wal + pg_xlog_location_diff(restart_lsn, '0/01000000') > 0 AS some_wal, + failover FROM pg_replication_slots; - slot_name | plugin | slot_type | active | catalog_xmin_set | data_xmin_not_set | some_wal ------------------+---------------+-----------+--------+------------------+-------------------+---------- - regression_slot | test_decoding | logical | f | t | t | t + slot_name | plugin | slot_type | active | catalog_xmin_set | data_xmin_not_set | some_wal | failover +-----------------+---------------+-----------+--------+------------------+-------------------+----------+---------- + regression_slot | test_decoding | logical | f | t | t | t | f +(1 row) + +/* same for a failover slot */ +SELECT 'init' FROM pg_create_logical_replication_slot('failover_slot', 'test_decoding', true); + ?column? +---------- + init +(1 row) + +SELECT slot_name, plugin, slot_type, active, + NOT catalog_xmin IS NULL AS catalog_xmin_set, + xmin IS NULl AS data_xmin_not_set, + pg_xlog_location_diff(restart_lsn, '0/01000000') > 0 AS some_wal, + failover +FROM pg_replication_slots +WHERE slot_name = 'failover_slot'; + slot_name | plugin | slot_type | active | catalog_xmin_set | data_xmin_not_set | some_wal | failover +---------------+---------------+-----------+--------+------------------+-------------------+----------+---------- + failover_slot | test_decoding | logical | f | t | t | t | t +(1 row) + +SELECT pg_drop_replication_slot('failover_slot'); + pg_drop_replication_slot +-------------------------- + (1 row) /* @@ -676,7 +702,7 @@ SELECT pg_drop_replication_slot('regression_slot'); /* check that the slot is gone */ SELECT * FROM pg_replication_slots; - slot_name | plugin | slot_type | datoid | database | active | active_pid | xmin | catalog_xmin | restart_lsn | confirmed_flush_lsn ------------+--------+-----------+--------+----------+--------+------------+------+--------------+-------------+--------------------- + slot_name | plugin | slot_type | datoid | database | active | active_pid | failover | xmin | catalog_xmin | restart_lsn | confirmed_flush_lsn +-----------+--------+-----------+--------+----------+--------+------------+----------+------+--------------+-------------+--------------------- (0 rows) diff --git a/contrib/test_decoding/sql/ddl.sql b/contrib/test_decoding/sql/ddl.sql index dc61ef4..f64b21c 100644 --- a/contrib/test_decoding/sql/ddl.sql +++ b/contrib/test_decoding/sql/ddl.sql @@ -24,16 +24,27 @@ SELECT 'init' FROM pg_create_physical_replication_slot('repl'); SELECT data FROM pg_logical_slot_get_changes('repl', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1'); SELECT pg_drop_replication_slot('repl'); - SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding'); /* check whether status function reports us, only reproduceable columns */ SELECT slot_name, plugin, slot_type, active, NOT catalog_xmin IS NULL AS catalog_xmin_set, xmin IS NULl AS data_xmin_not_set, - pg_xlog_location_diff(restart_lsn, '0/01000000') > 0 AS some_wal + pg_xlog_location_diff(restart_lsn, '0/01000000') > 0 AS some_wal, + failover FROM pg_replication_slots; +/* same for a failover slot */ +SELECT 'init' FROM pg_create_logical_replication_slot('failover_slot', 'test_decoding', true); +SELECT slot_name, plugin, slot_type, active, + NOT catalog_xmin IS NULL AS catalog_xmin_set, + xmin IS NULl AS data_xmin_not_set, + pg_xlog_location_diff(restart_lsn, '0/01000000') > 0 AS some_wal, + failover +FROM pg_replication_slots +WHERE slot_name = 'failover_slot'; +SELECT pg_drop_replication_slot('failover_slot'); + /* * Check that changes are handled correctly when interleaved with ddl */ diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml index 951f59b..0a3af1f 100644 --- a/doc/src/sgml/catalogs.sgml +++ b/doc/src/sgml/catalogs.sgml @@ -5377,6 +5377,16 @@ + failover + boolean + + + True if this slot is a failover slot; see + . + + + + xmin xid diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql index fcb877d..26c02e4 100644 --- a/src/backend/catalog/system_views.sql +++ b/src/backend/catalog/system_views.sql @@ -704,6 +704,7 @@ CREATE VIEW pg_replication_slots AS D.datname AS database, L.active, L.active_pid, + L.failover, L.xmin, L.catalog_xmin, L.restart_lsn, diff --git a/src/backend/replication/slotfuncs.c b/src/backend/replication/slotfuncs.c index a2dfc40..abc450d 100644 --- a/src/backend/replication/slotfuncs.c +++ b/src/backend/replication/slotfuncs.c @@ -177,7 +177,7 @@ pg_drop_replication_slot(PG_FUNCTION_ARGS) Datum pg_get_replication_slots(PG_FUNCTION_ARGS) { -#define PG_GET_REPLICATION_SLOTS_COLS 10 +#define PG_GET_REPLICATION_SLOTS_COLS 11 ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo; TupleDesc tupdesc; Tuplestorestate *tupstore; @@ -227,6 +227,7 @@ pg_get_replication_slots(PG_FUNCTION_ARGS) XLogRecPtr restart_lsn; XLogRecPtr confirmed_flush_lsn; pid_t active_pid; + bool failover; Oid database; NameData slot_name; NameData plugin; @@ -249,6 +250,7 @@ pg_get_replication_slots(PG_FUNCTION_ARGS) namecpy(&plugin, &slot->data.plugin); active_pid = slot->active_pid; + failover = slot->data.failover; } SpinLockRelease(&slot->mutex); @@ -279,6 +281,8 @@ pg_get_replication_slots(PG_FUNCTION_ARGS) else nulls[i++] = true; + values[i++] = BoolGetDatum(failover); + if (xmin != InvalidTransactionId) values[i++] = TransactionIdGetDatum(xmin); else diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index af2b214..1d175fc 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -5072,7 +5072,7 @@ DATA(insert OID = 3779 ( pg_create_physical_replication_slot PGNSP PGUID 12 1 0 DESCR("create a physical replication slot"); DATA(insert OID = 3780 ( pg_drop_replication_slot PGNSP PGUID 12 1 0 0 0 f f f f t f v u 1 0 2278 "19" _null_ _null_ _null_ _null_ _null_ pg_drop_replication_slot _null_ _null_ _null_ )); DESCR("drop a replication slot"); -DATA(insert OID = 3781 ( pg_get_replication_slots PGNSP PGUID 12 1 10 0 0 f f f f f t s s 0 0 2249 "" "{19,19,25,26,16,23,28,28,3220,3220}" "{o,o,o,o,o,o,o,o,o,o}" "{slot_name,plugin,slot_type,datoid,active,active_pid,xmin,catalog_xmin,restart_lsn,confirmed_flush_lsn}" _null_ _null_ pg_get_replication_slots _null_ _null_ _null_ )); +DATA(insert OID = 3781 ( pg_get_replication_slots PGNSP PGUID 12 1 10 0 0 f f f f f t s s 0 0 2249 "" "{19,19,25,26,16,23,16,28,28,3220,3220}" "{o,o,o,o,o,o,o,o,o,o,o}" "{slot_name,plugin,slot_type,datoid,active,active_pid,failover,xmin,catalog_xmin,restart_lsn,confirmed_flush_lsn}" _null_ _null_ pg_get_replication_slots _null_ _null_ _null_ )); DESCR("information about replication slots currently in use"); DATA(insert OID = 3786 ( pg_create_logical_replication_slot PGNSP PGUID 12 1 0 0 0 f f f f t f v u 3 0 2249 "19 19 16" "{19,19,16,25,3220}" "{i,i,i,o,o}" "{slot_name,plugin,failover,slot_name,xlog_position}" _null_ _null_ pg_create_logical_replication_slot _null_ _null_ _null_ )); DESCR("set up a logical replication slot"); diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out index 81bc5c9..d8315c6 100644 --- a/src/test/regress/expected/rules.out +++ b/src/test/regress/expected/rules.out @@ -1417,11 +1417,12 @@ pg_replication_slots| SELECT l.slot_name, d.datname AS database, l.active, l.active_pid, + l.failover, l.xmin, l.catalog_xmin, l.restart_lsn, l.confirmed_flush_lsn - FROM (pg_get_replication_slots() l(slot_name, plugin, slot_type, datoid, active, active_pid, xmin, catalog_xmin, restart_lsn, confirmed_flush_lsn) + FROM (pg_get_replication_slots() l(slot_name, plugin, slot_type, datoid, active, active_pid, failover, xmin, catalog_xmin, restart_lsn, confirmed_flush_lsn) LEFT JOIN pg_database d ON ((l.datoid = d.oid))); pg_roles| SELECT pg_authid.rolname, pg_authid.rolsuper, -- 2.1.0