diff options
Diffstat (limited to 'src/backend/executor')
| -rw-r--r-- | src/backend/executor/nodeBitmapIndexscan.c | 18 | ||||
| -rw-r--r-- | src/backend/executor/nodeIndexscan.c | 18 |
2 files changed, 28 insertions, 8 deletions
diff --git a/src/backend/executor/nodeBitmapIndexscan.c b/src/backend/executor/nodeBitmapIndexscan.c index d3fbf348332..6c14b8a4130 100644 --- a/src/backend/executor/nodeBitmapIndexscan.c +++ b/src/backend/executor/nodeBitmapIndexscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeBitmapIndexscan.c,v 1.22 2007/01/05 22:19:28 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeBitmapIndexscan.c,v 1.23 2007/05/25 17:54:25 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -198,10 +198,12 @@ ExecEndBitmapIndexScan(BitmapIndexScanState *node) #endif /* - * close the index relation + * close the index relation (no-op if we didn't open it) */ - index_endscan(indexScanDesc); - index_close(indexRelationDesc, NoLock); + if (indexScanDesc) + index_endscan(indexScanDesc); + if (indexRelationDesc) + index_close(indexRelationDesc, NoLock); } /* ---------------------------------------------------------------- @@ -257,6 +259,14 @@ ExecInitBitmapIndexScan(BitmapIndexScan *node, EState *estate, int eflags) indexstate->ss.ss_currentScanDesc = NULL; /* + * If we are just doing EXPLAIN (ie, aren't going to run the plan), + * stop here. This allows an index-advisor plugin to EXPLAIN a plan + * containing references to nonexistent indexes. + */ + if (eflags & EXEC_FLAG_EXPLAIN_ONLY) + return indexstate; + + /* * Open the index relation. * * If the parent table is one of the target relations of the query, then diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index d9136de0035..8c22e3ade0e 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeIndexscan.c,v 1.121 2007/04/06 22:33:42 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeIndexscan.c,v 1.122 2007/05/25 17:54:25 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -415,10 +415,12 @@ ExecEndIndexScan(IndexScanState *node) ExecClearTuple(node->ss.ss_ScanTupleSlot); /* - * close the index relation + * close the index relation (no-op if we didn't open it) */ - index_endscan(indexScanDesc); - index_close(indexRelationDesc, NoLock); + if (indexScanDesc) + index_endscan(indexScanDesc); + if (indexRelationDesc) + index_close(indexRelationDesc, NoLock); /* * close the heap relation. @@ -521,6 +523,14 @@ ExecInitIndexScan(IndexScan *node, EState *estate, int eflags) ExecAssignScanType(&indexstate->ss, RelationGetDescr(currentRelation)); /* + * If we are just doing EXPLAIN (ie, aren't going to run the plan), + * stop here. This allows an index-advisor plugin to EXPLAIN a plan + * containing references to nonexistent indexes. + */ + if (eflags & EXEC_FLAG_EXPLAIN_ONLY) + return indexstate; + + /* * Open the index relation. * * If the parent table is one of the target relations of the query, then |