Skip to content

Commit

Permalink
Ignore generated columns during apply of update/delete.
Browse files Browse the repository at this point in the history
We fail to apply updates and deletes when the REPLICA IDENTITY FULL is
used for the table having generated columns. We didn't use to ignore
generated columns while doing tuple comparison among the tuples from
the publisher and subscriber during apply of updates and deletes.

Author: Onder Kalaci
Reviewed-by: Shi yu, Amit Kapila
Backpatch-through: 12
Discussion: https://postgr.es/m/CACawEhVQC9WoofunvXg12aXtbqKnEgWxoRx3+v8q32AWYsdpGg@mail.gmail.com
  • Loading branch information
Amit Kapila committed Mar 23, 2023
1 parent 3ba8bce commit 9dac02c
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
5 changes: 3 additions & 2 deletions src/backend/executor/execReplication.c
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,10 @@ tuples_equal(TupleTableSlot *slot1, TupleTableSlot *slot2,
att = TupleDescAttr(slot1->tts_tupleDescriptor, attrnum);

/*
* Ignore dropped columns as the publisher doesn't send those
* Ignore dropped and generated columns as the publisher doesn't send
* those
*/
if (att->attisdropped)
if (att->attisdropped || att->attgenerated)
continue;

/*
Expand Down
18 changes: 14 additions & 4 deletions src/test/subscription/t/100_bugs.pl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use warnings;
use PostgresNode;
use TestLib;
use Test::More tests => 8;
use Test::More tests => 9;

# Bug #15114

Expand Down Expand Up @@ -299,8 +299,8 @@
$node_publisher->stop('fast');
$node_subscriber->stop('fast');

# The bug was that when the REPLICA IDENTITY FULL is used with dropped columns,
# we fail to apply updates and deletes
# The bug was that when the REPLICA IDENTITY FULL is used with dropped or
# generated columns, we fail to apply updates and deletes
my $node_publisher_d_cols = get_new_node('node_publisher_d_cols');
$node_publisher_d_cols->init(allows_streaming => 'logical');
$node_publisher_d_cols->start;
Expand All @@ -313,14 +313,18 @@
'postgres', qq(
CREATE TABLE dropped_cols (a int, b_drop int, c int);
ALTER TABLE dropped_cols REPLICA IDENTITY FULL;
CREATE PUBLICATION pub_dropped_cols FOR TABLE dropped_cols;
CREATE TABLE generated_cols (a int, b_gen int GENERATED ALWAYS AS (5 * a) STORED, c int);
ALTER TABLE generated_cols REPLICA IDENTITY FULL;
CREATE PUBLICATION pub_dropped_cols FOR TABLE dropped_cols, generated_cols;
-- some initial data
INSERT INTO dropped_cols VALUES (1, 1, 1);
INSERT INTO generated_cols (a, c) VALUES (1, 1);
));

$node_subscriber_d_cols->safe_psql(
'postgres', qq(
CREATE TABLE dropped_cols (a int, b_drop int, c int);
CREATE TABLE generated_cols (a int, b_gen int GENERATED ALWAYS AS (5 * a) STORED, c int);
));

my $publisher_connstr_d_cols =
Expand All @@ -342,6 +346,7 @@
$node_publisher_d_cols->safe_psql(
'postgres', qq(
UPDATE dropped_cols SET a = 100;
UPDATE generated_cols SET a = 100;
));
$node_publisher_d_cols->wait_for_catchup('sub_dropped_cols');

Expand All @@ -350,5 +355,10 @@
qq(1),
'replication with RI FULL and dropped columns');

is( $node_subscriber_d_cols->safe_psql(
'postgres', "SELECT count(*) FROM generated_cols WHERE a = 100"),
qq(1),
'replication with RI FULL and generated columns');

$node_publisher_d_cols->stop('fast');
$node_subscriber_d_cols->stop('fast');

0 comments on commit 9dac02c

Please sign in to comment.