Skip to content

Commit f73a5f7

Browse files
danolivokelvich
danolivo
authored and
kelvich
committed
[PGPRO-3047] Fix the domain constraint problem (ALTER DOMAIN .. CONSTRAINT .. NOT VALID), revealed by the test case introduced in commit 9e4be9b8a9.
1 parent 19bdaca commit f73a5f7

File tree

4 files changed

+85
-86
lines changed

4 files changed

+85
-86
lines changed

‎Cluster.pm‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,41 @@ sub create_mm
8787
}
8888
}
8989

90+
foreach (0..$#{$self->{nodes}})
91+
{
92+
my $nnodes = $_;
93+
94+
# Simulate OID skew between multimaster nodes
95+
foreach (0..$nnodes)
96+
{
97+
# On pg_database oids
98+
$self->safe_psql($_, "CREATE DATABASE dummydatabase;");
99+
$self->safe_psql($_, "DROP DATABASE dummydatabase;");
100+
101+
# On pg_class oids
102+
$self->safe_psql($_, "CREATE TABLE dummytable (r INT);");
103+
$self->safe_psql($_, "DROP TABLE dummytable;");
104+
105+
# On pg_type oids
106+
$self->safe_psql($_, "CREATE TYPE dummytype AS (r INT);");
107+
$self->safe_psql($_, "DROP TYPE dummytype;");
108+
109+
# On pg_authid oids
110+
$self->safe_psql($_, "CREATE ROLE dummyrole;");
111+
$self->safe_psql($_, "DROP ROLE dummyrole;");
112+
113+
# On pg_am oids
114+
$self->safe_psql($_, "CREATE ACCESS METHOD dummygist TYPE INDEX HANDLER gisthandler;");
115+
$self->safe_psql($_, "DROP ACCESS METHOD dummygist;");
116+
117+
# On pg_namespace oids
118+
$self->safe_psql($_, "CREATE SCHEMA dummynsp;");
119+
$self->safe_psql($_, "DROP SCHEMA dummynsp;");
120+
121+
# XXX: pg_tablespace
122+
}
123+
}
124+
90125
(my $my_connstr, my @peers) = map {
91126
$_->connstr($_->{dbname})
92127
} @{$self->{nodes}};

‎src/pglogical_apply.c‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,8 @@ process_remote_begin(StringInfo s, GlobalTransactionId *gtid)
486486
gtid->my_xid = GetCurrentTransactionId();
487487
MtmDeadlockDetectorAddXact(gtid->my_xid, gtid);
488488

489+
suppress_internal_consistency_checks = true;
490+
489491
// AcceptInvalidationMessages();
490492
// if (!receiver_mtm_cfg_valid)
491493
// {
@@ -768,32 +770,7 @@ read_tuple_parts(StringInfo s, Relation rel, TupleData *tup)
768770
else
769771
tup->values[i] = PointerGetDatum(data);
770772
break;
771-
case 's': /* send/recv format */
772-
{
773-
Oid typreceive;
774-
Oid typioparam;
775-
StringInfoData buf;
776-
777-
tup->isnull[i] = false;
778-
len = pq_getmsgint(s, 4); /* read length */
779773

780-
getTypeBinaryInputInfo(att->atttypid,
781-
&typreceive, &typioparam);
782-
783-
/* create StringInfo pointing into the bigger buffer */
784-
initStringInfo(&buf);
785-
/* and data */
786-
buf.data = (char *) pq_getmsgbytes(s, len);
787-
buf.len = len;
788-
tup->values[i] = OidReceiveFunctionCall(
789-
typreceive, &buf, typioparam, att->atttypmod);
790-
791-
if (buf.len != buf.cursor)
792-
ereport(ERROR,
793-
(errcode(ERRCODE_INVALID_BINARY_REPRESENTATION),
794-
MTM_ERRMSG("incorrect binary data format")));
795-
break;
796-
}
797774
case 't': /* text format */
798775
{
799776
Oid typinput;
@@ -838,7 +815,8 @@ read_rel(StringInfo s, LOCKMODE mode)
838815
MemoryContext old_context;
839816

840817
local_relid = pglogical_relid_map_get(remote_relid);
841-
if (local_relid == InvalidOid) {
818+
if (local_relid == InvalidOid)
819+
{
842820
rv = makeNode(RangeVar);
843821

844822
nspnamelen = pq_getmsgbyte(s);
@@ -852,7 +830,9 @@ read_rel(StringInfo s, LOCKMODE mode)
852830
pglogical_relid_map_put(remote_relid, local_relid);
853831
MemoryContextSwitchTo(old_context);
854832
return heap_open(local_relid, NoLock);
855-
} else {
833+
}
834+
else
835+
{
856836
nspnamelen = pq_getmsgbyte(s);
857837
s->cursor += nspnamelen;
858838
relnamelen = pq_getmsgbyte(s);
@@ -954,6 +934,8 @@ process_remote_commit(StringInfo in, GlobalTransactionId *current_gtid, MtmRecei
954934
replorigin_session_origin_lsn = origin_node == MtmReplicationNodeId ? end_lsn : origin_lsn;
955935
Assert(replorigin_session_origin == InvalidRepOriginId);
956936

937+
suppress_internal_consistency_checks = false;
938+
957939
switch (event)
958940
{
959941
case PGLOGICAL_PRECOMMIT_PREPARED:

‎src/pglogical_proto.c‎

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ pglogical_write_rel(StringInfo out, PGLogicalOutputData *data, Relation rel)
109109

110110
relid = RelationGetRelid(rel);
111111

112-
if (relid == MtmLastRelId) {
112+
if (relid == MtmLastRelId)
113113
return;
114-
}
114+
115115
MtmLastRelId = relid;
116116

117117
pq_sendbyte(out, 'R'); /* sending RELATION */
@@ -122,7 +122,9 @@ pglogical_write_rel(StringInfo out, PGLogicalOutputData *data, Relation rel)
122122
if (tid == MtmSenderTID) { /* this relation was already sent in this transaction */
123123
pq_sendbyte(out, 0); /* do not need to send relation namespace and name in this case */
124124
pq_sendbyte(out, 0);
125-
} else {
125+
}
126+
else
127+
{
126128
pglogical_relid_map_put(relid, MtmSenderTID);
127129
nspname = get_namespace_name(rel->rd_rel->relnamespace);
128130
if (nspname == NULL)
@@ -648,21 +650,6 @@ pglogical_write_tuple(StringInfo out, PGLogicalOutputData *data,
648650

649651
break;
650652

651-
case 's': /* binary send/recv data follows */
652-
{
653-
bytea *outputbytes;
654-
int len;
655-
656-
outputbytes = OidSendFunctionCall(typclass->typsend,
657-
values[i]);
658-
659-
len = VARSIZE(outputbytes) - VARHDRSZ;
660-
pq_sendint(out, len, 4); /* length */
661-
pq_sendbytes(out, VARDATA(outputbytes), len); /* data */
662-
pfree(outputbytes);
663-
}
664-
break;
665-
666653
default:
667654
{
668655
char *outputstr;
@@ -699,19 +686,6 @@ decide_datum_transfer(Form_pg_attribute att, Form_pg_type typclass,
699686
{
700687
return 'b';
701688
}
702-
/*
703-
* Use send/recv, if allowed, if the type is plain or builtin.
704-
*
705-
* XXX: we can't use send/recv for array or composite types for now due to
706-
* the embedded oids.
707-
*/
708-
else if (allow_binary_basetypes &&
709-
OidIsValid(typclass->typreceive) &&
710-
(att->atttypid < FirstNormalObjectId || typclass->typtype != 'c') &&
711-
(att->atttypid < FirstNormalObjectId || typclass->typelem == InvalidOid))
712-
{
713-
return 's';
714-
}
715689

716690
return 't';
717691
}

‎t/007_bugfixes.pl‎

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,9 @@
88
my $cluster = new Cluster(3);
99
$cluster->init();
1010
$cluster->start();
11+
$cluster->create_mm();
1112

12-
foreach (0..$#{$cluster->{nodes}})
13-
{
14-
my $node = $cluster->{nodes}->[$_];
15-
$node->{dbname} = 'postgres';
16-
}
17-
18-
foreach (0..$#{$cluster->{nodes}})
19-
{
20-
my $node = $cluster->{nodes}->[$_];
21-
22-
note($cluster->connstr($_));
23-
24-
$cluster->safe_psql($_, qq{
25-
create extension multimaster;
26-
insert into mtm.cluster_nodes values
27-
(2, \$\$@{[ $cluster->connstr(0) ]}\$\$, '@{[ $_ == 0 ? 't' : 'f' ]}', 'f'),
28-
(4, \$\$@{[ $cluster->connstr(1) ]}\$\$, '@{[ $_ == 1 ? 't' : 'f' ]}', 'f'),
29-
(5, \$\$@{[ $cluster->connstr(2) ]}\$\$, '@{[ $_ == 2 ? 't' : 'f' ]}', 'f');
30-
});
31-
}
32-
33-
$cluster->await_nodes( (0..$#{$cluster->{nodes}}) );
34-
35-
$cluster->safe_psql($_, q{
13+
$cluster->safe_psql(0, q{
3614
CREATE EXTENSION pg_pathman;
3715
CREATE SCHEMA test_update_node;
3816
SET pg_pathman.enable_partitionrouter = ON;
@@ -138,10 +116,40 @@
138116
UPDATE thethings SET stuff = 10;
139117
ALTER DOMAIN things VALIDATE CONSTRAINT meow;
140118
");
141-
my $result = $cluster->safe_psql(0, "SELECT * FROM thethings");
142-
note("Value in stuff column of thethings table is $result");
143-
is( $result , 10, "Check that update not aborted by violation of constraint on old tuple value");
144-
note("THI: $result");
119+
my $result0 = $cluster->safe_psql(0, "SELECT * FROM thethings");
120+
my $result1 = $cluster->safe_psql(1, "SELECT * FROM thethings");
121+
my $result2 = $cluster->safe_psql(2, "SELECT * FROM thethings");
122+
note("Value in the stuff column of thethings table is $result0 at the node1 and match to corresponding values from another nodes: 2 - $result1 and 3 - $result2 ");
123+
is( (($result0 eq 10) and ($result0 eq $result1) and ($result1 eq $result2)), 1,
124+
"Check that update not aborted by violation of constraint on old tuple value");
125+
126+
# ##############################################################################
127+
#
128+
# [PGPRO-3047] Check for problems with different OIDs on multimaster nodes
129+
# during logical replication of tuples contained attribute with domain over
130+
# arrays of composite.
131+
#
132+
# ##############################################################################
133+
134+
# Check that OIDs are different.
135+
$result0 = $cluster->safe_psql(0,
136+
"select oid from pg_class where relname like 'thethings';");
137+
$result1 = $cluster->safe_psql(1,
138+
"select oid from pg_class where relname like 'thethings';");
139+
$result2 = $cluster->safe_psql(2,
140+
"select oid from pg_class where relname like 'thethings';");
141+
note("OIDS of the thethings relation: node1 - $result0, node2 - $result1, node3 - $result2");
142+
is( ( ($result0 ne $result1) and ($result0 ne $result2) and ($result1 ne $result2) ), 1,
143+
"Check that oid of the thethings relation are different on each node");
144+
145+
# Do the test. Insertion of array type must be passed successfully.
146+
# Source: regression test domain.sql
147+
$cluster->safe_psql(0, "
148+
CREATE TYPE comptype AS (r float8, i float8);
149+
CREATE domain dcomptypea AS comptype[];
150+
CREATE table dcomptable (d1 dcomptypea UNIQUE);
151+
INSERT INTO dcomptable VALUES (array[row(1,2)]::dcomptypea);
152+
");
145153

146154
$cluster->stop();
147155

0 commit comments

Comments
 (0)