From 72eab84a565cbc0677bf8907cd4bfaddf064bd64 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 19 Jul 2020 12:37:23 -0400 Subject: [PATCH] Correctly mark pg_subscription.subslotname as nullable. Due to the layout of this catalog, subslotname has to be explicitly marked BKI_FORCE_NULL, else initdb will default to the assumption that it's non-nullable. Since, in fact, CREATE/ALTER SUBSCRIPTION will store null values there, the existing marking is just wrong, and has been since this catalog was invented. We haven't noticed because not much in the system actually depends on attnotnull being truthful. However, JIT'ed tuple deconstruction does depend on that in some cases, allowing crashes or wrong answers in queries that inspect pg_subscription. Commit 9de77b545 quite accidentally exposed this on the buildfarm members that force JIT activation. Back-patch to v13. The problem goes further back, but we cannot force initdb in released branches, so some klugier solution will be needed there. Before working on that, push this simple fix to try to get the buildfarm back to green. Discussion: https://postgr.es/m/4118109.1595096139@sss.pgh.pa.us --- doc/src/sgml/catalogs.sgml | 3 ++- src/include/catalog/catversion.h | 2 +- src/include/catalog/pg_subscription.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml index 18ab3d434c..80c183b235 100644 --- a/doc/src/sgml/catalogs.sgml +++ b/doc/src/sgml/catalogs.sgml @@ -7529,7 +7529,8 @@ SCRAM-SHA-256$<iteration count>:&l Name of the replication slot in the upstream database (also used - for the local replication origin name) + for the local replication origin name); + null represents NONE diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index ccb586ad00..dab7f4f471 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 202007181 +#define CATALOG_VERSION_NO 202007192 #endif diff --git a/src/include/catalog/pg_subscription.h b/src/include/catalog/pg_subscription.h index a041ce9740..9795c35000 100644 --- a/src/include/catalog/pg_subscription.h +++ b/src/include/catalog/pg_subscription.h @@ -56,7 +56,7 @@ CATALOG(pg_subscription,6100,SubscriptionRelationId) BKI_SHARED_RELATION BKI_ROW text subconninfo BKI_FORCE_NOT_NULL; /* Slot name on publisher */ - NameData subslotname; + NameData subslotname BKI_FORCE_NULL; /* Synchronous commit setting for worker */ text subsynccommit BKI_FORCE_NOT_NULL;