NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit1ff4161

committed

Use multi-inserts for pg_enum

This allows to insert at once all the enum values defined with a giventype into pg_enum, reducing the WAL produced by roughly 10%~. pg_enum'sindexes are opened and closed now once rather than N times. The numberof items to insert is known in advance, making this changestraight-forward, and would happen on a CREATE TYPE .. AS ENUM.The amount of data inserted is capped at 64kB for each insert batch.This is similar to commits63110c6 ande3931d0, that worked ondifferent catalogs.Reported-by: Ranier VilelaAuthor: Michael PaquierReviewed-by: Kyotaro Horiguchi, Ranier VilelaDiscussion:https://postgr.es/m/Y3M5bovrkTQbAO4W@paquier.xyz

1 parent09a7218 commit1ff4161Copy full SHA for 1ff4161

File tree

1 file changed

+42

-13

lines changed

src/backend/catalog
- pg_enum.c

1 file changed

+42

-13

lines changed

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

Lines changed: 42 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,14 +61,14 @@ void`
`61`	`61`	`EnumValuesCreate(OidenumTypeOid,List*vals)`
`62`	`62`	`{`
`63`	`63`	`Relationpg_enum;`
`64`		`-NameDataenumlabel;`
`65`	`64`	`Oid*oids;`
`66`	`65`	`intelemno,`
`67`	`66`	`num_elems;`
`68`		`-Datumvalues[Natts_pg_enum];`
`69`		`-boolnulls[Natts_pg_enum];`
`70`	`67`	`ListCell*lc;`
`71`		`-HeapTupletup;`
	`68`	`+intslotCount=0;`
	`69`	`+intnslots;`
	`70`	`+CatalogIndexStateindstate;`
	`71`	`+TupleTableSlot**slot;`
`72`	`72`
`73`	`73`	`num_elems=list_length(vals);`
`74`	`74`
`@@ -111,12 +111,21 @@ EnumValuesCreate(Oid enumTypeOid, List *vals)`
`111`	`111`	`qsort(oids,num_elems,sizeof(Oid),oid_cmp);`
`112`	`112`
`113`	`113`	`/* and make the entries */`
`114`		`-memset(nulls, false,sizeof(nulls));`
	`114`	`+indstate=CatalogOpenIndexes(pg_enum);`
	`115`	`+`
	`116`	`+/* allocate the slots to use and initialize them */`
	`117`	`+nslots=Min(num_elems,`
	`118`	`+MAX_CATALOG_MULTI_INSERT_BYTES /sizeof(FormData_pg_enum));`
	`119`	`+slot=palloc(sizeof(TupleTableSlot)nslots);`
	`120`	`+for (inti=0;i<nslots;i++)`
	`121`	`+slot[i]=MakeSingleTupleTableSlot(RelationGetDescr(pg_enum),`
	`122`	`+&TTSOpsHeapTuple);`
`115`	`123`
`116`	`124`	`elemno=0;`
`117`	`125`	`foreach(lc,vals)`
`118`	`126`	`{`
`119`	`127`	`char*lab=strVal(lfirst(lc));`
	`128`	`+Nameenumlabel=palloc0(NAMEDATALEN);`
`120`	`129`
`121`	`130`	`/*`
`122`	`131`	`* labels are stored in a name field, for easier syscache lookup, so`
`@@ -129,22 +138,42 @@ EnumValuesCreate(Oid enumTypeOid, List *vals)`
`129`	`138`	`errdetail("Labels must be %d bytes or less.",`
`130`	`139`	`NAMEDATALEN-1)));`
`131`	`140`
`132`		`-values[Anum_pg_enum_oid-1]=ObjectIdGetDatum(oids[elemno]);`
`133`		`-values[Anum_pg_enum_enumtypid-1]=ObjectIdGetDatum(enumTypeOid);`
`134`		`-values[Anum_pg_enum_enumsortorder-1]=Float4GetDatum(elemno+1);`
`135`		`-namestrcpy(&enumlabel,lab);`
`136`		`-values[Anum_pg_enum_enumlabel-1]=NameGetDatum(&enumlabel);`
	`141`	`+ExecClearTuple(slot[slotCount]);`
`137`	`142`
`138`		`-tup=heap_form_tuple(RelationGetDescr(pg_enum),values,nulls);`
	`143`	`+memset(slot[slotCount]->tts_isnull, false,`
	`144`	`+slot[slotCount]->tts_tupleDescriptor->natts*sizeof(bool));`
`139`	`145`
`140`		`-CatalogTupleInsert(pg_enum,tup);`
`141`		`-heap_freetuple(tup);`
	`146`	`+slot[slotCount]->tts_values[Anum_pg_enum_oid-1]=ObjectIdGetDatum(oids[elemno]);`
	`147`	`+slot[slotCount]->tts_values[Anum_pg_enum_enumtypid-1]=ObjectIdGetDatum(enumTypeOid);`
	`148`	`+slot[slotCount]->tts_values[Anum_pg_enum_enumsortorder-1]=Float4GetDatum(elemno+1);`
	`149`	`+`
	`150`	`+namestrcpy(enumlabel,lab);`
	`151`	`+slot[slotCount]->tts_values[Anum_pg_enum_enumlabel-1]=NameGetDatum(enumlabel);`
	`152`	`+`
	`153`	`+ExecStoreVirtualTuple(slot[slotCount]);`
	`154`	`+slotCount++;`
	`155`	`+`
	`156`	`+/* if slots are full, insert a batch of tuples */`
	`157`	`+if (slotCount==nslots)`
	`158`	`+{`
	`159`	`+CatalogTuplesMultiInsertWithInfo(pg_enum,slot,slotCount,`
	`160`	`+indstate);`
	`161`	`+slotCount=0;`
	`162`	`+}`
`142`	`163`
`143`	`164`	`elemno++;`
`144`	`165`	`}`
`145`	`166`
	`167`	`+/* Insert any tuples left in the buffer */`
	`168`	`+if (slotCount>0)`
	`169`	`+CatalogTuplesMultiInsertWithInfo(pg_enum,slot,slotCount,`
	`170`	`+indstate);`
	`171`	`+`
`146`	`172`	`/* clean up */`
`147`	`173`	`pfree(oids);`
	`174`	`+for (inti=0;i<nslots;i++)`
	`175`	`+ExecDropSingleTupleTableSlot(slot[i]);`
	`176`	`+CatalogCloseIndexes(indstate);`
`148`	`177`	`table_close(pg_enum,RowExclusiveLock);`
`149`	`178`	`}`
`150`	`179`

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!

Commit1ff4161

File tree

1 file changed

1 file changed

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

0 commit comments