diff options
Diffstat (limited to 'src/backend/executor')
| -rw-r--r-- | src/backend/executor/execUtils.c | 7 | ||||
| -rw-r--r-- | src/backend/executor/nodeIndexscan.c | 8 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index 9c815f84cda..4aa3170daa6 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.103 2003/08/08 21:41:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.104 2003/09/24 18:54:01 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -647,12 +647,9 @@ ExecOpenIndices(ResultRelInfo *resultRelInfo) resultRelInfo->ri_NumIndices = 0; - /* checks for disabled indexes */ + /* fast path if no indexes */ if (!RelationGetForm(resultRelation)->relhasindex) return; - if (IsIgnoringSystemIndexes() && - IsSystemRelation(resultRelation)) - return; /* * Get cached list of index OIDs diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index f93802269da..6ab2f0a47bd 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.83 2003/08/22 20:26:43 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.84 2003/09/24 18:54:01 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -964,12 +964,6 @@ ExecInitIndexScan(IndexScan *node, EState *estate) currentRelation = heap_open(reloid, AccessShareLock); - if (!RelationGetForm(currentRelation)->relhasindex) - ereport(ERROR, - (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), - errmsg("indexes of relation %u were deactivated", - reloid))); - indexstate->ss.ss_currentRelation = currentRelation; indexstate->ss.ss_currentScanDesc = NULL; /* no heap scan here */ |