diff options
Diffstat (limited to 'src/backend/rewrite')
| -rw-r--r-- | src/backend/rewrite/rewriteDefine.c | 26 | ||||
| -rw-r--r-- | src/backend/rewrite/rewriteSupport.c | 9 |
2 files changed, 7 insertions, 28 deletions
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c index 577ce2bd52..80952d7ddc 100644 --- a/src/backend/rewrite/rewriteDefine.c +++ b/src/backend/rewrite/rewriteDefine.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.76 2002/08/02 18:15:07 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.77 2002/08/05 03:29:17 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -95,16 +95,7 @@ InsertRule(char *rulname, rewriteObjectId = simple_heap_insert(pg_rewrite_desc, tup); - if (RelationGetForm(pg_rewrite_desc)->relhasindex) - { - Relation idescs[Num_pg_rewrite_indices]; - - CatalogOpenIndices(Num_pg_rewrite_indices, Name_pg_rewrite_indices, - idescs); - CatalogIndexInsert(idescs, Num_pg_rewrite_indices, pg_rewrite_desc, - tup); - CatalogCloseIndices(Num_pg_rewrite_indices, idescs); - } + CatalogUpdateIndexes(pg_rewrite_desc, tup); heap_freetuple(tup); @@ -486,17 +477,8 @@ RenameRewriteRule(Oid owningRel, const char *oldName, simple_heap_update(pg_rewrite_desc, &ruletup->t_self, ruletup); - /* keep system catalog indices current */ - if (RelationGetForm(pg_rewrite_desc)->relhasindex) - { - Relation idescs[Num_pg_rewrite_indices]; - - CatalogOpenIndices(Num_pg_rewrite_indices, Name_pg_rewrite_indices, - idescs); - CatalogIndexInsert(idescs, Num_pg_rewrite_indices, pg_rewrite_desc, - ruletup); - CatalogCloseIndices(Num_pg_rewrite_indices, idescs); - } + /* keep system catalog indexes current */ + CatalogUpdateIndexes(pg_rewrite_desc, ruletup); heap_freetuple(ruletup); heap_close(pg_rewrite_desc, RowExclusiveLock); diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c index 3f4c7f2387..e55ceb8348 100644 --- a/src/backend/rewrite/rewriteSupport.c +++ b/src/backend/rewrite/rewriteSupport.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.53 2002/07/12 18:43:17 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.54 2002/08/05 03:29:17 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -55,7 +55,6 @@ SetRelationRuleStatus(Oid relationId, bool relHasRules, Relation relationRelation; HeapTuple tuple; Form_pg_class classForm; - Relation idescs[Num_pg_class_indices]; /* * Find the tuple to update in pg_class, using syscache for the @@ -79,10 +78,8 @@ SetRelationRuleStatus(Oid relationId, bool relHasRules, simple_heap_update(relationRelation, &tuple->t_self, tuple); - /* Keep the catalog indices up to date */ - CatalogOpenIndices(Num_pg_class_indices, Name_pg_class_indices, idescs); - CatalogIndexInsert(idescs, Num_pg_class_indices, relationRelation, tuple); - CatalogCloseIndices(Num_pg_class_indices, idescs); + /* Keep the catalog indexes up to date */ + CatalogUpdateIndexes(relationRelation, tuple); } else { |