mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-03-01 19:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove T_Join and T_Plan

Browse Source 
These are abstract node types that don't need to have a node tag
defined.

Discussion: https://www.postgresql.org/message-id/2592455.1657140387%40sss.pgh.pa.us
This commit is contained in:
Peter Eisentraut 2022-07-08 10:38:02 +02:00
parent 3de359f18f
commit 251154bebe
6 changed files with 1 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/backend/nodes/copyfuncs.c
View File

@ -138,23 +138,6 @@ CopyPlanFields(const Plan *from, Plan *newnode)
COPY_BITMAPSET_FIELD(allParam);
}
/*
* _copyPlan
*/
static Plan *
_copyPlan(const Plan *from)
{
Plan *newnode = makeNode(Plan);
/*
* copy node superclass fields
*/
CopyPlanFields(from, newnode);
return newnode;
}
/*
* _copyResult
*/
@ -844,23 +827,6 @@ CopyJoinFields(const Join *from, Join *newnode)
}
/*
* _copyJoin
*/
static Join *
_copyJoin(const Join *from)
{
Join *newnode = makeNode(Join);
/*
* copy node superclass fields
*/
CopyJoinFields(from, newnode);
return newnode;
}
/*
* _copyNestLoop
*/
@ -5571,9 +5537,6 @@ copyObjectImpl(const void *from)
case T_PlannedStmt:
retval = _copyPlannedStmt(from);
break;
case T_Plan:
retval = _copyPlan(from);
break;
case T_Result:
retval = _copyResult(from);
break;
@ -5658,9 +5621,6 @@ copyObjectImpl(const void *from)
case T_CustomScan:
retval = _copyCustomScan(from);
break;
case T_Join:
retval = _copyJoin(from);
break;
case T_NestLoop:
retval = _copyNestLoop(from);
break;

23
src/backend/nodes/outfuncs.c
View File

@ -386,15 +386,6 @@ _outJoinPlanInfo(StringInfo str, const Join *node)
WRITE_NODE_FIELD(joinqual);
}
static void
_outPlan(StringInfo str, const Plan *node)
{
WRITE_NODE_TYPE("PLAN");
_outPlanInfo(str, (const Plan *) node);
}
static void
_outResult(StringInfo str, const Result *node)
{
@ -750,14 +741,6 @@ _outCustomScan(StringInfo str, const CustomScan *node)
outToken(str, node->methods->CustomName);
}
static void
_outJoin(StringInfo str, const Join *node)
{
WRITE_NODE_TYPE("JOIN");
_outJoinPlanInfo(str, (const Join *) node);
}
static void
_outNestLoop(StringInfo str, const NestLoop *node)
{
@ -4058,9 +4041,6 @@ outNode(StringInfo str, const void *obj)
case T_PlannedStmt:
_outPlannedStmt(str, obj);
break;
case T_Plan:
_outPlan(str, obj);
break;
case T_Result:
_outResult(str, obj);
break;
@ -4145,9 +4125,6 @@ outNode(StringInfo str, const void *obj)
case T_CustomScan:
_outCustomScan(str, obj);
break;
case T_Join:
_outJoin(str, obj);
break;
case T_NestLoop:
_outNestLoop(str, obj);
break;

30
src/backend/nodes/readfuncs.c
View File

@ -1859,19 +1859,6 @@ ReadCommonPlan(Plan *local_node)
READ_BITMAPSET_FIELD(allParam);
}
/*
* _readPlan
*/
static Plan *
_readPlan(void)
{
READ_LOCALS_NO_FIELDS(Plan);
ReadCommonPlan(local_node);
READ_DONE();
}
/*
* _readResult
*/
@ -2362,19 +2349,6 @@ ReadCommonJoin(Join *local_node)
READ_NODE_FIELD(joinqual);
}
/*
* _readJoin
*/
static Join *
_readJoin(void)
{
READ_LOCALS_NO_FIELDS(Join);
ReadCommonJoin(local_node);
READ_DONE();
}
/*
* _readNestLoop
*/
@ -3099,8 +3073,6 @@ parseNodeString(void)
return_value = _readDeclareCursorStmt();
else if (MATCH("PLANNEDSTMT", 11))
return_value = _readPlannedStmt();
else if (MATCH("PLAN", 4))
return_value = _readPlan();
else if (MATCH("RESULT", 6))
return_value = _readResult();
else if (MATCH("PROJECTSET", 10))
@ -3153,8 +3125,6 @@ parseNodeString(void)
return_value = _readForeignScan();
else if (MATCH("CUSTOMSCAN", 10))
return_value = _readCustomScan();
else if (MATCH("JOIN", 4))
return_value = _readJoin();
else if (MATCH("NESTLOOP", 8))
return_value = _readNestLoop();
else if (MATCH("MERGEJOIN", 9))

2
src/include/catalog/catversion.h
View File

@ -53,6 +53,6 @@
*/
/* yyyymmddN */
#define CATALOG_VERSION_NO 202207052
#define CATALOG_VERSION_NO 202207081
#endif

2
src/include/nodes/nodes.h
View File

@ -43,7 +43,6 @@ typedef enum NodeTag
/*
* TAGS FOR PLAN NODES (plannodes.h)
*/
T_Plan,
T_Result,
T_ProjectSet,
T_ModifyTable,
@ -70,7 +69,6 @@ typedef enum NodeTag
T_WorkTableScan,
T_ForeignScan,
T_CustomScan,
T_Join,
T_NestLoop,
T_MergeJoin,
T_HashJoin,

6
src/test/modules/test_oat_hooks/test_oat_hooks.c
View File

@ -468,9 +468,6 @@ nodetag_to_string(NodeTag tag)
case T_TupleTableSlot:
return "TupleTableSlot";
break;
case T_Plan:
return "Plan";
break;
case T_Result:
return "Result";
break;
@ -549,9 +546,6 @@ nodetag_to_string(NodeTag tag)
case T_CustomScan:
return "CustomScan";
break;
case T_Join:
return "Join";
break;
case T_NestLoop:
return "NestLoop";
break;