diff options
Diffstat (limited to 'src/backend/access/index')
| -rw-r--r-- | src/backend/access/index/genam.c | 14 | ||||
| -rw-r--r-- | src/backend/access/index/istrat.c | 12 |
2 files changed, 2 insertions, 24 deletions
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c index 7fc9607b44..229ca5d1a2 100644 --- a/src/backend/access/index/genam.c +++ b/src/backend/access/index/genam.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.11 1998/01/07 21:01:35 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.12 1998/06/15 19:27:53 momjian Exp $ * * NOTES * many of the old access method routines have been turned into @@ -117,13 +117,9 @@ RelationGetIndexScan(Relation relation, ItemPointerSetInvalid(&scan->nextMarkData); if (numberOfKeys > 0) - { scan->keyData = (ScanKey) palloc(sizeof(ScanKeyData) * numberOfKeys); - } else - { scan->keyData = NULL; - } index_rescan(scan, scanFromEnd, key); @@ -224,13 +220,9 @@ IndexScanMarkPosition(IndexScanDesc scan) index_getnext(scan, BackwardScanDirection); if (result != NULL) - { scan->previousItemData = result->index_iptr; - } else - { ItemPointerSetInvalid(&scan->previousItemData); - } } else if (scan->flags & ScanUncheckedNext) @@ -239,13 +231,9 @@ IndexScanMarkPosition(IndexScanDesc scan) index_getnext(scan, ForwardScanDirection); if (result != NULL) - { scan->nextItemData = result->index_iptr; - } else - { ItemPointerSetInvalid(&scan->nextItemData); - } } scan->previousMarkData = scan->previousItemData; diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c index d7953a1cd8..b0b0cdc452 100644 --- a/src/backend/access/index/istrat.c +++ b/src/backend/access/index/istrat.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.19 1998/04/27 04:04:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.20 1998/06/15 19:27:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -309,9 +309,7 @@ RelationGetStrategy(Relation relation, for (index = 0; index < evaluation->maxStrategy; index += 1) { if (strategyMap->entry[index].sk_procedure == procedure) - { break; - } } if (index == evaluation->maxStrategy) @@ -347,9 +345,7 @@ RelationGetStrategy(Relation relation, if (!StrategyNumberIsInBounds(strategy, evaluation->maxStrategy)) { if (!StrategyNumberIsValid(strategy)) - { elog(ERROR, "RelationGetStrategy: corrupted evaluation"); - } } return strategy; @@ -465,9 +461,7 @@ RelationInvokeStrategy(Relation relation, (*termP)->operatorData[index].strategy); if (!RegProcedureIsValid(entry->sk_procedure)) - { break; - } } if (index == (*termP)->degree) @@ -582,9 +576,7 @@ IndexSupportInitialize(IndexStrategy indexStrategy, if (!OidIsValid(iform->indkey[attributeIndex])) { if (attributeIndex == 0) - { elog(ERROR, "IndexSupportInitialize: no pg_index tuple"); - } break; } @@ -621,9 +613,7 @@ IndexSupportInitialize(IndexStrategy indexStrategy, loc = &indexSupport[((attributeNumber - 1) * maxSupportNumber)]; for (support = maxSupportNumber; --support >= 0;) - { loc[support] = InvalidOid; - } entry[1].sk_argument = ObjectIdGetDatum(operatorClassObjectId[attributeNumber - 1]); |
