Fix logical replication's ideas about which type OIDs are built-in.

tglsfdc · tglsfdc · commit 3b505036a129 · 2019-05-13T17:23:00.000-04:00
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
diff --git a/src/backend/replication/logical/relation.c b/src/backend/replication/logical/relation.c
@@ -424,7 +424,7 @@ logicalrep_typmap_gettypname(Oid remoteid)
 	bool		found;
 
 	/* Internal types are mapped directly. */
-	if (remoteid < FirstNormalObjectId)
+	if (remoteid < FirstBootstrapObjectId)
 	{
 		if (!get_typisdefined(remoteid))
 		{
diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c
@@ -302,8 +302,12 @@ pgoutput_change(LogicalDecodingContext *ctx, ReorderBufferTXN *txn,
 		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 FirstBootstrapObjectId 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++)
 		{
@@ -312,7 +316,7 @@ pgoutput_change(LogicalDecodingContext *ctx, ReorderBufferTXN *txn,
 			if (att->attisdropped)
 				continue;
 
-			if (att->atttypid < FirstNormalObjectId)
+			if (att->atttypid < FirstBootstrapObjectId)
 				continue;
 
 			OutputPluginPrepareWrite(ctx, false);

Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ logicalrep_typmap_gettypname(Oid remoteid)`
`424`	`424`	`bool found;`
`425`	`425`
`426`	`426`	`/* Internal types are mapped directly. */`
`427`		`- if (remoteid < FirstNormalObjectId)`
	`427`	`+ if (remoteid < FirstBootstrapObjectId)`
`428`	`428`	`{`
`429`	`429`	`if (!get_typisdefined(remoteid))`
`430`	`430`	`{`