Fix handling of unlogged tables in FOR ALL TABLES publications

From 2704c5fbb65ebfee144a37c6b34eccdd853033a0 Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horiguchi.kyotaro@lab.ntt.co.jp>
Date: Thu, 14 Mar 2019 15:02:20 +0900
Subject: [PATCH 1/2] step1

---
 src/backend/utils/cache/relcache.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index eba77491fd..a43fb040cb 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -5089,6 +5089,8 @@ GetRelationPublicationActions(Relation relation)
 		return memcpy(pubactions, relation->rd_pubactions,
 					  sizeof(PublicationActions));
 
+	if (is_publishable_relation(relation))
+	{
 	/* Fetch the publication membership info. */
 	puboids = GetRelationPublications(RelationGetRelid(relation));
 	puboids = list_concat_unique_oid(puboids, GetAllTablesPublications());
@@ -5121,6 +5123,7 @@ GetRelationPublicationActions(Relation relation)
 			pubactions->pubdelete && pubactions->pubtruncate)
 			break;
 	}
+	}
 
 	if (relation->rd_pubactions)
 	{
-- 
2.16.3

From b0946c5b97857cf476975306ce78355f9316e722 Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horiguchi.kyotaro@lab.ntt.co.jp>
Date: Thu, 14 Mar 2019 15:02:54 +0900
Subject: [PATCH 2/2] step2: fix indentation

---
 src/backend/utils/cache/relcache.c | 50 +++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index a43fb040cb..f5dff5572e 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -5091,38 +5091,38 @@ GetRelationPublicationActions(Relation relation)
 
 	if (is_publishable_relation(relation))
 	{
-	/* Fetch the publication membership info. */
-	puboids = GetRelationPublications(RelationGetRelid(relation));
-	puboids = list_concat_unique_oid(puboids, GetAllTablesPublications());
+		/* Fetch the publication membership info. */
+		puboids = GetRelationPublications(RelationGetRelid(relation));
+		puboids = list_concat_unique_oid(puboids, GetAllTablesPublications());
 
-	foreach(lc, puboids)
-	{
-		Oid			pubid = lfirst_oid(lc);
-		HeapTuple	tup;
-		Form_pg_publication pubform;
+		foreach(lc, puboids)
+		{
+			Oid			pubid = lfirst_oid(lc);
+			HeapTuple	tup;
+			Form_pg_publication pubform;
 
-		tup = SearchSysCache1(PUBLICATIONOID, ObjectIdGetDatum(pubid));
+			tup = SearchSysCache1(PUBLICATIONOID, ObjectIdGetDatum(pubid));
 
-		if (!HeapTupleIsValid(tup))
-			elog(ERROR, "cache lookup failed for publication %u", pubid);
+			if (!HeapTupleIsValid(tup))
+				elog(ERROR, "cache lookup failed for publication %u", pubid);
 
-		pubform = (Form_pg_publication) GETSTRUCT(tup);
+			pubform = (Form_pg_publication) GETSTRUCT(tup);
 
-		pubactions->pubinsert |= pubform->pubinsert;
-		pubactions->pubupdate |= pubform->pubupdate;
-		pubactions->pubdelete |= pubform->pubdelete;
-		pubactions->pubtruncate |= pubform->pubtruncate;
+			pubactions->pubinsert |= pubform->pubinsert;
+			pubactions->pubupdate |= pubform->pubupdate;
+			pubactions->pubdelete |= pubform->pubdelete;
+			pubactions->pubtruncate |= pubform->pubtruncate;
 
-		ReleaseSysCache(tup);
+			ReleaseSysCache(tup);
 
-		/*
-		 * If we know everything is replicated, there is no point to check for
-		 * other publications.
-		 */
-		if (pubactions->pubinsert && pubactions->pubupdate &&
-			pubactions->pubdelete && pubactions->pubtruncate)
-			break;
-	}
+			/*
+			 * If we know everything is replicated, there is no point to check
+			 * for other publications.
+			 */
+			if (pubactions->pubinsert && pubactions->pubupdate &&
+				pubactions->pubdelete && pubactions->pubtruncate)
+				break;
+		}
 	}
 
 	if (relation->rd_pubactions)
-- 
2.16.3

From 55255a6e338ccb11b4a7a8d6f10aff7a805cd72b Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter@eisentraut.org>
Date: Mon, 25 Mar 2019 09:00:14 +0100
Subject: [PATCH v2] Fix handling of unlogged tables in FOR ALL TABLES
 publications

If a FOR ALL TABLES publication exists, unlogged tables are ignored
for publishing changes.  But CheckCmdReplicaIdentity() would still
check in that case that such a table has a replica identity set before
accepting updates.  To fix, have GetRelationPublicationActions()
return that such a table publishes no actions.

Discussion: https://www.postgresql.org/message-id/f3f151f7-c4dd-1646-b998-f60bd6217dd3@2ndquadrant.com
---
 src/backend/utils/cache/relcache.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 84609e0725..e13719ee97 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -5133,6 +5133,13 @@ GetRelationPublicationActions(Relation relation)
 	MemoryContext oldcxt;
 	PublicationActions *pubactions = palloc0(sizeof(PublicationActions));
 
+	/*
+	 * If not publishable, it publishes no actions.  (pgoutput_change() will
+	 * ignore it.)
+	 */
+	if (!is_publishable_relation(relation))
+		return pubactions;
+
 	if (relation->rd_pubactions)
 		return memcpy(pubactions, relation->rd_pubactions,
 					  sizeof(PublicationActions));
-- 
2.21.0