diff options
author | Tom Lane | 2009-09-27 21:10:53 +0000 |
---|---|---|
committer | Tom Lane | 2009-09-27 21:10:53 +0000 |
commit | 6721bfc1271b3347d634afa9b2d12476ae03bb88 (patch) | |
tree | d54607f5f60021cb7eba4fe53a9c8c1cc8463bd4 | |
parent | 9f2cd00735b239f4f0c3ad67d629564ae796f077 (diff) |
Remove no-longer-needed ExecCountSlots infrastructure.
56 files changed, 0 insertions, 421 deletions
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c index 15af71122c..05d592946e 100644 --- a/src/backend/executor/execProcnode.c +++ b/src/backend/executor/execProcnode.c @@ -18,7 +18,6 @@ */ /* * INTERFACE ROUTINES - * ExecCountSlotsNode - count tuple slots needed by plan tree * ExecInitNode - initialize a plan node and its subplans * ExecProcNode - get a tuple by executing the plan node * ExecEndNode - shut down a plan node and its subplans @@ -519,122 +518,6 @@ MultiExecProcNode(PlanState *node) } -/* - * ExecCountSlotsNode - count up the number of tuple table slots needed - * - * Note that this scans a Plan tree, not a PlanState tree, because we - * haven't built the PlanState tree yet ... - */ -int -ExecCountSlotsNode(Plan *node) -{ - if (node == NULL) - return 0; - - switch (nodeTag(node)) - { - /* - * control nodes - */ - case T_Result: - return ExecCountSlotsResult((Result *) node); - - case T_Append: - return ExecCountSlotsAppend((Append *) node); - - case T_RecursiveUnion: - return ExecCountSlotsRecursiveUnion((RecursiveUnion *) node); - - case T_BitmapAnd: - return ExecCountSlotsBitmapAnd((BitmapAnd *) node); - - case T_BitmapOr: - return ExecCountSlotsBitmapOr((BitmapOr *) node); - - /* - * scan nodes - */ - case T_SeqScan: - return ExecCountSlotsSeqScan((SeqScan *) node); - - case T_IndexScan: - return ExecCountSlotsIndexScan((IndexScan *) node); - - case T_BitmapIndexScan: - return ExecCountSlotsBitmapIndexScan((BitmapIndexScan *) node); - - case T_BitmapHeapScan: - return ExecCountSlotsBitmapHeapScan((BitmapHeapScan *) node); - - case T_TidScan: - return ExecCountSlotsTidScan((TidScan *) node); - - case T_SubqueryScan: - return ExecCountSlotsSubqueryScan((SubqueryScan *) node); - - case T_FunctionScan: - return ExecCountSlotsFunctionScan((FunctionScan *) node); - - case T_ValuesScan: - return ExecCountSlotsValuesScan((ValuesScan *) node); - - case T_CteScan: - return ExecCountSlotsCteScan((CteScan *) node); - - case T_WorkTableScan: - return ExecCountSlotsWorkTableScan((WorkTableScan *) node); - - /* - * join nodes - */ - case T_NestLoop: - return ExecCountSlotsNestLoop((NestLoop *) node); - - case T_MergeJoin: - return ExecCountSlotsMergeJoin((MergeJoin *) node); - - case T_HashJoin: - return ExecCountSlotsHashJoin((HashJoin *) node); - - /* - * materialization nodes - */ - case T_Material: - return ExecCountSlotsMaterial((Material *) node); - - case T_Sort: - return ExecCountSlotsSort((Sort *) node); - - case T_Group: - return ExecCountSlotsGroup((Group *) node); - - case T_Agg: - return ExecCountSlotsAgg((Agg *) node); - - case T_WindowAgg: - return ExecCountSlotsWindowAgg((WindowAgg *) node); - break; - - case T_Unique: - return ExecCountSlotsUnique((Unique *) node); - - case T_Hash: - return ExecCountSlotsHash((Hash *) node); - - case T_SetOp: - return ExecCountSlotsSetOp((SetOp *) node); - - case T_Limit: - return ExecCountSlotsLimit((Limit *) node); - - default: - elog(ERROR, "unrecognized node type: %d", (int) nodeTag(node)); - break; - } - - return 0; -} - /* ---------------------------------------------------------------- * ExecEndNode * diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index d7cccc534f..672051f159 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -1239,8 +1239,6 @@ ExecInitAgg(Agg *node, EState *estate, int eflags) ALLOCSET_DEFAULT_INITSIZE, ALLOCSET_DEFAULT_MAXSIZE); -#define AGG_NSLOTS 3 - /* * tuple table initialization */ @@ -1604,14 +1602,6 @@ GetAggInitVal(Datum textInitVal, Oid transtype) return initVal; } -int -ExecCountSlotsAgg(Agg *node) -{ - return ExecCountSlotsNode(outerPlan(node)) + - ExecCountSlotsNode(innerPlan(node)) + - AGG_NSLOTS; -} - void ExecEndAgg(AggState *node) { diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c index 0938e941f5..64eafd0a3e 100644 --- a/src/backend/executor/nodeAppend.c +++ b/src/backend/executor/nodeAppend.c @@ -192,8 +192,6 @@ ExecInitAppend(Append *node, EState *estate, int eflags) * ExecQual or ExecProject. */ -#define APPEND_NSLOTS 1 - /* * append nodes still have Result slots, which hold pointers to tuples, so * we have to initialize them. @@ -233,17 +231,6 @@ ExecInitAppend(Append *node, EState *estate, int eflags) return appendstate; } -int -ExecCountSlotsAppend(Append *node) -{ - ListCell *plan; - int nSlots = 0; - - foreach(plan, node->appendplans) - nSlots += ExecCountSlotsNode((Plan *) lfirst(plan)); - return nSlots + APPEND_NSLOTS; -} - /* ---------------------------------------------------------------- * ExecAppend * diff --git a/src/backend/executor/nodeBitmapAnd.c b/src/backend/executor/nodeBitmapAnd.c index 650d07fd41..2d340e7dd8 100644 --- a/src/backend/executor/nodeBitmapAnd.c +++ b/src/backend/executor/nodeBitmapAnd.c @@ -74,8 +74,6 @@ ExecInitBitmapAnd(BitmapAnd *node, EState *estate, int eflags) * ExecQual or ExecProject. They don't need any tuple slots either. */ -#define BITMAPAND_NSLOTS 0 - /* * call ExecInitNode on each of the plans to be executed and save the * results into the array "bitmapplanstates". @@ -91,17 +89,6 @@ ExecInitBitmapAnd(BitmapAnd *node, EState *estate, int eflags) return bitmapandstate; } -int -ExecCountSlotsBitmapAnd(BitmapAnd *node) -{ - ListCell *plan; - int nSlots = 0; - - foreach(plan, node->bitmapplans) - nSlots += ExecCountSlotsNode((Plan *) lfirst(plan)); - return nSlots + BITMAPAND_NSLOTS; -} - /* ---------------------------------------------------------------- * MultiExecBitmapAnd * ---------------------------------------------------------------- diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c index eba7063b3f..eeaa4c738b 100644 --- a/src/backend/executor/nodeBitmapHeapscan.c +++ b/src/backend/executor/nodeBitmapHeapscan.c @@ -597,8 +597,6 @@ ExecInitBitmapHeapScan(BitmapHeapScan *node, EState *estate, int eflags) ExecInitExpr((Expr *) node->bitmapqualorig, (PlanState *) scanstate); -#define BITMAPHEAPSCAN_NSLOTS 2 - /* * tuple table initialization */ @@ -646,10 +644,3 @@ ExecInitBitmapHeapScan(BitmapHeapScan *node, EState *estate, int eflags) */ return scanstate; } - -int -ExecCountSlotsBitmapHeapScan(BitmapHeapScan *node) -{ - return ExecCountSlotsNode(outerPlan((Plan *) node)) + - ExecCountSlotsNode(innerPlan((Plan *) node)) + BITMAPHEAPSCAN_NSLOTS; -} diff --git a/src/backend/executor/nodeBitmapIndexscan.c b/src/backend/executor/nodeBitmapIndexscan.c index 4d932a3316..61a4e001c3 100644 --- a/src/backend/executor/nodeBitmapIndexscan.c +++ b/src/backend/executor/nodeBitmapIndexscan.c @@ -235,8 +235,6 @@ ExecInitBitmapIndexScan(BitmapIndexScan *node, EState *estate, int eflags) * sub-parts corresponding to runtime keys (see below). */ -#define BITMAPINDEXSCAN_NSLOTS 0 - /* * We do not open or lock the base relation here. We assume that an * ancestor BitmapHeapScan node is holding AccessShareLock (or better) on @@ -318,10 +316,3 @@ ExecInitBitmapIndexScan(BitmapIndexScan *node, EState *estate, int eflags) */ return indexstate; } - -int -ExecCountSlotsBitmapIndexScan(BitmapIndexScan *node) -{ - return ExecCountSlotsNode(outerPlan((Plan *) node)) + - ExecCountSlotsNode(innerPlan((Plan *) node)) + BITMAPINDEXSCAN_NSLOTS; -} diff --git a/src/backend/executor/nodeBitmapOr.c b/src/backend/executor/nodeBitmapOr.c index e3c8070aff..ced0a04031 100644 --- a/src/backend/executor/nodeBitmapOr.c +++ b/src/backend/executor/nodeBitmapOr.c @@ -75,8 +75,6 @@ ExecInitBitmapOr(BitmapOr *node, EState *estate, int eflags) * ExecQual or ExecProject. They don't need any tuple slots either. */ -#define BITMAPOR_NSLOTS 0 - /* * call ExecInitNode on each of the plans to be executed and save the * results into the array "bitmapplanstates". @@ -92,17 +90,6 @@ ExecInitBitmapOr(BitmapOr *node, EState *estate, int eflags) return bitmaporstate; } -int -ExecCountSlotsBitmapOr(BitmapOr *node) -{ - ListCell *plan; - int nSlots = 0; - - foreach(plan, node->bitmapplans) - nSlots += ExecCountSlotsNode((Plan *) lfirst(plan)); - return nSlots + BITMAPOR_NSLOTS; -} - /* ---------------------------------------------------------------- * MultiExecBitmapOr * ---------------------------------------------------------------- diff --git a/src/backend/executor/nodeCtescan.c b/src/backend/executor/nodeCtescan.c index 8ab773a7c1..c3244422b0 100644 --- a/src/backend/executor/nodeCtescan.c +++ b/src/backend/executor/nodeCtescan.c @@ -237,8 +237,6 @@ ExecInitCteScan(CteScan *node, EState *estate, int eflags) ExecInitExpr((Expr *) node->scan.plan.qual, (PlanState *) scanstate); -#define CTESCAN_NSLOTS 2 - /* * tuple table initialization */ @@ -263,14 +261,6 @@ ExecInitCteScan(CteScan *node, EState *estate, int eflags) return scanstate; } -int -ExecCountSlotsCteScan(CteScan *node) -{ - return ExecCountSlotsNode(outerPlan(node)) + - ExecCountSlotsNode(innerPlan(node)) + - CTESCAN_NSLOTS; -} - /* ---------------------------------------------------------------- * ExecEndCteScan * diff --git a/src/backend/executor/nodeFunctionscan.c b/src/backend/executor/nodeFunctionscan.c index 6913e9c982..aafebe311d 100644 --- a/src/backend/executor/nodeFunctionscan.c +++ b/src/backend/executor/nodeFunctionscan.c @@ -134,8 +134,6 @@ ExecInitFunctionScan(FunctionScan *node, EState *estate, int eflags) */ ExecAssignExprContext(estate, &scanstate->ss.ps); -#define FUNCTIONSCAN_NSLOTS 2 - /* * tuple table initialization */ @@ -220,14 +218,6 @@ ExecInitFunctionScan(FunctionScan *node, EState *estate, int eflags) return scanstate; } -int -ExecCountSlotsFunctionScan(FunctionScan *node) -{ - return ExecCountSlotsNode(outerPlan(node)) + - ExecCountSlotsNode(innerPlan(node)) + - FUNCTIONSCAN_NSLOTS; -} - /* ---------------------------------------------------------------- * ExecEndFunctionScan * diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c index 1cac7b7aa6..73c62fb4c0 100644 --- a/src/backend/executor/nodeGroup.c +++ b/src/backend/executor/nodeGroup.c @@ -213,8 +213,6 @@ ExecInitGroup(Group *node, EState *estate, int eflags) */ ExecAssignExprContext(estate, &grpstate->ss.ps); -#define GROUP_NSLOTS 2 - /* * tuple table initialization */ @@ -259,12 +257,6 @@ ExecInitGroup(Group *node, EState *estate, int eflags) return grpstate; } -int -ExecCountSlotsGroup(Group *node) -{ - return ExecCountSlotsNode(outerPlan(node)) + GROUP_NSLOTS; -} - /* ------------------------ * ExecEndGroup(node) * diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c index 79a84da577..cc39598f64 100644 --- a/src/backend/executor/nodeHash.c +++ b/src/backend/executor/nodeHash.c @@ -170,8 +170,6 @@ ExecInitHash(Hash *node, EState *estate, int eflags) */ ExecAssignExprContext(estate, &hashstate->ps); -#define HASH_NSLOTS 1 - /* * initialize our result slot */ @@ -202,14 +200,6 @@ ExecInitHash(Hash *node, EState *estate, int eflags) return hashstate; } -int -ExecCountSlotsHash(Hash *node) -{ - return ExecCountSlotsNode(outerPlan(node)) + - ExecCountSlotsNode(innerPlan(node)) + - HASH_NSLOTS; -} - /* --------------------------------------------------------------- * ExecEndHash * diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c index b196923f26..e9067116a4 100644 --- a/src/backend/executor/nodeHashjoin.c +++ b/src/backend/executor/nodeHashjoin.c @@ -400,8 +400,6 @@ ExecInitHashJoin(HashJoin *node, EState *estate, int eflags) outerPlanState(hjstate) = ExecInitNode(outerNode, estate, eflags); innerPlanState(hjstate) = ExecInitNode((Plan *) hashNode, estate, eflags); -#define HASHJOIN_NSLOTS 3 - /* * tuple table initialization */ @@ -494,14 +492,6 @@ ExecInitHashJoin(HashJoin *node, EState *estate, int eflags) return hjstate; } -int -ExecCountSlotsHashJoin(HashJoin *node) -{ - return ExecCountSlotsNode(outerPlan(node)) + - ExecCountSlotsNode(innerPlan(node)) + - HASHJOIN_NSLOTS; -} - /* ---------------------------------------------------------------- * ExecEndHashJoin * diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index d8ec8b34f5..02e23e9416 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -537,8 +537,6 @@ ExecInitIndexScan(IndexScan *node, EState *estate, int eflags) ExecInitExpr((Expr *) node->indexqualorig, (PlanState *) indexstate); -#define INDEXSCAN_NSLOTS 2 - /* * tuple table initialization */ @@ -1074,10 +1072,3 @@ ExecIndexBuildScanKeys(PlanState *planstate, Relation index, Index scanrelid, else if (n_array_keys != 0) elog(ERROR, "ScalarArrayOpExpr index qual found where not allowed"); } - -int -ExecCountSlotsIndexScan(IndexScan *node) -{ - return ExecCountSlotsNode(outerPlan((Plan *) node)) + - ExecCountSlotsNode(innerPlan((Plan *) node)) + INDEXSCAN_NSLOTS; -} diff --git a/src/backend/executor/nodeLimit.c b/src/backend/executor/nodeLimit.c index 80a8dd8973..e594be8888 100644 --- a/src/backend/executor/nodeLimit.c +++ b/src/backend/executor/nodeLimit.c @@ -367,8 +367,6 @@ ExecInitLimit(Limit *node, EState *estate, int eflags) limitstate->limitCount = ExecInitExpr((Expr *) node->limitCount, (PlanState *) limitstate); -#define LIMIT_NSLOTS 1 - /* * Tuple table initialization (XXX not actually used...) */ @@ -390,14 +388,6 @@ ExecInitLimit(Limit *node, EState *estate, int eflags) return limitstate; } -int -ExecCountSlotsLimit(Limit *node) -{ - return ExecCountSlotsNode(outerPlan(node)) + - ExecCountSlotsNode(innerPlan(node)) + - LIMIT_NSLOTS; -} - /* ---------------------------------------------------------------- * ExecEndLimit * diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c index 446b400de5..74041e26c4 100644 --- a/src/backend/executor/nodeMaterial.c +++ b/src/backend/executor/nodeMaterial.c @@ -202,8 +202,6 @@ ExecInitMaterial(Material *node, EState *estate, int eflags) * ExecQual or ExecProject. */ -#define MATERIAL_NSLOTS 2 - /* * tuple table initialization * @@ -234,14 +232,6 @@ ExecInitMaterial(Material *node, EState *estate, int eflags) return matstate; } -int -ExecCountSlotsMaterial(Material *node) -{ - return ExecCountSlotsNode(outerPlan((Plan *) node)) + - ExecCountSlotsNode(innerPlan((Plan *) node)) + - MATERIAL_NSLOTS; -} - /* ---------------------------------------------------------------- * ExecEndMaterial * ---------------------------------------------------------------- diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index b6143e685e..b83cbbe297 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -1466,8 +1466,6 @@ ExecInitMergeJoin(MergeJoin *node, EState *estate, int eflags) else mergestate->mj_ExtraMarks = false; -#define MERGEJOIN_NSLOTS 4 - /* * tuple table initialization */ @@ -1566,14 +1564,6 @@ ExecInitMergeJoin(MergeJoin *node, EState *estate, int eflags) return mergestate; } -int -ExecCountSlotsMergeJoin(MergeJoin *node) -{ - return ExecCountSlotsNode(outerPlan((Plan *) node)) + - ExecCountSlotsNode(innerPlan((Plan *) node)) + - MERGEJOIN_NSLOTS; -} - /* ---------------------------------------------------------------- * ExecEndMergeJoin * diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c index 7a511ff5d7..e91ac4414f 100644 --- a/src/backend/executor/nodeNestloop.c +++ b/src/backend/executor/nodeNestloop.c @@ -318,8 +318,6 @@ ExecInitNestLoop(NestLoop *node, EState *estate, int eflags) innerPlanState(nlstate) = ExecInitNode(innerPlan(node), estate, eflags | EXEC_FLAG_REWIND); -#define NESTLOOP_NSLOTS 2 - /* * tuple table initialization */ @@ -360,14 +358,6 @@ ExecInitNestLoop(NestLoop *node, EState *estate, int eflags) return nlstate; } -int -ExecCountSlotsNestLoop(NestLoop *node) -{ - return ExecCountSlotsNode(outerPlan(node)) + - ExecCountSlotsNode(innerPlan(node)) + - NESTLOOP_NSLOTS; -} - /* ---------------------------------------------------------------- * ExecEndNestLoop * diff --git a/src/backend/executor/nodeRecursiveunion.c b/src/backend/executor/nodeRecursiveunion.c index 2096c4d20e..2ae081d7c2 100644 --- a/src/backend/executor/nodeRecursiveunion.c +++ b/src/backend/executor/nodeRecursiveunion.c @@ -231,8 +231,6 @@ ExecInitRecursiveUnion(RecursiveUnion *node, EState *estate, int eflags) */ Assert(node->plan.qual == NIL); -#define RECURSIVEUNION_NSLOTS 1 - /* * RecursiveUnion nodes still have Result slots, which hold pointers to * tuples, so we have to initialize them. @@ -269,14 +267,6 @@ ExecInitRecursiveUnion(RecursiveUnion *node, EState *estate, int eflags) return rustate; } -int -ExecCountSlotsRecursiveUnion(RecursiveUnion *node) -{ - return ExecCountSlotsNode(outerPlan(node)) + - ExecCountSlotsNode(innerPlan(node)) + - RECURSIVEUNION_NSLOTS; -} - /* ---------------------------------------------------------------- * ExecEndRecursiveUnionScan * diff --git a/src/backend/executor/nodeResult.c b/src/backend/executor/nodeResult.c index aa3d1a7bbf..fa387fe2ab 100644 --- a/src/backend/executor/nodeResult.c +++ b/src/backend/executor/nodeResult.c @@ -230,8 +230,6 @@ ExecInitResult(Result *node, EState *estate, int eflags) resstate->ps.ps_TupFromTlist = false; -#define RESULT_NSLOTS 1 - /* * tuple table initialization */ @@ -268,12 +266,6 @@ ExecInitResult(Result *node, EState *estate, int eflags) return resstate; } -int -ExecCountSlotsResult(Result *node) -{ - return ExecCountSlotsNode(outerPlan(node)) + RESULT_NSLOTS; -} - /* ---------------------------------------------------------------- * ExecEndResult * diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c index bdbdc97e98..02b8033660 100644 --- a/src/backend/executor/nodeSeqscan.c +++ b/src/backend/executor/nodeSeqscan.c @@ -203,8 +203,6 @@ ExecInitSeqScan(SeqScan *node, EState *estate, int eflags) ExecInitExpr((Expr *) node->plan.qual, (PlanState *) scanstate); -#define SEQSCAN_NSLOTS 2 - /* * tuple table initialization */ @@ -227,14 +225,6 @@ ExecInitSeqScan(SeqScan *node, EState *estate, int eflags) return scanstate; } -int -ExecCountSlotsSeqScan(SeqScan *node) -{ - return ExecCountSlotsNode(outerPlan(node)) + - ExecCountSlotsNode(innerPlan(node)) + - SEQSCAN_NSLOTS; -} - /* ---------------------------------------------------------------- * ExecEndSeqScan * diff --git a/src/backend/executor/nodeSetOp.c b/src/backend/executor/nodeSetOp.c index a35c582022..4a24df5ede 100644 --- a/src/backend/executor/nodeSetOp.c +++ b/src/backend/executor/nodeSetOp.c @@ -523,8 +523,6 @@ ExecInitSetOp(SetOp *node, EState *estate, int eflags) ALLOCSET_DEFAULT_INITSIZE, ALLOCSET_DEFAULT_MAXSIZE); -#define SETOP_NSLOTS 1 - /* * Tuple table initialization */ @@ -576,14 +574,6 @@ ExecInitSetOp(SetOp *node, EState *estate, int eflags) return setopstate; } -int -ExecCountSlotsSetOp(SetOp *node) -{ - return ExecCountSlotsNode(outerPlan(node)) + - ExecCountSlotsNode(innerPlan(node)) + - SETOP_NSLOTS; -} - /* ---------------------------------------------------------------- * ExecEndSetOp * diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c index 5ef1b3e779..f95f74b35f 100644 --- a/src/backend/executor/nodeSort.c +++ b/src/backend/executor/nodeSort.c @@ -182,8 +182,6 @@ ExecInitSort(Sort *node, EState *estate, int eflags) * ExecQual or ExecProject. */ -#define SORT_NSLOTS 2 - /* * tuple table initialization * @@ -216,14 +214,6 @@ ExecInitSort(Sort *node, EState *estate, int eflags) return sortstate; } -int -ExecCountSlotsSort(Sort *node) -{ - return ExecCountSlotsNode(outerPlan((Plan *) node)) + - ExecCountSlotsNode(innerPlan((Plan *) node)) + - SORT_NSLOTS; -} - /* ---------------------------------------------------------------- * ExecEndSort(node) * ---------------------------------------------------------------- diff --git a/src/backend/executor/nodeSubqueryscan.c b/src/backend/executor/nodeSubqueryscan.c index 9c6abc4934..8a9e5eaacb 100644 --- a/src/backend/executor/nodeSubqueryscan.c +++ b/src/backend/executor/nodeSubqueryscan.c @@ -129,8 +129,6 @@ ExecInitSubqueryScan(SubqueryScan *node, EState *estate, int eflags) ExecInitExpr((Expr *) node->scan.plan.qual, (PlanState *) subquerystate); -#define SUBQUERYSCAN_NSLOTS 2 - /* * tuple table initialization */ @@ -159,15 +157,6 @@ ExecInitSubqueryScan(SubqueryScan *node, EState *estate, int eflags) return subquerystate; } -int -ExecCountSlotsSubqueryScan(SubqueryScan *node) -{ - Assert(outerPlan(node) == NULL); - Assert(innerPlan(node) == NULL); - return ExecCountSlotsNode(node->subplan) + - SUBQUERYSCAN_NSLOTS; -} - /* ---------------------------------------------------------------- * ExecEndSubqueryScan * diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c index 6f1c17c86e..b91480533c 100644 --- a/src/backend/executor/nodeTidscan.c +++ b/src/backend/executor/nodeTidscan.c @@ -548,8 +548,6 @@ ExecInitTidScan(TidScan *node, EState *estate, int eflags) ExecInitExpr((Expr *) node->tidquals, (PlanState *) tidstate); -#define TIDSCAN_NSLOTS 2 - /* * tuple table initialization */ @@ -587,10 +585,3 @@ ExecInitTidScan(TidScan *node, EState *estate, int eflags) */ return tidstate; } - -int -ExecCountSlotsTidScan(TidScan *node) -{ - return ExecCountSlotsNode(outerPlan((Plan *) node)) + - ExecCountSlotsNode(innerPlan((Plan *) node)) + TIDSCAN_NSLOTS; -} diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c index 41ba4b1293..733d85ee75 100644 --- a/src/backend/executor/nodeUnique.c +++ b/src/backend/executor/nodeUnique.c @@ -137,8 +137,6 @@ ExecInitUnique(Unique *node, EState *estate, int eflags) ALLOCSET_DEFAULT_INITSIZE, ALLOCSET_DEFAULT_MAXSIZE); -#define UNIQUE_NSLOTS 1 - /* * Tuple table initialization */ @@ -166,14 +164,6 @@ ExecInitUnique(Unique *node, EState *estate, int eflags) return uniquestate; } -int -ExecCountSlotsUnique(Unique *node) -{ - return ExecCountSlotsNode(outerPlan(node)) + - ExecCountSlotsNode(innerPlan(node)) + - UNIQUE_NSLOTS; -} - /* ---------------------------------------------------------------- * ExecEndUnique * diff --git a/src/backend/executor/nodeValuesscan.c b/src/backend/executor/nodeValuesscan.c index 8cf89b4bc0..878f2b0d10 100644 --- a/src/backend/executor/nodeValuesscan.c +++ b/src/backend/executor/nodeValuesscan.c @@ -213,8 +213,6 @@ ExecInitValuesScan(ValuesScan *node, EState *estate, int eflags) scanstate->rowcontext = planstate->ps_ExprContext; ExecAssignExprContext(estate, planstate); -#define VALUESSCAN_NSLOTS 2 - /* * tuple table initialization */ @@ -265,14 +263,6 @@ ExecInitValuesScan(ValuesScan *node, EState *estate, int eflags) return scanstate; } -int -ExecCountSlotsValuesScan(ValuesScan *node) -{ - return ExecCountSlotsNode(outerPlan(node)) + - ExecCountSlotsNode(innerPlan(node)) + - VALUESSCAN_NSLOTS; -} - /* ---------------------------------------------------------------- * ExecEndValuesScan * diff --git a/src/backend/executor/nodeWindowAgg.c b/src/backend/executor/nodeWindowAgg.c index 6674f67ac0..3a04f93659 100644 --- a/src/backend/executor/nodeWindowAgg.c +++ b/src/backend/executor/nodeWindowAgg.c @@ -1107,8 +1107,6 @@ ExecInitWindowAgg(WindowAgg *node, EState *estate, int eflags) ALLOCSET_DEFAULT_INITSIZE, ALLOCSET_DEFAULT_MAXSIZE); -#define WINDOWAGG_NSLOTS 6 - /* * tuple table initialization */ @@ -1273,18 +1271,6 @@ ExecInitWindowAgg(WindowAgg *node, EState *estate, int eflags) } /* ----------------- - * ExecCountSlotsWindowAgg - * ----------------- - */ -int -ExecCountSlotsWindowAgg(WindowAgg *node) -{ - return ExecCountSlotsNode(outerPlan(node)) + - ExecCountSlotsNode(innerPlan(node)) + - WINDOWAGG_NSLOTS; -} - -/* ----------------- * ExecEndWindowAgg * ----------------- */ diff --git a/src/backend/executor/nodeWorktablescan.c b/src/backend/executor/nodeWorktablescan.c index 22f060c238..ff0cce4252 100644 --- a/src/backend/executor/nodeWorktablescan.c +++ b/src/backend/executor/nodeWorktablescan.c @@ -156,8 +156,6 @@ ExecInitWorkTableScan(WorkTableScan *node, EState *estate, int eflags) ExecInitExpr((Expr *) node->scan.plan.qual, (PlanState *) scanstate); -#define WORKTABLESCAN_NSLOTS 2 - /* * tuple table initialization */ @@ -174,14 +172,6 @@ ExecInitWorkTableScan(WorkTableScan *node, EState *estate, int eflags) return scanstate; } -int -ExecCountSlotsWorkTableScan(WorkTableScan *node) -{ - return ExecCountSlotsNode(outerPlan(node)) + - ExecCountSlotsNode(innerPlan(node)) + - WORKTABLESCAN_NSLOTS; -} - /* ---------------------------------------------------------------- * ExecEndWorkTableScan * diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index bdd19badb1..ef95a6ec4d 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -177,7 +177,6 @@ extern DestReceiver *CreateIntoRelDestReceiver(void); extern PlanState *ExecInitNode(Plan *node, EState *estate, int eflags); extern TupleTableSlot *ExecProcNode(PlanState *node); extern Node *MultiExecProcNode(PlanState *node); -extern int ExecCountSlotsNode(Plan *node); extern void ExecEndNode(PlanState *node); /* diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h index dda700a2f6..bda7aefb7f 100644 --- a/src/include/executor/nodeAgg.h +++ b/src/include/executor/nodeAgg.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsAgg(Agg *node); extern AggState *ExecInitAgg(Agg *node, EState *estate, int eflags); extern TupleTableSlot *ExecAgg(AggState *node); extern void ExecEndAgg(AggState *node); diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h index 4715724068..c4b633591b 100644 --- a/src/include/executor/nodeAppend.h +++ b/src/include/executor/nodeAppend.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsAppend(Append *node); extern AppendState *ExecInitAppend(Append *node, EState *estate, int eflags); extern TupleTableSlot *ExecAppend(AppendState *node); extern void ExecEndAppend(AppendState *node); diff --git a/src/include/executor/nodeBitmapAnd.h b/src/include/executor/nodeBitmapAnd.h index a3545bd959..a2d9a658a1 100644 --- a/src/include/executor/nodeBitmapAnd.h +++ b/src/include/executor/nodeBitmapAnd.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsBitmapAnd(BitmapAnd *node); extern BitmapAndState *ExecInitBitmapAnd(BitmapAnd *node, EState *estate, int eflags); extern Node *MultiExecBitmapAnd(BitmapAndState *node); extern void ExecEndBitmapAnd(BitmapAndState *node); diff --git a/src/include/executor/nodeBitmapHeapscan.h b/src/include/executor/nodeBitmapHeapscan.h index ce81c6b9cc..5fd3c6a333 100644 --- a/src/include/executor/nodeBitmapHeapscan.h +++ b/src/include/executor/nodeBitmapHeapscan.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsBitmapHeapScan(BitmapHeapScan *node); extern BitmapHeapScanState *ExecInitBitmapHeapScan(BitmapHeapScan *node, EState *estate, int eflags); extern TupleTableSlot *ExecBitmapHeapScan(BitmapHeapScanState *node); extern void ExecEndBitmapHeapScan(BitmapHeapScanState *node); diff --git a/src/include/executor/nodeBitmapIndexscan.h b/src/include/executor/nodeBitmapIndexscan.h index 093e4a7417..7a21ea2417 100644 --- a/src/include/executor/nodeBitmapIndexscan.h +++ b/src/include/executor/nodeBitmapIndexscan.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsBitmapIndexScan(BitmapIndexScan *node); extern BitmapIndexScanState *ExecInitBitmapIndexScan(BitmapIndexScan *node, EState *estate, int eflags); extern Node *MultiExecBitmapIndexScan(BitmapIndexScanState *node); extern void ExecEndBitmapIndexScan(BitmapIndexScanState *node); diff --git a/src/include/executor/nodeBitmapOr.h b/src/include/executor/nodeBitmapOr.h index 089fe7a110..392f648a5b 100644 --- a/src/include/executor/nodeBitmapOr.h +++ b/src/include/executor/nodeBitmapOr.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsBitmapOr(BitmapOr *node); extern BitmapOrState *ExecInitBitmapOr(BitmapOr *node, EState *estate, int eflags); extern Node *MultiExecBitmapOr(BitmapOrState *node); extern void ExecEndBitmapOr(BitmapOrState *node); diff --git a/src/include/executor/nodeCtescan.h b/src/include/executor/nodeCtescan.h index 47b02ced41..628fd067c4 100644 --- a/src/include/executor/nodeCtescan.h +++ b/src/include/executor/nodeCtescan.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsCteScan(CteScan *node); extern CteScanState *ExecInitCteScan(CteScan *node, EState *estate, int eflags); extern TupleTableSlot *ExecCteScan(CteScanState *node); extern void ExecEndCteScan(CteScanState *node); diff --git a/src/include/executor/nodeFunctionscan.h b/src/include/executor/nodeFunctionscan.h index 8f6b8fe767..bf2bae69c9 100644 --- a/src/include/executor/nodeFunctionscan.h +++ b/src/include/executor/nodeFunctionscan.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsFunctionScan(FunctionScan *node); extern FunctionScanState *ExecInitFunctionScan(FunctionScan *node, EState *estate, int eflags); extern TupleTableSlot *ExecFunctionScan(FunctionScanState *node); extern void ExecEndFunctionScan(FunctionScanState *node); diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h index 5d362bef11..2f37e2f790 100644 --- a/src/include/executor/nodeGroup.h +++ b/src/include/executor/nodeGroup.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsGroup(Group *node); extern GroupState *ExecInitGroup(Group *node, EState *estate, int eflags); extern TupleTableSlot *ExecGroup(GroupState *node); extern void ExecEndGroup(GroupState *node); diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h index 7df9f187f1..421a88a253 100644 --- a/src/include/executor/nodeHash.h +++ b/src/include/executor/nodeHash.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsHash(Hash *node); extern HashState *ExecInitHash(Hash *node, EState *estate, int eflags); extern TupleTableSlot *ExecHash(HashState *node); extern Node *MultiExecHash(HashState *node); diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h index 0669bbca39..5d5c6d55b4 100644 --- a/src/include/executor/nodeHashjoin.h +++ b/src/include/executor/nodeHashjoin.h @@ -17,7 +17,6 @@ #include "nodes/execnodes.h" #include "storage/buffile.h" -extern int ExecCountSlotsHashJoin(HashJoin *node); extern HashJoinState *ExecInitHashJoin(HashJoin *node, EState *estate, int eflags); extern TupleTableSlot *ExecHashJoin(HashJoinState *node); extern void ExecEndHashJoin(HashJoinState *node); diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h index 5441dad9cd..581cce1143 100644 --- a/src/include/executor/nodeIndexscan.h +++ b/src/include/executor/nodeIndexscan.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsIndexScan(IndexScan *node); extern IndexScanState *ExecInitIndexScan(IndexScan *node, EState *estate, int eflags); extern TupleTableSlot *ExecIndexScan(IndexScanState *node); extern void ExecEndIndexScan(IndexScanState *node); diff --git a/src/include/executor/nodeLimit.h b/src/include/executor/nodeLimit.h index 3bbfa3ebfb..1479a789ed 100644 --- a/src/include/executor/nodeLimit.h +++ b/src/include/executor/nodeLimit.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsLimit(Limit *node); extern LimitState *ExecInitLimit(Limit *node, EState *estate, int eflags); extern TupleTableSlot *ExecLimit(LimitState *node); extern void ExecEndLimit(LimitState *node); diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h index c6feb68b13..38eb8bd0a6 100644 --- a/src/include/executor/nodeMaterial.h +++ b/src/include/executor/nodeMaterial.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsMaterial(Material *node); extern MaterialState *ExecInitMaterial(Material *node, EState *estate, int eflags); extern TupleTableSlot *ExecMaterial(MaterialState *node); extern void ExecEndMaterial(MaterialState *node); diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h index c41e55d3f5..1793852ad2 100644 --- a/src/include/executor/nodeMergejoin.h +++ b/src/include/executor/nodeMergejoin.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsMergeJoin(MergeJoin *node); extern MergeJoinState *ExecInitMergeJoin(MergeJoin *node, EState *estate, int eflags); extern TupleTableSlot *ExecMergeJoin(MergeJoinState *node); extern void ExecEndMergeJoin(MergeJoinState *node); diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h index 6565cec48b..bad52f949a 100644 --- a/src/include/executor/nodeNestloop.h +++ b/src/include/executor/nodeNestloop.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsNestLoop(NestLoop *node); extern NestLoopState *ExecInitNestLoop(NestLoop *node, EState *estate, int eflags); extern TupleTableSlot *ExecNestLoop(NestLoopState *node); extern void ExecEndNestLoop(NestLoopState *node); diff --git a/src/include/executor/nodeRecursiveunion.h b/src/include/executor/nodeRecursiveunion.h index 4deb08196c..a983608734 100644 --- a/src/include/executor/nodeRecursiveunion.h +++ b/src/include/executor/nodeRecursiveunion.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsRecursiveUnion(RecursiveUnion *node); extern RecursiveUnionState *ExecInitRecursiveUnion(RecursiveUnion *node, EState *estate, int eflags); extern TupleTableSlot *ExecRecursiveUnion(RecursiveUnionState *node); extern void ExecEndRecursiveUnion(RecursiveUnionState *node); diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h index 2aa94a74e3..d6dfc7665f 100644 --- a/src/include/executor/nodeResult.h +++ b/src/include/executor/nodeResult.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsResult(Result *node); extern ResultState *ExecInitResult(Result *node, EState *estate, int eflags); extern TupleTableSlot *ExecResult(ResultState *node); extern void ExecEndResult(ResultState *node); diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h index fec0e62da3..60a796693b 100644 --- a/src/include/executor/nodeSeqscan.h +++ b/src/include/executor/nodeSeqscan.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsSeqScan(SeqScan *node); extern SeqScanState *ExecInitSeqScan(SeqScan *node, EState *estate, int eflags); extern TupleTableSlot *ExecSeqScan(SeqScanState *node); extern void ExecEndSeqScan(SeqScanState *node); diff --git a/src/include/executor/nodeSetOp.h b/src/include/executor/nodeSetOp.h index 18bf0094ac..cef34dd9fa 100644 --- a/src/include/executor/nodeSetOp.h +++ b/src/include/executor/nodeSetOp.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsSetOp(SetOp *node); extern SetOpState *ExecInitSetOp(SetOp *node, EState *estate, int eflags); extern TupleTableSlot *ExecSetOp(SetOpState *node); extern void ExecEndSetOp(SetOpState *node); diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h index 6c96d33114..102e89086c 100644 --- a/src/include/executor/nodeSort.h +++ b/src/include/executor/nodeSort.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsSort(Sort *node); extern SortState *ExecInitSort(Sort *node, EState *estate, int eflags); extern TupleTableSlot *ExecSort(SortState *node); extern void ExecEndSort(SortState *node); diff --git a/src/include/executor/nodeSubqueryscan.h b/src/include/executor/nodeSubqueryscan.h index 25bee0980c..3e838dacc3 100644 --- a/src/include/executor/nodeSubqueryscan.h +++ b/src/include/executor/nodeSubqueryscan.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsSubqueryScan(SubqueryScan *node); extern SubqueryScanState *ExecInitSubqueryScan(SubqueryScan *node, EState *estate, int eflags); extern TupleTableSlot *ExecSubqueryScan(SubqueryScanState *node); extern void ExecEndSubqueryScan(SubqueryScanState *node); diff --git a/src/include/executor/nodeTidscan.h b/src/include/executor/nodeTidscan.h index 476ed5ddd9..d2899c10c5 100644 --- a/src/include/executor/nodeTidscan.h +++ b/src/include/executor/nodeTidscan.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsTidScan(TidScan *node); extern TidScanState *ExecInitTidScan(TidScan *node, EState *estate, int eflags); extern TupleTableSlot *ExecTidScan(TidScanState *node); extern void ExecEndTidScan(TidScanState *node); diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h index bec791adc7..5c1c8d547d 100644 --- a/src/include/executor/nodeUnique.h +++ b/src/include/executor/nodeUnique.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsUnique(Unique *node); extern UniqueState *ExecInitUnique(Unique *node, EState *estate, int eflags); extern TupleTableSlot *ExecUnique(UniqueState *node); extern void ExecEndUnique(UniqueState *node); diff --git a/src/include/executor/nodeValuesscan.h b/src/include/executor/nodeValuesscan.h index f5e4534dd3..9ecffb672f 100644 --- a/src/include/executor/nodeValuesscan.h +++ b/src/include/executor/nodeValuesscan.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsValuesScan(ValuesScan *node); extern ValuesScanState *ExecInitValuesScan(ValuesScan *node, EState *estate, int eflags); extern TupleTableSlot *ExecValuesScan(ValuesScanState *node); extern void ExecEndValuesScan(ValuesScanState *node); diff --git a/src/include/executor/nodeWindowAgg.h b/src/include/executor/nodeWindowAgg.h index 457bd682b4..ef671a1f2f 100644 --- a/src/include/executor/nodeWindowAgg.h +++ b/src/include/executor/nodeWindowAgg.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsWindowAgg(WindowAgg *node); extern WindowAggState *ExecInitWindowAgg(WindowAgg *node, EState *estate, int eflags); extern TupleTableSlot *ExecWindowAgg(WindowAggState *node); extern void ExecEndWindowAgg(WindowAggState *node); diff --git a/src/include/executor/nodeWorktablescan.h b/src/include/executor/nodeWorktablescan.h index 96d297f001..9007a491ed 100644 --- a/src/include/executor/nodeWorktablescan.h +++ b/src/include/executor/nodeWorktablescan.h @@ -16,7 +16,6 @@ #include "nodes/execnodes.h" -extern int ExecCountSlotsWorkTableScan(WorkTableScan *node); extern WorkTableScanState *ExecInitWorkTableScan(WorkTableScan *node, EState *estate, int eflags); extern TupleTableSlot *ExecWorkTableScan(WorkTableScanState *node); extern void ExecEndWorkTableScan(WorkTableScanState *node); |