git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8a54e12)

Fix error with CREATE PUBLICATION, wal_level=minimal, and new tables.

author Noah Misch <noah@leadboat.com>

2021年1月30日 08:11:38 +0000 (00:11 -0800)

committer Noah Misch <noah@leadboat.com>

2021年1月30日 08:11:38 +0000 (00:11 -0800)

CREATE PUBLICATION has failed spuriously when applied to a permanent
relation created or rewritten in the current transaction. Make the same
change to another site having the same semantic intent; the second
instance has no user-visible consequences. Back-patch to v13, where
commit c6b92041d38512a4176ed76ad06f713d2e6c01a8 broke this.

Kyotaro Horiguchi

Discussion: https://postgr.es/m/20210113.160705.2225256954956139776.horikyota.ntt@gmail.com

src/backend/catalog/pg_publication.c patch | blob | blame | history

src/backend/optimizer/util/plancat.c patch | blob | blame | history

src/test/subscription/t/001_rep_changes.pl patch | blob | blame | history

diff --git a/src/backend/catalog/pg_publication.c b/src/backend/catalog/pg_publication.c

index 5f8e1c64e18f1ff1f61d2952f3546c71f2343fb1..84d2efcfd2f1624c25574daa80c9ffc52558894f 100644 (file)

--- a/src/backend/catalog/pg_publication.c

+++ b/src/backend/catalog/pg_publication.c

@@ -67,7 +67,7 @@ check_publication_add_relation(Relation targetrel)

errdetail("System tables cannot be added to publications.")));

/* UNLOGGED and TEMP relations cannot be part of publication. */

- if (!RelationNeedsWAL(targetrel))

+ if (targetrel->rd_rel->relpersistence != RELPERSISTENCE_PERMANENT)

ereport(ERROR,

(errcode(ERRCODE_INVALID_PARAMETER_VALUE),

errmsg("table \"%s\" cannot be replicated",

diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c

index da322b453ea74e8823ed0e777acadb33db4b48a8..177e6e336ab9d77a7e099a9b91434402beb87a90 100644 (file)

--- a/src/backend/optimizer/util/plancat.c

+++ b/src/backend/optimizer/util/plancat.c

@@ -126,7 +126,8 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent,

relation = table_open(relationObjectId, NoLock);

/* Temporary and unlogged relations are inaccessible during recovery. */

- if (!RelationNeedsWAL(relation) && RecoveryInProgress())

+ if (relation->rd_rel->relpersistence != RELPERSISTENCE_PERMANENT &&

+ RecoveryInProgress())

ereport(ERROR,

(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),

errmsg("cannot access temporary or unlogged relations during recovery")));

diff --git a/src/test/subscription/t/001_rep_changes.pl b/src/test/subscription/t/001_rep_changes.pl

index c20fadcb0e340698bc10c8e8a335d23be6d11528..04635e93e99592e1c4d46011e4aff12bdd078990 100644 (file)

--- a/src/test/subscription/t/001_rep_changes.pl

+++ b/src/test/subscription/t/001_rep_changes.pl

@@ -3,7 +3,7 @@ use strict;

use warnings;

use PostgresNode;

use TestLib;

-use Test::More tests => 27;

+use Test::More tests => 28;

# Initialize publisher node

my $node_publisher = get_new_node('publisher');

@@ -451,3 +451,21 @@ is($result, qq(0), 'check replication origin was dropped on subscriber');

$node_subscriber->stop('fast');

$node_publisher->stop('fast');

+

+# CREATE PUBLICATION while wal_level=minimal should succeed, with a WARNING

+$node_publisher->append_conf(

+ 'postgresql.conf', qq(

+wal_level=minimal

+max_wal_senders=0

+));

+$node_publisher->start;

+($result, my $retout, my $reterr) = $node_publisher->psql(

+ 'postgres', qq{

+BEGIN;

+CREATE TABLE skip_wal();

+CREATE PUBLICATION tap_pub2 FOR TABLE skip_wal;

+ROLLBACK;

+});

+ok( $reterr =~

+ m/WARNING: wal_level is insufficient to publish logical changes/,

+ 'CREATE PUBLICATION while wal_level=minimal');

This is the main PostgreSQL git repository.