NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit2f5c9d9

committed

Tweak catalog indexing abstraction for upcoming WARM

Split the existing CatalogUpdateIndexes into two different routines,CatalogTupleInsert and CatalogTupleUpdate, which do both the heapinsert/update plus the index update. This removes over 300 lines ofboilerplate code all over src/backend/catalog/ and src/backend/commands.The resulting code is much more pleasing to the eye.Also, by encapsulating what happens in detail during an UPDATE, thisfacilitates the upcoming WARM patch, which is going to add a few morelines to the update case making the boilerplate even more boring.The original CatalogUpdateIndexes is removed; there was only one useleft, and since it's just three lines, we can as well expand it in placethere. We could keep it, but WARM is going to break all the UPDATEout-of-core callsites anyway, so there seems to be no benefit in doingso.Author: Pavan DeolaseeDiscussion:https://www.postgr.es/m/CABOikdOcFYSZ4vA2gYfs=M2cdXzXX4qGHeEiW3fu9PCfkHLa2A@mail.gmail.com

1 parente2090d9 commit2f5c9d9Copy full SHA for 2f5c9d9

File tree

52 files changed

+256

-594

lines changed

src
- backend
  - catalog
  - commands
  - replication/logical
    - origin.c
  - rewrite
    - rewriteDefine.c
    - rewriteSupport.c
  - storage/large_object
    - inv_api.c
  - utils/cache
    - relcache.c
- include/catalog
  - indexing.h

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+256

-594

lines changed

`‎src/backend/catalog/aclchk.c`

Lines changed: 15 additions & 57 deletions

Original file line number	Diff line number	Diff line change
`@@ -1252,7 +1252,7 @@ SetDefaultACL(InternalDefaultACL *iacls)`
`1252`	`1252`	`values[Anum_pg_default_acl_defaclacl-1]=PointerGetDatum(new_acl);`
`1253`	`1253`
`1254`	`1254`	`newtuple=heap_form_tuple(RelationGetDescr(rel),values,nulls);`
`1255`		`-simple_heap_insert(rel,newtuple);`
	`1255`	`+CatalogTupleInsert(rel,newtuple);`
`1256`	`1256`	`}`
`1257`	`1257`	`else`
`1258`	`1258`	`{`
`@@ -1262,12 +1262,9 @@ SetDefaultACL(InternalDefaultACL *iacls)`
`1262`	`1262`
`1263`	`1263`	`newtuple=heap_modify_tuple(tuple,RelationGetDescr(rel),`
`1264`	`1264`	`values,nulls,replaces);`
`1265`		`-simple_heap_update(rel,&newtuple->t_self,newtuple);`
	`1265`	`+CatalogTupleUpdate(rel,&newtuple->t_self,newtuple);`
`1266`	`1266`	`}`
`1267`	`1267`
`1268`		`-/* keep the catalog indexes up to date */`
`1269`		`-CatalogUpdateIndexes(rel,newtuple);`
`1270`		`-`
`1271`	`1268`	`/* these dependencies don't change in an update */`
`1272`	`1269`	`if (isNew)`
`1273`	`1270`	`{`
`@@ -1697,10 +1694,7 @@ ExecGrant_Attribute(InternalGrant istmt, Oid relOid, const char relname,`
`1697`	`1694`	`newtuple=heap_modify_tuple(attr_tuple,RelationGetDescr(attRelation),`
`1698`	`1695`	`values,nulls,replaces);`
`1699`	`1696`
`1700`		`-simple_heap_update(attRelation,&newtuple->t_self,newtuple);`
`1701`		`-`
`1702`		`-/* keep the catalog indexes up to date */`
`1703`		`-CatalogUpdateIndexes(attRelation,newtuple);`
	`1697`	`+CatalogTupleUpdate(attRelation,&newtuple->t_self,newtuple);`
