Some small patches for 0002-Add-SUBSCRIPTION-catalog-and-DDL-v16.patch.gz:
- Add a get_subscription_name() function
- Remove call for ApplyLauncherWakeupAtCommit() (rebasing error?)
- Remove some unused include files (same as before)
- Rename pg_dump --no-create-subscription-slot to
--no-create-subscription-slots (plural), add documentation.
In CreateSubscription(), I don't think we should connect to the remote
if no slot creation is requested. Arguably, the point of that option is
to not make network connections. (That is what my documentation patch
above claims, in any case.)
I don't know why we need to check the PostgreSQL version number of the
remote. We should rely on the protocol version number, and we should
just make it work. When PG 11 comes around, subscribing from PG 10 to a
publisher on PG 11 should just work without any warnings, IMO.
--
Peter Eisentraut http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services
From 5fd71a1eb99761cca3cd53990b8302fb58e5a01e Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pete...@gmx.net>
Date: Wed, 4 Jan 2017 12:00:00 -0500
Subject: [PATCH 1/4] fixup! Add SUBSCRIPTION catalog and DDL
Add get_subscription_name()
---
src/backend/catalog/objectaddress.c | 18 +++++-------------
src/backend/catalog/pg_subscription.c | 23 +++++++++++++++++++++++
src/include/catalog/pg_subscription.h | 1 +
3 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index 936adfc42d..b77fbf341d 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -3341,16 +3341,8 @@ getObjectDescription(const ObjectAddress *object)
case OCLASS_SUBSCRIPTION:
{
- HeapTuple tup;
-
- tup = SearchSysCache1(SUBSCRIPTIONOID,
- ObjectIdGetDatum(object->objectId));
- if (!HeapTupleIsValid(tup))
- elog(ERROR, "cache lookup failed for subscription %u",
- object->objectId);
appendStringInfo(&buffer, _("subscription %s"),
- NameStr(((Form_pg_subscription) GETSTRUCT(tup))->subname));
- ReleaseSysCache(tup);
+ get_subscription_name(object->objectId));
break;
}
@@ -4865,13 +4857,13 @@ getObjectIdentityParts(const ObjectAddress *object,
case OCLASS_SUBSCRIPTION:
{
- Subscription *sub;
+ char *subname;
- sub = GetSubscription(object->objectId, false);
+ subname = get_subscription_name(object->objectId);
appendStringInfoString(&buffer,
- quote_identifier(sub->name));
+ quote_identifier(subname));
if (objname)
- *objname = list_make1(pstrdup(sub->name));
+ *objname = list_make1(subname);
break;
}
diff --git a/src/backend/catalog/pg_subscription.c b/src/backend/catalog/pg_subscription.c
index 2c58cc653e..c15e9b5d74 100644
--- a/src/backend/catalog/pg_subscription.c
+++ b/src/backend/catalog/pg_subscription.c
@@ -173,6 +173,29 @@ get_subscription_oid(const char *subname, bool missing_ok)
}
/*
+ * get_subscription_oid - given a subscription OID, look up the name
+ */
+char *
+get_subscription_name(Oid subid)
+{
+ HeapTuple tup;
+ char *subname;
+ Form_pg_subscription subform;
+
+ tup = SearchSysCache1(SUBSCRIPTIONOID, ObjectIdGetDatum(subid));
+
+ if (!HeapTupleIsValid(tup))
+ elog(ERROR, "cache lookup failed for subscription %u", subid);
+
+ subform = (Form_pg_subscription) GETSTRUCT(tup);
+ subname = pstrdup(NameStr(subform->subname));
+
+ ReleaseSysCache(tup);
+
+ return subname;
+}
+
+/*
* Convert text array to list of strings.
*
* Note: the resulting list of strings is pallocated here.
diff --git a/src/include/catalog/pg_subscription.h b/src/include/catalog/pg_subscription.h
index 855ed360fb..645541c9b4 100644
--- a/src/include/catalog/pg_subscription.h
+++ b/src/include/catalog/pg_subscription.h
@@ -70,6 +70,7 @@ typedef struct Subscription
extern Subscription *GetSubscription(Oid subid, bool missing_ok);
extern void FreeSubscription(Subscription *sub);
extern Oid get_subscription_oid(const char *subname, bool missing_ok);
+extern char *get_subscription_name(Oid subid);
extern int CountDBSubscriptions(Oid dbid);
--
2.11.0
From f5f5d6ae0fc627f0fbb3ca7497339c4cd77ab8b7 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pete...@gmx.net>
Date: Wed, 4 Jan 2017 12:00:00 -0500
Subject: [PATCH 2/4] fixup! Add SUBSCRIPTION catalog and DDL
Remove ApplyLauncherWakeupAtCommit() call for now.
---
src/backend/commands/subscriptioncmds.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index a6679879db..9dbd6d4c59 100644
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -359,8 +359,6 @@ CreateSubscription(CreateSubscriptionStmt *stmt)
InvokeObjectPostCreateHook(SubscriptionRelationId, subid, 0);
- ApplyLauncherWakeupAtCommit();
-
return myself;
}
--
2.11.0
From 4eae87c94c9cf31596c1238b83db9f00e7ea3f8b Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pete...@gmx.net>
Date: Wed, 4 Jan 2017 12:00:00 -0500
Subject: [PATCH 3/4] fixup! Add SUBSCRIPTION catalog and DDL
Remove unused includes
---
src/backend/catalog/pg_subscription.c | 14 --------------
src/backend/commands/subscriptioncmds.c | 16 ----------------
2 files changed, 30 deletions(-)
diff --git a/src/backend/catalog/pg_subscription.c b/src/backend/catalog/pg_subscription.c
index c15e9b5d74..eae50632c6 100644
--- a/src/backend/catalog/pg_subscription.c
+++ b/src/backend/catalog/pg_subscription.c
@@ -13,34 +13,20 @@
#include "postgres.h"
-#include "funcapi.h"
#include "miscadmin.h"
#include "access/genam.h"
-#include "access/hash.h"
#include "access/heapam.h"
#include "access/htup_details.h"
-#include "access/xact.h"
-#include "catalog/indexing.h"
-#include "catalog/namespace.h"
-#include "catalog/objectaddress.h"
#include "catalog/pg_type.h"
#include "catalog/pg_subscription.h"
-#include "executor/spi.h"
-
#include "nodes/makefuncs.h"
-#include "replication/reorderbuffer.h"
-
#include "utils/array.h"
#include "utils/builtins.h"
-#include "utils/catcache.h"
#include "utils/fmgroids.h"
-#include "utils/inval.h"
-#include "utils/lsyscache.h"
-#include "utils/rel.h"
#include "utils/syscache.h"
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 9dbd6d4c59..22bc2e2040 100644
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -13,17 +13,12 @@
#include "postgres.h"
-#include "funcapi.h"
#include "miscadmin.h"
-#include "access/genam.h"
-#include "access/hash.h"
#include "access/heapam.h"
#include "access/htup_details.h"
-#include "access/xact.h"
#include "catalog/indexing.h"
-#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/objectaddress.h"
#include "catalog/pg_type.h"
@@ -33,24 +28,13 @@
#include "commands/event_trigger.h"
#include "commands/replicationcmds.h"
-#include "executor/spi.h"
-
-#include "nodes/makefuncs.h"
-
#include "replication/origin.h"
-#include "replication/reorderbuffer.h"
#include "replication/walreceiver.h"
#include "storage/lmgr.h"
-#include "utils/array.h"
#include "utils/builtins.h"
-#include "utils/catcache.h"
-#include "utils/fmgroids.h"
-#include "utils/inval.h"
-#include "utils/lsyscache.h"
#include "utils/memutils.h"
-#include "utils/rel.h"
#include "utils/syscache.h"
/*
--
2.11.0
From e4d177d06cb0d0fa407ba48b93d74282b6e2fd12 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pete...@gmx.net>
Date: Wed, 4 Jan 2017 12:00:00 -0500
Subject: [PATCH 4/4] fixup! Add SUBSCRIPTION catalog and DDL
Rename pg_dump --no-create-subscription-slot to
--no-create-subscription-slots, add documentation.
---
doc/src/sgml/ref/pg_dump.sgml | 12 ++++++++++++
src/bin/pg_dump/pg_backup.h | 2 +-
src/bin/pg_dump/pg_dump.c | 7 ++++---
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 0107167b42..a1e03c481d 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -799,6 +799,18 @@ <title>Options</title>
</varlistentry>
<varlistentry>
+ <term><option>--no-create-subscription-slots</option></term>
+ <listitem>
+ <para>
+ When dumping logical replication subscriptions,
+ generate <command>CREATE SUBSCRIPTION</command> commands that do not
+ create the remote replication slot. That way, the dump can be
+ restored without requiring network access to the remote servers.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--no-security-labels</option></term>
<listitem>
<para>
diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h
index db58367d68..6480fb8e74 100644
--- a/src/bin/pg_dump/pg_backup.h
+++ b/src/bin/pg_dump/pg_backup.h
@@ -154,7 +154,7 @@ typedef struct _dumpOptions
int use_setsessauth;
int enable_row_security;
int include_subscriptions;
- int no_create_subscription_slot;
+ int no_create_subscription_slots;
/* default, if no "inclusion" switches appear, is to dump everything */
bool include_everything;
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index e96f2652cc..a3ed0fb657 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -352,7 +352,7 @@ main(int argc, char **argv)
{"snapshot", required_argument, NULL, 6},
{"strict-names", no_argument, &strict_names, 1},
{"use-set-session-authorization", no_argument, &dopt.use_setsessauth, 1},
- {"no-create-subscription-slot", no_argument, &dopt.no_create_subscription_slot, 1},
+ {"no-create-subscription-slots", no_argument, &dopt.no_create_subscription_slots, 1},
{"no-security-labels", no_argument, &dopt.no_security_labels, 1},
{"no-synchronized-snapshots", no_argument, &dopt.no_synchronized_snapshots, 1},
{"no-unlogged-table-data", no_argument, &dopt.no_unlogged_table_data, 1},
@@ -937,10 +937,11 @@ help(const char *progname)
printf(_(" --if-exists use IF EXISTS when dropping objects\n"));
printf(_(" --include-subscriptions dump logical replication subscriptions\n"));
printf(_(" --inserts dump data as INSERT commands, rather than COPY\n"));
+ printf(_(" --no-create-subscription-slots\n"
+ " do not create replication slots for subscriptions\n"));
printf(_(" --no-security-labels do not dump security label assignments\n"));
printf(_(" --no-synchronized-snapshots do not use synchronized snapshots in parallel jobs\n"));
printf(_(" --no-tablespaces do not dump tablespace assignments\n"));
- printf(_(" --no-create-subscription-slot do not create replication slot for dumped subscriptions\n"));
printf(_(" --no-unlogged-table-data do not dump unlogged table data\n"));
printf(_(" --quote-all-identifiers quote all identifiers, even if not key words\n"));
printf(_(" --section=SECTION dump named section (pre-data, data, or post-data)\n"));
@@ -3739,7 +3740,7 @@ dumpSubscription(Archive *fout, SubscriptionInfo *subinfo)
appendPQExpBufferStr(query, ", SLOT NAME = ");
appendStringLiteralAH(query, subinfo->subslotname, fout);
- if (dopt->no_create_subscription_slot)
+ if (dopt->no_create_subscription_slots)
appendPQExpBufferStr(query, ", NOCREATE SLOT");
appendPQExpBufferStr(query, ");\n");
--
2.11.0
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
