huawei
/
openGauss-server
5
0
Fork 77
Code Issues Pull Requests 24 Projects Releases Wiki Activity

!1605 回滚误合代码 

Merge pull request !1605 from 胡正超/revert
This commit is contained in:
opengauss-bot 2022-03-18 13:09:20 +00:00 committed by Gitee
parent 3fd1d61d11 332019a810
commit 0c8b345357
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/backend/nodes/outfuncs.cpp
View File

@ -115,10 +115,7 @@
/*
* For the new created type, we have to bind the typname and typnamespace information
* so that the data node can decode it.
* But in single node, we don't need it.
*/
#ifdef ENABLE_MULTIPLE_NODES
#define WRITE_TYPEINFO_WITHOID(typid) \
if ((typid) >= FirstBootstrapObjectId && IsStatisfyUpdateCompatibility(typid)) { \
char* exprtypename = NULL; \
@ -154,14 +151,6 @@
WRITE_TYPEINFO_WITHOID(typid) \
} \
} while (0)
#else /* not def ENABLE_MULTIPLE_NODES */
#define WRITE_TYPEINFO_WITHOID(typid) ((void)0)
#define WRITE_TYPEINFO_FIELD(fldname) ((void)0)
#define WRITE_TYPEINFO_LIST(fldname) ((void)0)
#define WRITE_TYPEINFO_ARRAY(fldname, size) ((void)0)
#endif /* ENABLE_MULTIPLE_NODES */
/*
* Write full-text search configuration's name out of its oid

15
src/common/backend/nodes/readfuncs.cpp
View File

@ -401,13 +401,6 @@ THR_LOCAL bool skip_read_extern_fields = false;
token = pg_strtok(&length); /* skip :fldname */ \
local_node->fldname = _readBitmapset()
/*
* For the new created type, we have to bind the typname and typnamespace information
* so that the data node can decode it.
* But in single node, we don't need it.
*/
#ifdef ENABLE_MULTIPLE_NODES
#define READ_TYPEINFO_FIELD(fldname) \
do { \
if (local_node->fldname >= FirstBootstrapObjectId) { \
@ -469,14 +462,6 @@ THR_LOCAL bool skip_read_extern_fields = false;
READ_TYPEINFO(local_node->fldname[i]); \
} \
} while (0);
#else /* not def ENABLE_MULTIPLE_NODES */
#define READ_TYPEINFO_FIELD(fldname) ((void)0)
#define READ_TYPEINFO(typePtr) ((void)0)
#define READ_TYPEINFO_LIST(fldname) ((void)0)
#define READ_TYPINFO_ARRAY(fldname, size) ((void)0)
#endif /* ENABLE_MULTIPLE_NODES */
/* read full-text search configuratio's oid from its name */
#define READ_CFGINFO_FIELD(fldname1, fldname2) \