`1704`	`1698`
`1705`	`1699`	`/* Update initial privileges for extensions */`
`1706`	`1700`	`recordExtensionInitPriv(relOid,RelationRelationId,attnum,`
`@@ -1963,10 +1957,7 @@ ExecGrant_Relation(InternalGrant *istmt)`
`1963`	`1957`	`newtuple=heap_modify_tuple(tuple,RelationGetDescr(relation),`
`1964`	`1958`	`values,nulls,replaces);`
`1965`	`1959`
`1966`		`-simple_heap_update(relation,&newtuple->t_self,newtuple);`
`1967`		`-`
`1968`		`-/* keep the catalog indexes up to date */`
`1969`		`-CatalogUpdateIndexes(relation,newtuple);`
	`1960`	`+CatalogTupleUpdate(relation,&newtuple->t_self,newtuple);`
`1970`	`1961`
`1971`	`1962`	`/* Update initial privileges for extensions */`
`1972`	`1963`	`recordExtensionInitPriv(relOid,RelationRelationId,0,new_acl);`
`@@ -2156,10 +2147,7 @@ ExecGrant_Database(InternalGrant *istmt)`
`2156`	`2147`	`newtuple=heap_modify_tuple(tuple,RelationGetDescr(relation),values,`
`2157`	`2148`	`nulls,replaces);`
`2158`	`2149`
`2159`		`-simple_heap_update(relation,&newtuple->t_self,newtuple);`
`2160`		`-`
`2161`		`-/* keep the catalog indexes up to date */`
`2162`		`-CatalogUpdateIndexes(relation,newtuple);`
	`2150`	`+CatalogTupleUpdate(relation,&newtuple->t_self,newtuple);`
`2163`	`2151`
`2164`	`2152`	`/* Update the shared dependency ACL info */`
`2165`	`2153`	`updateAclDependencies(DatabaseRelationId,HeapTupleGetOid(tuple),0,`
`@@ -2281,10 +2269,7 @@ ExecGrant_Fdw(InternalGrant *istmt)`
`2281`	`2269`	`newtuple=heap_modify_tuple(tuple,RelationGetDescr(relation),values,`
`2282`	`2270`	`nulls,replaces);`
`2283`	`2271`
`2284`		`-simple_heap_update(relation,&newtuple->t_self,newtuple);`
`2285`		`-`
`2286`		`-/* keep the catalog indexes up to date */`
`2287`		`-CatalogUpdateIndexes(relation,newtuple);`
	`2272`	`+CatalogTupleUpdate(relation,&newtuple->t_self,newtuple);`
`2288`	`2273`
`2289`	`2274`	`/* Update initial privileges for extensions */`
`2290`	`2275`	`recordExtensionInitPriv(fdwid,ForeignDataWrapperRelationId,0,`
`@@ -2410,10 +2395,7 @@ ExecGrant_ForeignServer(InternalGrant *istmt)`
`2410`	`2395`	`newtuple=heap_modify_tuple(tuple,RelationGetDescr(relation),values,`
`2411`	`2396`	`nulls,replaces);`
`2412`	`2397`
`2413`		`-simple_heap_update(relation,&newtuple->t_self,newtuple);`
`2414`		`-`
`2415`		`-/* keep the catalog indexes up to date */`
`2416`		`-CatalogUpdateIndexes(relation,newtuple);`
	`2398`	`+CatalogTupleUpdate(relation,&newtuple->t_self,newtuple);`
`2417`	`2399`
`2418`	`2400`	`/* Update initial privileges for extensions */`
`2419`	`2401`	`recordExtensionInitPriv(srvid,ForeignServerRelationId,0,new_acl);`
`@@ -2537,10 +2519,7 @@ ExecGrant_Function(InternalGrant *istmt)`
`2537`	`2519`	`newtuple=heap_modify_tuple(tuple,RelationGetDescr(relation),values,`
`2538`	`2520`	`nulls,replaces);`
`2539`	`2521`
`2540`		`-simple_heap_update(relation,&newtuple->t_self,newtuple);`
`2541`		`-`
`2542`		`-/* keep the catalog indexes up to date */`
`2543`		`-CatalogUpdateIndexes(relation,newtuple);`
	`2522`	`+CatalogTupleUpdate(relation,&newtuple->t_self,newtuple);`
