pgsql: Fix typos and bump catversion.

Started by Robert Haasabout 3 years ago5 messages
#1Robert Haas
rhaas@postgresql.org

Fix typos and bump catversion.

Typos reported by Álvaro Herrera and Erik Rijkers.

Catversion bump for 3d14e171e9e2236139e8976f3309a588bcc8683b was
inadvertently omitted.

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/2fb6154fcd769b2d4ea1226788e0ec2fc3522cb8

Modified Files
--------------
doc/src/sgml/ref/grant.sgml | 2 +-
src/bin/pg_dump/pg_dumpall.c | 1 -
src/include/catalog/catversion.h | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)

#2Joe Conway
mail@joeconway.com
In reply to: Robert Haas (#1)
Re: pgsql: Fix typos and bump catversion.

On 11/18/22 16:18, Robert Haas wrote:

Fix typos and bump catversion.

Typos reported by Álvaro Herrera and Erik Rijkers.

Catversion bump for 3d14e171e9e2236139e8976f3309a588bcc8683b was
inadvertently omitted.

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/2fb6154fcd769b2d4ea1226788e0ec2fc3522cb8

Modified Files
--------------
doc/src/sgml/ref/grant.sgml | 2 +-
src/bin/pg_dump/pg_dumpall.c | 1 -
src/include/catalog/catversion.h | 2 +-

Rishu Bagga pointed out to me offlist that this catversion bump seems
flawed:

diff --git a/src/include/catalog/catversion.h 
b/src/include/catalog/catversion.h
index 
c6ef593207c227ce10b0c897379476b553974f67..b3a57136b755fed182b4518330e65786032db870 
100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -57,6 +57,6 @@
   */
  /*                         yyyymmddN */
-#define CATALOG_VERSION_NO 202211121
+#define CATALOG_VERSION_NO 202211821

#endif

I think that should be 202211181, no? I am not clear on the desirable
way to fix though :-/

Joe
--
Joe Conway
PostgreSQL Contributors Team
RDS Open Source Databases
Amazon Web Services: https://aws.amazon.com

#3Andres Freund
andres@anarazel.de
In reply to: Joe Conway (#2)
Re: pgsql: Fix typos and bump catversion.

Hi,

On 2022-11-19 17:10:57 -0500, Joe Conway wrote:

Rishu Bagga pointed out to me offlist that this catversion bump seems
flawed:

diff --git a/src/include/catalog/catversion.h
b/src/include/catalog/catversion.h
index c6ef593207c227ce10b0c897379476b553974f67..b3a57136b755fed182b4518330e65786032db870
100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -57,6 +57,6 @@
*/
/*                         yyyymmddN */
-#define CATALOG_VERSION_NO 202211121
+#define CATALOG_VERSION_NO 202211821

#endif

I think that should be 202211181, no? I am not clear on the desirable way to
fix though :-/

I think it's fine to just update to a "normal" catversion. We really just
match for an exact match with a few exceptions (somewhere in pg_upgrade IIRC),
and those exceptions don't really matter for some individual commit on the
development branch.

Greetings,

Andres Freund

#4Tom Lane
tgl@sss.pgh.pa.us
In reply to: Andres Freund (#3)
Re: pgsql: Fix typos and bump catversion.

Andres Freund <andres@anarazel.de> writes:

On 2022-11-19 17:10:57 -0500, Joe Conway wrote:

Rishu Bagga pointed out to me offlist that this catversion bump seems
flawed:
/* yyyymmddN */
-#define CATALOG_VERSION_NO 202211121
+#define CATALOG_VERSION_NO 202211821

I think that should be 202211181, no? I am not clear on the desirable way to
fix though :-/

I think it's fine to just update to a "normal" catversion.

Yeah, just fix it --- and the sooner the better, to avoid the risk
that this becomes a value that someone needs to care about.

regards, tom lane

#5Joe Conway
mail@joeconway.com
In reply to: Tom Lane (#4)
Re: pgsql: Fix typos and bump catversion.

On 11/19/22 17:24, Tom Lane wrote:

Andres Freund <andres@anarazel.de> writes:

On 2022-11-19 17:10:57 -0500, Joe Conway wrote:

Rishu Bagga pointed out to me offlist that this catversion bump seems
flawed:
/* yyyymmddN */
-#define CATALOG_VERSION_NO 202211121
+#define CATALOG_VERSION_NO 202211821

I think that should be 202211181, no? I am not clear on the desirable way to
fix though :-/

I think it's fine to just update to a "normal" catversion.

Yeah, just fix it --- and the sooner the better, to avoid the risk
that this becomes a value that someone needs to care about.

WFM, done

--
Joe Conway
PostgreSQL Contributors Team
RDS Open Source Databases
Amazon Web Services: https://aws.amazon.com