postgres.git / summary / log / commit / refs

commit    e03349144b00b775523f3e0ea8ef56ec2fb44b11
Author:   Peter Eisentraut <peter@eisentraut.org>
Date:     Tue Mar 05 12:34:43 2024 +0000
First released in: 17.0

    Improve field order in RangeTblEntry
    
    When perminfoindex was added, it was just added at the end of the
    block.  It would make sense to keep it closer to more related fields.
    In passing, also add an inline comment, like the other fields have.
    (Other field reorderings and documentation improvements in
    RangeTblEntry are being discussed, but it's better not to mix them
    together.)
    
    Discussion: https://www.postgresql.org/message-id/flat/6c1fbccc-85c8-40d3-b08b-4f47f2093711%40eisentraut.org


 src/backend/nodes/outfuncs.c     | 2 +-
 src/backend/nodes/readfuncs.c    | 2 +-
 src/include/catalog/catversion.h | 2 +-
 src/include/nodes/parsenodes.h   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 2c30bba2124..ef5c58ad102 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -505,8 +505,8 @@ _outRangeTblEntry(StringInfo str, const RangeTblEntry *node)
 			WRITE_OID_FIELD(relid);
 			WRITE_CHAR_FIELD(relkind);
 			WRITE_INT_FIELD(rellockmode);
-			WRITE_NODE_FIELD(tablesample);
 			WRITE_UINT_FIELD(perminfoindex);
+			WRITE_NODE_FIELD(tablesample);
 			break;
 		case RTE_SUBQUERY:
 			WRITE_NODE_FIELD(subquery);
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index b1e2f2b440a..70af513614d 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -359,8 +359,8 @@ _readRangeTblEntry(void)
 			READ_OID_FIELD(relid);
 			READ_CHAR_FIELD(relkind);
 			READ_INT_FIELD(rellockmode);
-			READ_NODE_FIELD(tablesample);
 			READ_UINT_FIELD(perminfoindex);
+			READ_NODE_FIELD(tablesample);
 			break;
 		case RTE_SUBQUERY:
 			READ_NODE_FIELD(subquery);
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 61790e89ba7..bedc2a0d722 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -57,6 +57,6 @@
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	202403051
+#define CATALOG_VERSION_NO	202403052
 
 #endif
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index d60e148ff26..24f5c06bb62 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -1072,8 +1072,8 @@ typedef struct RangeTblEntry
 	Oid			relid;			/* OID of the relation */
 	char		relkind;		/* relation kind (see pg_class.relkind) */
 	int			rellockmode;	/* lock level that query requires on the rel */
+	Index		perminfoindex;	/* index of RTEPermissionInfo entry, or 0 */
 	struct TableSampleClause *tablesample;	/* sampling info, or NULL */
-	Index		perminfoindex;
 
 	/*
 	 * Fields valid for a subquery RTE (else NULL):


[parent: 0d3a71d0c8a7]