`2544`	`2523`
`2545`	`2524`	`/* Update initial privileges for extensions */`
`2546`	`2525`	`recordExtensionInitPriv(funcId,ProcedureRelationId,0,new_acl);`
`@@ -2671,10 +2650,7 @@ ExecGrant_Language(InternalGrant *istmt)`
`2671`	`2650`	`newtuple=heap_modify_tuple(tuple,RelationGetDescr(relation),values,`
`2672`	`2651`	`nulls,replaces);`
`2673`	`2652`
`2674`		`-simple_heap_update(relation,&newtuple->t_self,newtuple);`
`2675`		`-`
`2676`		`-/* keep the catalog indexes up to date */`
`2677`		`-CatalogUpdateIndexes(relation,newtuple);`
	`2653`	`+CatalogTupleUpdate(relation,&newtuple->t_self,newtuple);`
`2678`	`2654`
`2679`	`2655`	`/* Update initial privileges for extensions */`
`2680`	`2656`	`recordExtensionInitPriv(langId,LanguageRelationId,0,new_acl);`
`@@ -2813,10 +2789,7 @@ ExecGrant_Largeobject(InternalGrant *istmt)`
`2813`	`2789`	`newtuple=heap_modify_tuple(tuple,RelationGetDescr(relation),`
`2814`	`2790`	`values,nulls,replaces);`
`2815`	`2791`
`2816`		`-simple_heap_update(relation,&newtuple->t_self,newtuple);`
`2817`		`-`
`2818`		`-/* keep the catalog indexes up to date */`
`2819`		`-CatalogUpdateIndexes(relation,newtuple);`
	`2792`	`+CatalogTupleUpdate(relation,&newtuple->t_self,newtuple);`
`2820`	`2793`
`2821`	`2794`	`/* Update initial privileges for extensions */`
`2822`	`2795`	`recordExtensionInitPriv(loid,LargeObjectRelationId,0,new_acl);`
`@@ -2941,10 +2914,7 @@ ExecGrant_Namespace(InternalGrant *istmt)`
`2941`	`2914`	`newtuple=heap_modify_tuple(tuple,RelationGetDescr(relation),values,`
`2942`	`2915`	`nulls,replaces);`
`2943`	`2916`
`2944`		`-simple_heap_update(relation,&newtuple->t_self,newtuple);`
`2945`		`-`
`2946`		`-/* keep the catalog indexes up to date */`
`2947`		`-CatalogUpdateIndexes(relation,newtuple);`
	`2917`	`+CatalogTupleUpdate(relation,&newtuple->t_self,newtuple);`
`2948`	`2918`
`2949`	`2919`	`/* Update initial privileges for extensions */`
`2950`	`2920`	`recordExtensionInitPriv(nspid,NamespaceRelationId,0,new_acl);`
`@@ -3068,10 +3038,7 @@ ExecGrant_Tablespace(InternalGrant *istmt)`
`3068`	`3038`	`newtuple=heap_modify_tuple(tuple,RelationGetDescr(relation),values,`
`3069`	`3039`	`nulls,replaces);`
`3070`	`3040`
`3071`		`-simple_heap_update(relation,&newtuple->t_self,newtuple);`
`3072`		`-`
`3073`		`-/* keep the catalog indexes up to date */`
`3074`		`-CatalogUpdateIndexes(relation,newtuple);`
	`3041`	`+CatalogTupleUpdate(relation,&newtuple->t_self,newtuple);`
`3075`	`3042`
`3076`	`3043`	`/* Update the shared dependency ACL info */`
`3077`	`3044`	`updateAclDependencies(TableSpaceRelationId,tblId,0,`
`@@ -3205,10 +3172,7 @@ ExecGrant_Type(InternalGrant *istmt)`
`3205`	`3172`	`newtuple=heap_modify_tuple(tuple,RelationGetDescr(relation),values,`
`3206`	`3173`	`nulls,replaces);`
`3207`	`3174`
`3208`		`-simple_heap_update(relation,&newtuple->t_self,newtuple);`
`3209`		`-`
`3210`		`-/* keep the catalog indexes up to date */`
`3211`		`-CatalogUpdateIndexes(relation,newtuple);`
	`3175`	`+CatalogTupleUpdate(relation,&newtuple->t_self,newtuple);`
