diff options
Diffstat (limited to 'src/backend/executor')
| -rw-r--r-- | src/backend/executor/execProcnode.c | 4 | ||||
| -rw-r--r-- | src/backend/executor/nodeIndexscan.c | 34 | ||||
| -rw-r--r-- | src/backend/executor/nodeNestloop.c | 6 |
3 files changed, 28 insertions, 16 deletions
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c index 07b894843da..8c9970a6fa7 100644 --- a/src/backend/executor/execProcnode.c +++ b/src/backend/executor/execProcnode.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.18 2000/01/26 05:56:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.19 2000/08/13 02:50:03 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -277,7 +277,7 @@ ExecProcNode(Plan *node, Plan *parent) * ---------------- */ case T_NestLoop: - result = ExecNestLoop((NestLoop *) node, parent); + result = ExecNestLoop((NestLoop *) node); break; case T_MergeJoin: diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index 0eb3b9f5ae9..57770d24058 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.52 2000/07/12 02:37:03 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.53 2000/08/13 02:50:03 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -281,6 +281,16 @@ IndexNext(IndexScan *node) TupleTableSlot * ExecIndexScan(IndexScan *node) { + IndexScanState *indexstate = node->indxstate; + + /* ---------------- + * If we have runtime keys and they've not already been set up, + * do it now. + * ---------------- + */ + if (indexstate->iss_RuntimeKeyInfo && !indexstate->iss_RuntimeKeysReady) + ExecReScan((Plan *) node, NULL, NULL); + /* ---------------- * use IndexNext as access method * ---------------- @@ -335,9 +345,10 @@ ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent) scanKeys = indexstate->iss_ScanKeys; runtimeKeyInfo = indexstate->iss_RuntimeKeyInfo; numScanKeys = indexstate->iss_NumScanKeys; - indexstate->iss_IndexPtr = -1; if (ScanDirectionIsBackward(node->indxorderdir)) indexstate->iss_IndexPtr = numIndices; + else + indexstate->iss_IndexPtr = -1; if (econtext) { @@ -420,6 +431,9 @@ ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent) skey = scanKeys[i]; index_rescan(scan, direction, skey); } + + if (runtimeKeyInfo) + indexstate->iss_RuntimeKeysReady = true; } /* ---------------------------------------------------------------- @@ -603,7 +617,6 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent) Relation currentRelation; HeapScanDesc currentScanDesc; ScanDirection direction; - List *execParam = NIL; /* ---------------- * assign execution state to node @@ -656,6 +669,7 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent) indexstate->iss_NumScanKeys = NULL; indexstate->iss_RuntimeKeyInfo = NULL; indexstate->iss_RuntimeContext = NULL; + indexstate->iss_RuntimeKeysReady = false; indexstate->iss_RelationDescs = NULL; indexstate->iss_ScanDescs = NULL; @@ -787,6 +801,9 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent) */ leftop = (Node *) get_leftop(clause); + if (leftop && IsA(leftop, RelabelType)) + leftop = ((RelabelType *) leftop)->arg; + Assert(leftop != NULL); if (IsA(leftop, Var) && var_is_rel((Var *) leftop)) @@ -827,7 +844,6 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent) /* treat Param as runtime key */ have_runtime_keys = true; run_keys[j] = LEFT_OP; - execParam = lappendi(execParam, ((Param *) leftop)->paramid); } else { @@ -857,6 +873,9 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent) */ rightop = (Node *) get_rightop(clause); + if (rightop && IsA(rightop, RelabelType)) + rightop = ((RelabelType *) rightop)->arg; + Assert(rightop != NULL); if (IsA(rightop, Var) && var_is_rel((Var *) rightop)) @@ -906,7 +925,6 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent) /* treat Param as runtime key */ have_runtime_keys = true; run_keys[j] = RIGHT_OP; - execParam = lappendi(execParam, ((Param *) rightop)->paramid); } else { @@ -1068,12 +1086,6 @@ ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent) indexstate->iss_RelationDescs = relationDescs; indexstate->iss_ScanDescs = scanDescs; - /* - * if there are some PARAM_EXEC in scankeys then force index rescan on - * first scan. - */ - ((Plan *) node)->chgParam = execParam; - /* ---------------- * all done. * ---------------- diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c index 70b98a97e3a..f59c1b0f602 100644 --- a/src/backend/executor/nodeNestloop.c +++ b/src/backend/executor/nodeNestloop.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.18 2000/07/17 03:04:53 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.19 2000/08/13 02:50:03 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -57,7 +57,7 @@ * ---------------------------------------------------------------- */ TupleTableSlot * -ExecNestLoop(NestLoop *node, Plan *parent) +ExecNestLoop(NestLoop *node) { NestLoopState *nlstate; Plan *innerPlan; @@ -187,7 +187,7 @@ ExecNestLoop(NestLoop *node, Plan *parent) * outer tuple (e.g. in index scans), that's why we pass our * expr context. */ - ExecReScan(innerPlan, econtext, parent); + ExecReScan(innerPlan, econtext, (Plan *) node); ENL1_printf("getting new inner tuple"); |