diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2019-05-13 17:23:00 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2019-05-13 17:23:00 -0400 |
| commit | 32ebb35128c3d16b64039f6d6774afd96a3d91b9 (patch) | |
| tree | 2aab15f686300d11d139c2422d2d21bd63536984 /src | |
| parent | e34ee993fbc38c8538f9342c5961e5f61fd45180 (diff) | |
| download | postgresql-32ebb35128c3d16b64039f6d6774afd96a3d91b9.tar.gz postgresql-32ebb35128c3d16b64039f6d6774afd96a3d91b9.zip | |
Fix logical replication's ideas about which type OIDs are built-in.
Only hand-assigned type OIDs should be presumed to match across different
PG servers; those assigned during genbki.pl or during initdb are likely
to change due to addition or removal of unrelated objects.
This means that the cutoff should be FirstGenbkiObjectId (in HEAD)
or FirstBootstrapObjectId (before that), not FirstNormalObjectId.
Compare postgres_fdw's is_builtin() test.
It's likely that this error has no observable consequence in a
normally-functioning system, since ATM the only affected type OIDs are
system catalog rowtypes and information_schema types, which would not
typically be interesting for logical replication. But you could
probably break it if you tried hard, so back-patch.
Discussion: https://postgr.es/m/15150.1557257111@sss.pgh.pa.us
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/replication/logical/relation.c | 2 | ||||
| -rw-r--r-- | src/backend/replication/pgoutput/pgoutput.c | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/backend/replication/logical/relation.c b/src/backend/replication/logical/relation.c index 5aee4b80e66..85269c037de 100644 --- a/src/backend/replication/logical/relation.c +++ b/src/backend/replication/logical/relation.c @@ -425,7 +425,7 @@ logicalrep_typmap_gettypname(Oid remoteid) bool found; /* Internal types are mapped directly. */ - if (remoteid < FirstNormalObjectId) + if (remoteid < FirstGenbkiObjectId) { if (!get_typisdefined(remoteid)) { diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c index bf64c8e4a42..63687a97ece 100644 --- a/src/backend/replication/pgoutput/pgoutput.c +++ b/src/backend/replication/pgoutput/pgoutput.c @@ -269,8 +269,12 @@ maybe_send_schema(LogicalDecodingContext *ctx, desc = RelationGetDescr(relation); /* - * Write out type info if needed. We do that only for user created - * types. + * Write out type info if needed. We do that only for user-created + * types. We use FirstGenbkiObjectId as the cutoff, so that we only + * consider objects with hand-assigned OIDs to be "built in", not for + * instance any function or type defined in the information_schema. + * This is important because only hand-assigned OIDs can be expected + * to remain stable across major versions. */ for (i = 0; i < desc->natts; i++) { @@ -279,7 +283,7 @@ maybe_send_schema(LogicalDecodingContext *ctx, if (att->attisdropped || att->attgenerated) continue; - if (att->atttypid < FirstNormalObjectId) + if (att->atttypid < FirstGenbkiObjectId) continue; OutputPluginPrepareWrite(ctx, false); |