`3212`	`3176`
`3213`	`3177`	`/* Update initial privileges for extensions */`
`3214`	`3178`	`recordExtensionInitPriv(typId,TypeRelationId,0,new_acl);`
`@@ -5751,10 +5715,7 @@ recordExtensionInitPrivWorker(Oid objoid, Oid classoid, int objsubid, Acl *new_a`
`5751`	`5715`	`oldtuple=heap_modify_tuple(oldtuple,RelationGetDescr(relation),`
`5752`	`5716`	`values,nulls,replace);`
`5753`	`5717`
`5754`		`-simple_heap_update(relation,&oldtuple->t_self,oldtuple);`
`5755`		`-`
`5756`		`-/* keep the catalog indexes up to date */`
`5757`		`-CatalogUpdateIndexes(relation,oldtuple);`
	`5718`	`+CatalogTupleUpdate(relation,&oldtuple->t_self,oldtuple);`
`5758`	`5719`	`}`
`5759`	`5720`	`else`
`5760`	`5721`	`/* new_acl is NULL, so delete the entry we found. */`
`@@ -5788,10 +5749,7 @@ recordExtensionInitPrivWorker(Oid objoid, Oid classoid, int objsubid, Acl *new_a`
`5788`	`5749`
`5789`	`5750`	`tuple=heap_form_tuple(RelationGetDescr(relation),values,nulls);`
`5790`	`5751`
`5791`		`-simple_heap_insert(relation,tuple);`
`5792`		`-`
`5793`		`-/* keep the catalog indexes up to date */`
`5794`		`-CatalogUpdateIndexes(relation,tuple);`
	`5752`	`+CatalogTupleInsert(relation,tuple);`
`5795`	`5753`	`}`
`5796`	`5754`	`}`
`5797`	`5755`

`‎src/backend/catalog/heap.c`

