diff options
| author | Noah Misch <noah@leadboat.com> | 2021-06-06 00:08:21 -0700 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2021-06-06 00:08:21 -0700 |
| commit | a2dee328bbe5b1979bbc6a784deb86a336c9cd74 (patch) | |
| tree | d7a89b3c7ab4862225913bb70cd1705fb85683c9 /src | |
| parent | 5c25fd650a774cc4f16ac9c635830d9bc5797f61 (diff) | |
| download | postgresql-a2dee328bbe5b1979bbc6a784deb86a336c9cd74.tar.gz postgresql-a2dee328bbe5b1979bbc6a784deb86a336c9cd74.zip | |
Standardize nodes/*funcs.c cosmetics for ForeignScan.resultRelation.
catversion bump due to readfuncs.c field order change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/nodes/copyfuncs.c | 2 | ||||
| -rw-r--r-- | src/backend/nodes/outfuncs.c | 2 | ||||
| -rw-r--r-- | src/backend/nodes/readfuncs.c | 2 | ||||
| -rw-r--r-- | src/include/catalog/catversion.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index 90770a89b0b..f94422c0526 100644 --- 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 8da8b14f0e5..0260101ce25 100644 --- 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 3772ea07dfd..f0b34ecface 100644 --- 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 7b8084e2451..06bf4632dfe 100644 --- 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 |