NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit9dd50e9

committed

Lock table in DROP STATISTICS

The DROP STATISTICS code failed to properly lock the table, leading to ERROR: tuple concurrently deletedwhen executed concurrently with ANALYZE.Fixed by modifying RemoveStatisticsById() to acquire the same lock asANALYZE. This function is called only by DROP STATISTICS, as ANALYZEcalls RemoveStatisticsDataById() directly.Reported by Justin Pryzby, fix by me. Backpatch through 12. The code waslike this since it was introduced in 10, but older releases are EOL.Reported-by: Justin PryzbyReviewed-by: Tom LaneBackpatch-through: 12Discussion:https://postgr.es/m/ZUuk-8CfbYeq6g_u@pryzbyj2023

1 parentfc3f862 commit9dd50e9Copy full SHA for 9dd50e9

File tree

1 file changed

+29

-10

lines changed

src/backend/commands
- statscmds.c

1 file changed

+29

-10

lines changed

`‎src/backend/commands/statscmds.c`

Lines changed: 29 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -722,20 +722,14 @@ AlterStatistics(AlterStatsStmt *stmt)`
`722`	`722`	`}`
`723`	`723`
`724`	`724`	`/*`
`725`		`- *Guts of statistics object deletion.`
`726`		`-*/`
`727`		`-void`
`728`		`-RemoveStatisticsById(OidstatsOid)`
	`725`	`+ *Delete entry in pg_statistic_ext_data catalog.`
	`726`	`+*/`
	`727`	`+staticvoid`
	`728`	`+RemoveStatisticsDataById(OidstatsOid)`
`729`	`729`	`{`
`730`	`730`	`Relationrelation;`
`731`	`731`	`HeapTupletup;`
`732`		`-Form_pg_statistic_extstatext;`
`733`		`-Oidrelid;`
`734`	`732`
`735`		`-/*`
`736`		`- * First delete the pg_statistic_ext_data tuple holding the actual`
`737`		`- * statistical data.`
`738`		`- */`
`739`	`733`	`relation=table_open(StatisticExtDataRelationId,RowExclusiveLock);`
`740`	`734`
`741`	`735`	`tup=SearchSysCache1(STATEXTDATASTXOID,ObjectIdGetDatum(statsOid));`
`@@ -748,6 +742,19 @@ RemoveStatisticsById(Oid statsOid)`
`748`	`742`	`ReleaseSysCache(tup);`
`749`	`743`
`750`	`744`	`table_close(relation,RowExclusiveLock);`
	`745`	`+}`
	`746`	`+`
	`747`	`+/*`
	`748`	`+ * Guts of statistics object deletion.`
	`749`	`+ */`
	`750`	`+void`
	`751`	`+RemoveStatisticsById(OidstatsOid)`
	`752`	`+{`
	`753`	`+Relationrelation;`
	`754`	`+Relationrel;`
	`755`	`+HeapTupletup;`
	`756`	`+Form_pg_statistic_extstatext;`
	`757`	`+Oidrelid;`
`751`	`758`
`752`	`759`	`/*`
`753`	`760`	`* Delete the pg_statistic_ext tuple. Also send out a cache inval on the`
`@@ -763,12 +770,24 @@ RemoveStatisticsById(Oid statsOid)`
`763`	`770`	`statext= (Form_pg_statistic_ext)GETSTRUCT(tup);`
`764`	`771`	`relid=statext->stxrelid;`
`765`	`772`
	`773`	`+/*`
	`774`	`+ * Delete the pg_statistic_ext_data tuple holding the actual statistical`
	`775`	`+ * data. We lock the user table first, to prevent other processes (e.g.`
	`776`	`+ * DROP STATISTICS) from removing the row concurrently.`
	`777`	`+ */`
	`778`	`+rel=table_open(relid,ShareUpdateExclusiveLock);`
	`779`	`+`
	`780`	`+RemoveStatisticsDataById(statsOid);`
	`781`	`+`
`766`	`782`	`CacheInvalidateRelcacheByRelid(relid);`
`767`	`783`
`768`	`784`	`CatalogTupleDelete(relation,&tup->t_self);`
`769`	`785`
`770`	`786`	`ReleaseSysCache(tup);`
`771`	`787`
	`788`	`+/* Keep lock until the end of the transaction. */`
	`789`	`+table_close(rel,NoLock);`
	`790`	`+`
`772`	`791`	`table_close(relation,RowExclusiveLock);`
`773`	`792`	`}`
`774`	`793`

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!

Commit9dd50e9

File tree

1 file changed

1 file changed

`‎src/backend/commands/statscmds.c`

0 commit comments