Lines changed: 16 additions & 30 deletions

Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,13 @@ InsertPgAttributeTuple(Relation pg_attribute_rel,`
`635`	`635`	`if (indstate!=NULL)`
`636`	`636`	`CatalogIndexInsert(indstate,tup);`
`637`	`637`	`else`
`638`		`-CatalogUpdateIndexes(pg_attribute_rel,tup);`
	`638`	`+{`
	`639`	`+CatalogIndexStateindstate;`
	`640`	`+`
	`641`	`+indstate=CatalogOpenIndexes(pg_attribute_rel);`
	`642`	`+CatalogIndexInsert(indstate,tup);`
	`643`	`+CatalogCloseIndexes(indstate);`
	`644`	`+}`
`639`	`645`
`640`	`646`	`heap_freetuple(tup);`
`641`	`647`	`}`
`@@ -824,9 +830,7 @@ InsertPgClassTuple(Relation pg_class_desc,`
`824`	`830`	`HeapTupleSetOid(tup,new_rel_oid);`
`825`	`831`
`826`	`832`	`/* finally insert the new tuple, update the indexes, and clean up */`
`827`		`-simple_heap_insert(pg_class_desc,tup);`
`828`		`-`
`829`		`-CatalogUpdateIndexes(pg_class_desc,tup);`
	`833`	`+CatalogTupleInsert(pg_class_desc,tup);`
`830`	`834`
`831`	`835`	`heap_freetuple(tup);`
`832`	`836`	`}`
`@@ -1599,10 +1603,7 @@ RemoveAttributeById(Oid relid, AttrNumber attnum)`
`1599`	`1603`	`"........pg.dropped.%d........",attnum);`
`1600`	`1604`	`namestrcpy(&(attStruct->attname),newattname);`
`1601`	`1605`
`1602`		`-simple_heap_update(attr_rel,&tuple->t_self,tuple);`
`1603`		`-`
`1604`		`-/* keep the system catalog indexes current */`
`1605`		`-CatalogUpdateIndexes(attr_rel,tuple);`
	`1606`	`+CatalogTupleUpdate(attr_rel,&tuple->t_self,tuple);`
`1606`	`1607`	`}`
`1607`	`1608`
`1608`	`1609`	`/*`
`@@ -1731,10 +1732,7 @@ RemoveAttrDefaultById(Oid attrdefId)`
`1731`	`1732`
`1732`	`1733`	`((Form_pg_attribute)GETSTRUCT(tuple))->atthasdef= false;`
`1733`	`1734`
`1734`		`-simple_heap_update(attr_rel,&tuple->t_self,tuple);`
`1735`		`-`
`1736`		`-/* keep the system catalog indexes current */`
`1737`		`-CatalogUpdateIndexes(attr_rel,tuple);`
	`1735`	`+CatalogTupleUpdate(attr_rel,&tuple->t_self,tuple);`
`1738`	`1736`
`1739`	`1737`	`/*`
`1740`	`1738`	`* Our update of the pg_attribute row will force a relcache rebuild, so`
`@@ -1932,9 +1930,7 @@ StoreAttrDefault(Relation rel, AttrNumber attnum,`
`1932`	`1930`	`adrel=heap_open(AttrDefaultRelationId,RowExclusiveLock);`
`1933`	`1931`
`1934`	`1932`	`tuple=heap_form_tuple(adrel->rd_att,values,nulls);`
`1935`		`-attrdefOid=simple_heap_insert(adrel,tuple);`
`1936`		`-`
`1937`		`-CatalogUpdateIndexes(adrel,tuple);`
	`1933`	`+attrdefOid=CatalogTupleInsert(adrel,tuple);`
`1938`	`1934`
`1939`	`1935`	`defobject.classId=AttrDefaultRelationId;`
`1940`	`1936`	`defobject.objectId=attrdefOid;`
`@@ -1964,9 +1960,7 @@ StoreAttrDefault(Relation rel, AttrNumber attnum,`
`1964`	`1960`	`if (!attStruct->atthasdef)`
`1965`	`1961`	`{`
`1966`	`1962`	`attStruct->atthasdef= true;`
`1967`		`-simple_heap_update(attrrel,&atttup->t_self,atttup);`
`1968`		`-/* keep catalog indexes current */`
`1969`		`-CatalogUpdateIndexes(attrrel,atttup);`
	`1963`	`+CatalogTupleUpdate(attrrel,&atttup->t_self,atttup);`
`1970`	`1964`	`}`
`1971`	`1965`	`heap_close(attrrel,RowExclusiveLock);`
`1972`	`1966`	`heap_freetuple(atttup);`
`@@ -2561,8 +2555,7 @@ MergeWithExistingConstraint(Relation rel, char ccname, Node expr,`
`2561`	`2555`	`Assert(is_local);`
`2562`	`2556`	`con->connoinherit= true;`
`2563`	`2557`	`}`
`2564`		`-simple_heap_update(conDesc,&tup->t_self,tup);`
`2565`		`-CatalogUpdateIndexes(conDesc,tup);`
	`2558`	`+CatalogTupleUpdate(conDesc,&tup->t_self,tup);`
`2566`	`2559`	`break;`
`2567`	`2560`	`}`
`2568`	`2561`	`}`
`@@ -2602,10 +2595,7 @@ SetRelationNumChecks(Relation rel, int numchecks)`
`2602`	`2595`	`{`
`2603`	`2596`	`relStruct->relchecks=numchecks;`
`2604`	`2597`
`2605`		`-simple_heap_update(relrel,&reltup->t_self,reltup);`
`2606`		`-`
`2607`		`-/* keep catalog indexes current */`
`2608`		`-CatalogUpdateIndexes(relrel,reltup);`
	`2598`	`+CatalogTupleUpdate(relrel,&reltup->t_self,reltup);`
`2609`	`2599`	`}`
`2610`	`2600`	`else`
`2611`	`2601`	`{`
`@@ -3145,10 +3135,7 @@ StorePartitionKey(Relation rel,`
`3145`	`3135`
`3146`	`3136`	`tuple=heap_form_tuple(RelationGetDescr(pg_partitioned_table),values,nulls);`
`3147`	`3137`
`3148`		`-simple_heap_insert(pg_partitioned_table,tuple);`
`3149`		`-`
`3150`		`-/* Update the indexes on pg_partitioned_table */`
`3151`		`-CatalogUpdateIndexes(pg_partitioned_table,tuple);`
	`3138`	`+CatalogTupleInsert(pg_partitioned_table,tuple);`
`3152`	`3139`	`heap_close(pg_partitioned_table,RowExclusiveLock);`
`3153`	`3140`
`3154`	`3141`	`/* Mark this relation as dependent on a few things as follows */`
`@@ -3265,8 +3252,7 @@ StorePartitionBound(Relation rel, Relation parent, Node *bound)`
`3265`	`3252`	`new_val,new_null,new_repl);`
`3266`	`3253`	`/* Also set the flag */`
`3267`	`3254`	`((Form_pg_class)GETSTRUCT(newtuple))->relispartition= true;`
`3268`		`-simple_heap_update(classRel,&newtuple->t_self,newtuple);`
`3269`		`-CatalogUpdateIndexes(classRel,newtuple);`
	`3255`	`+CatalogTupleUpdate(classRel,&newtuple->t_self,newtuple);`
`3270`	`3256`	`heap_freetuple(newtuple);`
`3271`	`3257`	`heap_close(classRel,RowExclusiveLock);`
`3272`	`3258`

`‎src/backend/catalog/index.c`

Lines changed: 4 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -649,10 +649,7 @@ UpdateIndexRelation(Oid indexoid,`
`649`	`649`	`/*`
`650`	`650`	`* insert the tuple into the pg_index catalog`
`651`	`651`	`*/`
`652`		`-simple_heap_insert(pg_index,tuple);`
`653`		`-`
`654`		`-/* update the indexes on pg_index */`
`655`		`-CatalogUpdateIndexes(pg_index,tuple);`
	`652`	`+CatalogTupleInsert(pg_index,tuple);`
`656`	`653`
`657`	`654`	`/*`
`658`	`655`	`* close the relation and free the tuple`
`@@ -1324,8 +1321,7 @@ index_constraint_create(Relation heapRelation,`
`1324`	`1321`
`1325`	`1322`	`if (dirty)`
`1326`	`1323`	`{`
`1327`		`-simple_heap_update(pg_index,&indexTuple->t_self,indexTuple);`
`1328`		`-CatalogUpdateIndexes(pg_index,indexTuple);`
	`1324`	`+CatalogTupleUpdate(pg_index,&indexTuple->t_self,indexTuple);`
`1329`	`1325`
`1330`	`1326`	`InvokeObjectPostAlterHookArg(IndexRelationId,indexRelationId,0,`
`1331`	`1327`	`InvalidOid,is_internal);`
`@@ -2103,8 +2099,7 @@ index_build(Relation heapRelation,`
`2103`	`2099`	`Assert(!indexForm->indcheckxmin);`
`2104`	`2100`
`2105`	`2101`	`indexForm->indcheckxmin= true;`
`2106`		`-simple_heap_update(pg_index,&indexTuple->t_self,indexTuple);`
`2107`		`-CatalogUpdateIndexes(pg_index,indexTuple);`
	`2102`	`+CatalogTupleUpdate(pg_index,&indexTuple->t_self,indexTuple);`
`2108`	`2103`
`2109`	`2104`	`heap_freetuple(indexTuple);`
`2110`	`2105`	`heap_close(pg_index,RowExclusiveLock);`
`@@ -3448,8 +3443,7 @@ reindex_index(Oid indexId, bool skip_constraint_checks, char persistence,`
`3448`	`3443`	`indexForm->indisvalid= true;`
`3449`	`3444`	`indexForm->indisready= true;`
`3450`	`3445`	`indexForm->indislive= true;`
`3451`		`-simple_heap_update(pg_index,&indexTuple->t_self,indexTuple);`
`3452`		`-CatalogUpdateIndexes(pg_index,indexTuple);`
	`3446`	`+CatalogTupleUpdate(pg_index,&indexTuple->t_self,indexTuple);`
`3453`	`3447`
`3454`	`3448`	`/*`
`3455`	`3449`	`* Invalidate the relcache for the table, so that after we commit`

`‎src/backend/catalog/indexing.c`

Lines changed: 37 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -146,19 +146,49 @@ CatalogIndexInsert(CatalogIndexState indstate, HeapTuple heapTuple)`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`/*`
`149`		`- *CatalogUpdateIndexes - doall the indexing work for a new catalog tuple`
	`149`	`+ *CatalogTupleInsert - doheap and indexing work for a new catalog tuple`
`150`	`150`	`*`
`151`		`- * This is a convenience routine for the common case where we only need`
`152`		`- * to insert or update a single tuple in a system catalog. Avoid using it for`
`153`		`- * multiple tuples, since opening the indexes and building the index info`
`154`		`- * structures is moderately expensive.`
	`151`	`+ * This is a convenience routine for the common case of inserting a single`
	`152`	`+ * tuple in a system catalog; it inserts a new heap tuple, keeping indexes`
	`153`	`+ * current. Avoid using it for multiple tuples, since opening the indexes and`
	`154`	`+ * building the index info structures is moderately expensive.`
	`155`	`+ *`
	`156`	`+ * The Oid of the inserted tuple is returned.`
	`157`	`+ */`
	`158`	`+Oid`
	`159`	`+CatalogTupleInsert(RelationheapRel,HeapTupletup)`
	`160`	`+{`
	`161`	`+CatalogIndexStateindstate;`
	`162`	`+Oidoid;`
	`163`	`+`
	`164`	`+indstate=CatalogOpenIndexes(heapRel);`
	`165`	`+`
	`166`	`+oid=simple_heap_insert(heapRel,tup);`
	`167`	`+`
	`168`	`+CatalogIndexInsert(indstate,tup);`
	`169`	`+CatalogCloseIndexes(indstate);`
	`170`	`+`
	`171`	`+returnoid;`
	`172`	`+}`
	`173`	`+`
	`174`	`+/*`
	`175`	`+ * CatalogTupleUpdate - do heap and indexing work for updating a catalog tuple`
	`176`	`+ *`
	`177`	`+ * This is a convenience routine for the common case of updating a single`
	`178`	`+ * tuple in a system catalog; it updates one heap tuple (identified by otid)`
	`179`	`+ * with tup, keeping indexes current. Avoid using it for multiple tuples,`
	`180`	`+ * since opening the indexes and building the index info structures is`
	`181`	`+ * moderately expensive.`
`155`	`182`	`*/`
`156`	`183`	`void`
`157`		`-CatalogUpdateIndexes(RelationheapRel,HeapTupleheapTuple)`
	`184`	`+CatalogTupleUpdate(RelationheapRel,ItemPointerotid,HeapTupletup)`
`158`	`185`	`{`
`159`	`186`	`CatalogIndexStateindstate;`
`160`	`187`
`161`	`188`	`indstate=CatalogOpenIndexes(heapRel);`
`162`		`-CatalogIndexInsert(indstate,heapTuple);`
	`189`	`+`
	`190`	`+simple_heap_update(heapRel,otid,tup);`
	`191`	`+`
	`192`	`+CatalogIndexInsert(indstate,tup);`
`163`	`193`	`CatalogCloseIndexes(indstate);`
`164`	`194`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2f5c9d9

File tree

52 files changed

Some content is hidden

52 files changed

`‎src/backend/catalog/aclchk.c`

`‎src/backend/catalog/heap.c`

`‎src/backend/catalog/index.c`

`‎src/backend/catalog/indexing.c`

0 commit comments