Standardize nodes/*funcs.c cosmetics for ForeignScan.resultRelation.

catversion bump due to readfuncs.c field order change.

diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 90770a89b0b661bc67f07352ec00d346dc25d7ca..f94422c05269883a0b21505059b88fd4223a8871 100644 (file)
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -775,6 +775,7 @@ _copyForeignScan(const ForeignScan *from)
     * copy remainder of node
     */
    COPY_SCALAR_FIELD(operation);
+   COPY_SCALAR_FIELD(resultRelation);
    COPY_SCALAR_FIELD(fs_server);
    COPY_NODE_FIELD(fdw_exprs);
    COPY_NODE_FIELD(fdw_private);
@@ -782,7 +783,6 @@ _copyForeignScan(const ForeignScan *from)
    COPY_NODE_FIELD(fdw_recheck_quals);
    COPY_BITMAPSET_FIELD(fs_relids);
    COPY_SCALAR_FIELD(fsSystemCol);
-   COPY_SCALAR_FIELD(resultRelation);
 
    return newnode;
 }

diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 8da8b14f0e56d0ba3a4fe892c76c49509c57603e..0260101ce25e08ac688f881fc3b9fc955199e056 100644 (file)
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -701,6 +701,7 @@ _outForeignScan(StringInfo str, const ForeignScan *node)
    _outScanInfo(str, (const Scan *) node);
 
    WRITE_ENUM_FIELD(operation, CmdType);
+   WRITE_UINT_FIELD(resultRelation);
    WRITE_OID_FIELD(fs_server);
    WRITE_NODE_FIELD(fdw_exprs);
    WRITE_NODE_FIELD(fdw_private);
@@ -708,7 +709,6 @@ _outForeignScan(StringInfo str, const ForeignScan *node)
    WRITE_NODE_FIELD(fdw_recheck_quals);
    WRITE_BITMAPSET_FIELD(fs_relids);
    WRITE_BOOL_FIELD(fsSystemCol);
-   WRITE_INT_FIELD(resultRelation);
 }
 
 static void

diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index 3772ea07dfd6dfa2ff58189341ff1620a399ab96..f0b34ecface799ef090737c098fead0dbf15d02b 100644 (file)
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -2073,6 +2073,7 @@ _readForeignScan(void)
    ReadCommonScan(&local_node->scan);
 
    READ_ENUM_FIELD(operation, CmdType);
+   READ_UINT_FIELD(resultRelation);
    READ_OID_FIELD(fs_server);
    READ_NODE_FIELD(fdw_exprs);
    READ_NODE_FIELD(fdw_private);
@@ -2080,7 +2081,6 @@ _readForeignScan(void)
    READ_NODE_FIELD(fdw_recheck_quals);
    READ_BITMAPSET_FIELD(fs_relids);
    READ_BOOL_FIELD(fsSystemCol);
-   READ_INT_FIELD(resultRelation);
 
    READ_DONE();
 }

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 7b8084e2451e0839f1201c7cfa8c57facbf402c2..06bf4632dfeffb9691630a3d85c4011ad2446e3d 100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
  */
 
 /*                         yyyymmddN */
-#define CATALOG_VERSION_NO 202106031
+#define CATALOG_VERSION_NO 202106061
 
 #endif