fix_relcache_leak_in_lrworker_v9.patch

diff --git a/src/test/subscription/t/013_partition.pl b/src/test/subscription/t/013_partition.pl
index a04c03a7e2..142fdff518 100644
--- a/src/test/subscription/t/013_partition.pl
+++ b/src/test/subscription/t/013_partition.pl
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use PostgresNode;
 use TestLib;
-use Test::More tests => 51;
+use Test::More tests => 54;
 
 # setup
 
@@ -67,6 +67,26 @@ $node_subscriber1->safe_psql('postgres',
 	"CREATE SUBSCRIPTION sub1 CONNECTION '$publisher_connstr' PUBLICATION pub1"
 );
 
+# Add replica AFTER trigger for testing that they are fired correctly
+$node_subscriber1->safe_psql(
+	'postgres', qq{
+CREATE TABLE sub1_tab1_2_2_trigger_activity (tgtab text, tgop text, tgwhen text, tglevel text, olda int, newa int);
+CREATE FUNCTION sub1_log_tab1_2_2_trigger_activity() RETURNS TRIGGER AS \$\$
+BEGIN
+    IF (TG_OP = 'INSERT') THEN
+        INSERT INTO public.sub1_tab1_2_2_trigger_activity SELECT TG_RELNAME, TG_OP, TG_WHEN, TG_LEVEL, NULL, NEW.a;
+    ELSIF (TG_OP = 'UPDATE') THEN
+        INSERT INTO public.sub1_tab1_2_2_trigger_activity SELECT TG_RELNAME, TG_OP, TG_WHEN, TG_LEVEL, OLD.a, NEW.a;
+    END IF;
+    RETURN NULL;
+END;
+\$\$ LANGUAGE plpgsql;
+CREATE TRIGGER sub1_tab1_2_2_log_op_trigger
+    AFTER INSERT OR UPDATE ON tab1_2_2
+    FOR EACH ROW EXECUTE PROCEDURE sub1_log_tab1_2_2_trigger_activity();
+ALTER TABLE tab1_2_2 ENABLE REPLICA TRIGGER sub1_tab1_2_2_log_op_trigger;
+});
+
 # subscriber 2
 #
 # This does not use partitioning.  The tables match the leaf tables on
@@ -87,6 +107,26 @@ $node_subscriber2->safe_psql('postgres',
 	"CREATE SUBSCRIPTION sub2 CONNECTION '$publisher_connstr' PUBLICATION pub_all"
 );
 
+# Add replica AFTER trigger for testing that they are fired correctly
+$node_subscriber2->safe_psql(
+	'postgres', qq{
+CREATE TABLE sub2_tab1_2_trigger_activity (tgtab text, tgop text, tgwhen text, tglevel text, olda int, newa int);
+CREATE FUNCTION sub2_log_tab1_2_trigger_activity() RETURNS TRIGGER AS \$\$
+BEGIN
+    IF (TG_OP = 'INSERT') THEN
+        INSERT INTO public.sub2_tab1_2_trigger_activity SELECT TG_RELNAME, TG_OP, TG_WHEN, TG_LEVEL, NULL, NEW.a;
+    ELSIF (TG_OP = 'UPDATE') THEN
+        INSERT INTO public.sub2_tab1_2_trigger_activity SELECT TG_RELNAME, TG_OP, TG_WHEN, TG_LEVEL, OLD.a, NEW.a;
+    END IF;
+    RETURN NULL;
+END;
+\$\$ LANGUAGE plpgsql;
+CREATE TRIGGER sub2_tab1_2_log_op_trigger
+    AFTER INSERT OR UPDATE ON tab1_2
+    FOR EACH ROW EXECUTE PROCEDURE sub2_log_tab1_2_trigger_activity();
+ALTER TABLE tab1_2 ENABLE REPLICA TRIGGER sub2_tab1_2_log_op_trigger;
+});
+
 # Wait for initial sync of all subscriptions
 my $synced_query =
   "SELECT count(1) = 0 FROM pg_subscription_rel WHERE srsubstate NOT IN ('r', 's');";
@@ -130,6 +170,11 @@ $result = $node_subscriber2->safe_psql('postgres',
 	"SELECT c, a FROM tab1_2 ORDER BY 1, 2");
 is($result, qq(sub2_tab1_2|5), 'inserts into tab1_2 replicated');
 
+# The after trigger of tab1_2 should have recorded the insert
+$result = $node_subscriber2->safe_psql('postgres',
+	"SELECT * FROM sub2_tab1_2_trigger_activity ORDER BY tgtab, tgop, tgwhen, newa;");
+is($result, qq(tab1_2|INSERT|AFTER|ROW||5), 'check replica insert after trigger applied on subscriber');
+
 $result = $node_subscriber2->safe_psql('postgres',
 	"SELECT c, a FROM tab1_def ORDER BY 1, 2");
 is($result, qq(sub2_tab1_def|0), 'inserts into tab1_def replicated');
@@ -161,6 +206,18 @@ $result = $node_subscriber1->safe_psql('postgres',
 	"SELECT a FROM tab1_2_2 ORDER BY 1");
 is($result, qq(6), 'updates of tab1_2 replicated into tab1_2_2 correctly');
 
+# The after trigger should have recorded the updates of tab1_2 as follows:
+# 1) updates of tab1_2 (a) where 5 is changed to 6 is applied as
+# cross-partition update, that is, delete 5 from tab1_2_1 followed by
+# insert 6 into tab1_2_2.
+# 2) updates of tab1_2 (a) where 6 is changed to 4 back to 6 are applied as
+# updates of tab1_2_2.
+$result = $node_subscriber1->safe_psql('postgres',
+	"SELECT * FROM sub1_tab1_2_2_trigger_activity ORDER BY tgtab, tgop, tgwhen, newa;");
+is($result, qq(tab1_2_2|INSERT|AFTER|ROW||6
+tab1_2_2|UPDATE|AFTER|ROW|6|4
+tab1_2_2|UPDATE|AFTER|ROW|4|6), 'check replica insert/update after trigger applied on subscriber');
+
 $result = $node_subscriber2->safe_psql('postgres',
 	"SELECT c, a FROM tab1_1 ORDER BY 1, 2");
 is( $result, qq(sub2_tab1_1|2
@@ -170,6 +227,14 @@ $result = $node_subscriber2->safe_psql('postgres',
 	"SELECT c, a FROM tab1_2 ORDER BY 1, 2");
 is($result, qq(sub2_tab1_2|6), 'tab1_2 updated');
 
+# The after trigger should have recorded the updates of tab1_2
+$result = $node_subscriber2->safe_psql('postgres',
+	"SELECT * FROM sub2_tab1_2_trigger_activity ORDER BY tgtab, tgop, tgwhen, newa;");
+is($result, qq(tab1_2|INSERT|AFTER|ROW||5
+tab1_2|UPDATE|AFTER|ROW|6|4
+tab1_2|UPDATE|AFTER|ROW|5|6
+tab1_2|UPDATE|AFTER|ROW|4|6), 'check replica update after trigger applied on subscriber');
+
 $result = $node_subscriber2->safe_psql('postgres',
 	"SELECT c, a FROM tab1_def ORDER BY 1");
 is($result, qq(sub2_tab1_def|0), 'tab1_def unchanged');