Remove T_Join and T_Plan

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

diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 8313b5e5a7661aa0d7463312157b828facf5df98..2c834e4d0d43527210e7b7306f0305adf2871cb1 100644 (file)
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -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;

diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 05f27f044b6dff194349227e4b28a02698fe82bc..7dab96c1be040caadd57eb9b5b74e69517c07478 100644 (file)
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -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;

diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index 014b3005af86f426af2d7a4eaa96444c57362067..6b11f0481bf0d29d22ff2fa185d92806c8e3c27c 100644 (file)
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -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))

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index eed9bb4b3dc642e46dc6e07c8e37aa5a49c49926..c1d2e872b3081475667647117ca7a24a867f7ae5 100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
  */
 
 /*                         yyyymmddN */
-#define CATALOG_VERSION_NO 202207052
+#define CATALOG_VERSION_NO 202207081
 
 #endif

diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 7ce1fc4deb6e05bd1e25ffdec80f42730884e955..9255ce467eb1d3ee239e4e615b6efc4b841bf4ca 100644 (file)
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -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,

diff --git a/src/test/modules/test_oat_hooks/test_oat_hooks.c b/src/test/modules/test_oat_hooks/test_oat_hooks.c
index 7ef272cc7ae08d1c43c3f9eaa1c1b76537159e25..b648ee67ff482aba3aceb4994d7d436e40f1f023 100644 (file)
--- a/src/test/modules/test_oat_hooks/test_oat_hooks.c
+++ b/src/test/modules/test_oat_hooks/test_oat_hooks.c
@@ -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;