NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit6168300

committed

Reject ANALYZE commands during VACUUM FULL or another ANALYZE.

vacuum()'s static variable handling makes it non-reentrant; an ensuingnull pointer deference crashed the backend. Back-patch to 9.0 (allsupported versions).

1 parentd7b16ee commit6168300Copy full SHA for 6168300

File tree

3 files changed

+33

-4

lines changed

src
- backend/commands
  - vacuum.c
- test/regress
  - expected
    - vacuum.out
  - sql
    - vacuum.sql

3 files changed

+33

-4

lines changed

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

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ vacuum(VacuumStmt *vacstmt, Oid relid, bool do_toast,`
`97`	`97`	`volatileboolin_outer_xact,`
`98`	`98`	`use_own_xacts;`
`99`	`99`	`List*relations;`
	`100`	`+staticboolin_vacuum= false;`
`100`	`101`
`101`	`102`	`/* sanity checks on options */`
`102`	`103`	`Assert(vacstmt->options& (VACOPT_VACUUM \|VACOPT_ANALYZE));`
`@@ -122,6 +123,14 @@ vacuum(VacuumStmt *vacstmt, Oid relid, bool do_toast,`
`122`	`123`	`else`
`123`	`124`	`in_outer_xact=IsInTransactionChain(isTopLevel);`
`124`	`125`
	`126`	`+/*`
	`127`	`+ * Due to static variables vac_context, anl_context and vac_strategy,`
	`128`	`+ * vacuum() is not reentrant. This matters when VACUUM FULL or ANALYZE`
	`129`	`+ * calls a hostile index expression that itself calls ANALYZE.`
	`130`	`+ */`
	`131`	`+if (in_vacuum)`
	`132`	`+elog(ERROR,"%s cannot be executed from VACUUM or ANALYZE",stmttype);`
	`133`	`+`
`125`	`134`	`/*`
`126`	`135`	`* Send info about dead objects to the statistics collector, unless we are`
`127`	`136`	`* in autovacuum --- autovacuum.c does this for itself.`
`@@ -214,6 +223,7 @@ vacuum(VacuumStmt *vacstmt, Oid relid, bool do_toast,`
`214`	`223`	`{`
`215`	`224`	`ListCell*cur;`
`216`	`225`
	`226`	`+in_vacuum= true;`
`217`	`227`	`VacuumCostActive= (VacuumCostDelay>0);`
`218`	`228`	`VacuumCostBalance=0;`
`219`	`229`
`@@ -255,13 +265,13 @@ vacuum(VacuumStmt *vacstmt, Oid relid, bool do_toast,`
`255`	`265`	`}`
`256`	`266`	`PG_CATCH();`
`257`	`267`	`{`
`258`		`-/* Make sure cost accounting is turned off after error */`
	`268`	`+in_vacuum= false;`
`259`	`269`	`VacuumCostActive= false;`
`260`	`270`	`PG_RE_THROW();`
`261`	`271`	`}`
`262`	`272`	`PG_END_TRY();`
`263`	`273`
`264`		`-/* Turn off vacuum cost accounting */`
	`274`	`+in_vacuum= false;`
`265`	`275`	`VacuumCostActive= false;`
`266`	`276`
`267`	`277`	`/*`

`‎src/test/regress/expected/vacuum.out`

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -61,12 +61,24 @@ VACUUM (ANALYZE, FULL) vactst;`
`61`	`61`	`CREATE TABLE vaccluster (i INT PRIMARY KEY);`
`62`	`62`	`NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "vaccluster_pkey" for table "vaccluster"`
`63`	`63`	`ALTER TABLE vaccluster CLUSTER ON vaccluster_pkey;`
`64`		`-INSERT INTO vaccluster SELECT * FROM vactst;`
`65`	`64`	`CLUSTER vaccluster;`
	`65`	`+CREATE FUNCTION do_analyze() RETURNS VOID VOLATILE LANGUAGE SQL`
	`66`	`+AS 'ANALYZE pg_am';`
	`67`	`+CREATE FUNCTION wrap_do_analyze(c INT) RETURNS INT IMMUTABLE LANGUAGE SQL`
	`68`	`+AS 'SELECT $1 FROM do_analyze()';`
	`69`	`+CREATE INDEX ON vactst(wrap_do_analyze(i));`
	`70`	`+INSERT INTO vactst VALUES (1), (2);`
	`71`	`+ANALYZE vactst;`
	`72`	`+ERROR: ANALYZE cannot be executed from VACUUM or ANALYZE`
	`73`	`+CONTEXT: SQL function "do_analyze" statement 1`
	`74`	`+SQL function "wrap_do_analyze" statement 1`
`66`	`75`	`VACUUM FULL pg_am;`
`67`	`76`	`VACUUM FULL pg_class;`
`68`	`77`	`VACUUM FULL pg_database;`
`69`	`78`	`VACUUM FULL vaccluster;`
`70`	`79`	`VACUUM FULL vactst;`
	`80`	`+ERROR: ANALYZE cannot be executed from VACUUM or ANALYZE`
	`81`	`+CONTEXT: SQL function "do_analyze" statement 1`
	`82`	`+SQL function "wrap_do_analyze" statement 1`
`71`	`83`	`DROP TABLE vaccluster;`
`72`	`84`	`DROP TABLE vactst;`

`‎src/test/regress/sql/vacuum.sql`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,16 @@ VACUUM (ANALYZE, FULL) vactst;`
`44`	`44`
`45`	`45`	`CREATETABLEvaccluster (iINTPRIMARY KEY);`
`46`	`46`	`ALTERTABLE vaccluster CLUSTERON vaccluster_pkey;`
`47`		`-INSERT INTO vacclusterSELECT*FROM vactst;`
`48`	`47`	`CLUSTER vaccluster;`
`49`	`48`
	`49`	`+CREATEFUNCTIONdo_analyze() RETURNS VOID VOLATILE LANGUAGE SQL`
	`50`	`+AS'ANALYZE pg_am';`
	`51`	`+CREATEFUNCTIONwrap_do_analyze(cINT) RETURNSINT IMMUTABLE LANGUAGE SQL`
	`52`	`+AS'SELECT $1 FROM do_analyze()';`
	`53`	`+CREATEINDEXON vactst(wrap_do_analyze(i));`
	`54`	`+INSERT INTO vactstVALUES (1), (2);`
	`55`	`+ANALYZE vactst;`
	`56`	`+`
`50`	`57`	`VACUUM FULL pg_am;`
`51`	`58`	`VACUUM FULL pg_class;`
`52`	`59`	`VACUUM FULL pg_database;`

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!

Commit6168300

File tree

3 files changed

3 files changed

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

`‎src/test/regress/expected/vacuum.out`

`‎src/test/regress/sql/vacuum.sql`

0 commit comments