Ignore generated columns during apply of update/delete.

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

diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c
index 6c3a93bd3b2ee66d1f4799ace69c04037e8ac3e3..43ec111c37bee3c33292bea0e29c8394686c5910 100644 (file)
--- a/src/backend/executor/execReplication.c
+++ b/src/backend/executor/execReplication.c
@@ -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;
 
        /*

diff --git a/src/test/subscription/t/100_bugs.pl b/src/test/subscription/t/100_bugs.pl
index a11f6be462b9d6d40173cdbbe750338e2b8a770d..7ebb97bbcfa767a5314ef629beb6b343712da4f2 100644 (file)
--- a/src/test/subscription/t/100_bugs.pl
+++ b/src/test/subscription/t/100_bugs.pl
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use PostgresNode;
 use TestLib;
-use Test::More tests => 8;
+use Test::More tests => 9;
 
 # Bug #15114
 
@@ -228,8 +228,8 @@ is( $node_subscriber->safe_psql(
 $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;
@@ -242,14 +242,18 @@ $node_publisher_d_cols->safe_psql(
    '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 =
@@ -271,6 +275,7 @@ $node_subscriber_d_cols->safe_psql(
 $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');
 
@@ -279,5 +284,10 @@ is( $node_subscriber_d_cols->safe_psql(
    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');